diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index 0542d4cf03f12844051de31ddd93da084ffb2a93..4ab152adb1aa052863393c82dc1e67a78b558f0e 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -30,6 +30,7 @@ class AuthTestCase(TestCase):
self.email = 'a@b.com'
self.pw = 'xyz'
self.username = 'testuser'
+ self.client = Client()
def check_page_get(self, url, expected):
resp = self.client.get(url)
@@ -63,7 +64,8 @@ class AuthTestCase(TestCase):
'language' : 'Franglish',
'name' : 'Fred Weasley',
'terms_of_service' : 'true',
- 'honor_code' : 'true'})
+ 'honor_code' : 'true',
+ })
return resp
def create_account(self, username, email, pw):
@@ -121,7 +123,7 @@ class AuthTestCase(TestCase):
resp = self._login(self.email, self.pw)
data = parse_json(resp)
self.assertFalse(data['success'])
-
+
self.activate_user(self.email)
# Now login should work
@@ -144,6 +146,9 @@ class AuthTestCase(TestCase):
# need an activated user
self.test_create_account()
+ # Create a new session
+ self.client = Client()
+
# Not logged in. Should redirect to login.
print 'Not logged in'
for page in auth_pages:
diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 4013af2e89de0f699b10df42cdbb17e0e424e6ea..d24eabd780b89f5897a673f866146056fbbdce84 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -1,12 +1,11 @@
from util.json_request import expect_json
import json
-from django.http import HttpResponse
+from django.http import HttpResponse, Http404
from django.contrib.auth.decorators import login_required
from django.core.context_processors import csrf
from django_future.csrf import ensure_csrf_cookie
from django.core.urlresolvers import reverse
-from fs.osfs import OSFS
from xmodule.modulestore import Location
from github_sync import export_to_github
@@ -14,6 +13,7 @@ from github_sync import export_to_github
from mitxmako.shortcuts import render_to_response
from xmodule.modulestore.django import modulestore
+
# ==== Public views ==================================================
@ensure_csrf_cookie
@@ -22,7 +22,8 @@ def signup(request):
Display the signup form.
"""
csrf_token = csrf(request)['csrf_token']
- return render_to_response('signup.html', {'csrf': csrf_token })
+ return render_to_response('signup.html', {'csrf': csrf_token})
+
@ensure_csrf_cookie
def login_page(request):
@@ -30,8 +31,9 @@ def login_page(request):
Display the login form.
"""
csrf_token = csrf(request)['csrf_token']
- return render_to_response('login.html', {'csrf': csrf_token })
-
+ return render_to_response('login.html', {'csrf': csrf_token})
+
+
# ==== Views for any logged-in user ==================================
@login_required
@@ -47,6 +49,7 @@ def index(request):
for course in courses]
})
+
# ==== Views with per-item permissions================================
def has_access(user, location):
@@ -54,18 +57,20 @@ def has_access(user, location):
# TODO (vshnayder): actually check perms
return user.is_active and user.is_authenticated
+
@login_required
@ensure_csrf_cookie
def course_index(request, org, course, name):
location = ['i4x', org, course, 'course', name]
if not has_access(request.user, location):
raise Http404 # TODO (vshnayder): better error
-
+
# TODO (cpennington): These need to be read in from the active user
course = modulestore().get_item(location)
weeks = course.get_children()
return render_to_response('course_index.html', {'weeks': weeks})
+
@login_required
def edit_item(request):
# TODO (vshnayder): change name from id to location in coffee+html as well.
@@ -73,7 +78,7 @@ def edit_item(request):
print item_location, request.GET
if not has_access(request.user, item_location):
raise Http404 # TODO (vshnayder): better error
-
+
item = modulestore().get_item(item_location)
return render_to_response('unit.html', {
'contents': item.get_html(),
@@ -98,6 +103,7 @@ def user_author_string(user):
last=l,
email=user.email)
+
@login_required
@expect_json
def save_item(request):
diff --git a/cms/templates/emails/activation_email.txt b/cms/templates/emails/activation_email.txt
index eca5effdd6ebb79f0246f2b8d25bd8cd68c0f50b..209ff98335111e360461c88d8e6d1a199f02dc7a 100644
--- a/cms/templates/emails/activation_email.txt
+++ b/cms/templates/emails/activation_email.txt
@@ -1,12 +1,11 @@
-Someone, hopefully you, signed up for an account for edX's on-line
-offering of "${ course_title}" using this email address. If it was
-you, and you'd like to activate and use your account, copy and paste
-this address into your web browser's address bar:
+Thank you for signing up for edX! To activate your account,
+please copy and paste this address into your web browser's
+address bar:
% if is_secure:
https://${ site }/activate/${ key }
% else:
- http://edx4edx.mitx.mit.edu/activate/${ key }
+ http://${ site }/activate/${ key }
% endif
If you didn't request this, you don't need to do anything; you won't
diff --git a/cms/templates/emails/activation_email_subject.txt b/cms/templates/emails/activation_email_subject.txt
index c25c006a817d4a299a34a1e2b21ba70906de52f0..495e0b5faddc49bfc8e1fa72377663666f1b2591 100644
--- a/cms/templates/emails/activation_email_subject.txt
+++ b/cms/templates/emails/activation_email_subject.txt
@@ -1 +1 @@
-Your account for edX's on-line ${course_title} course
+Your account for edX
diff --git a/cms/templates/registration/activation_complete.html b/cms/templates/registration/activation_complete.html
new file mode 100644
index 0000000000000000000000000000000000000000..30e731e8cc8be2401c6dd7cf6d3ba671f539c731
--- /dev/null
+++ b/cms/templates/registration/activation_complete.html
@@ -0,0 +1,30 @@
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../base.html" />
+
+<%namespace name='static' file='../static_content.html'/>
+
+<section class="container activation">
+
+ <section class="message">
+ %if not already_active:
+ <h1 class="valid">Activation Complete!</h1>
+ %else:
+ <h1>Account already active!</h1>
+ %endif
+ <hr class="horizontal-divider">
+
+ <p>
+ %if not already_active:
+ Thanks for activating your account.
+ %else:
+ This account has already been activated.
+ %endif
+
+ %if user_logged_in:
+ Visit your <a href="${reverse('dashboard')}">dashboard</a> to see your courses.
+ %else:
+ You can now <a href="#login-modal" rel="leanModal">login</a>.
+ %endif
+ </p>
+ </section>
+</section>
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 5585ad6a93540e06e2e9ed32d3208caafbce3f33..143a22683ecaa9a4c4dac7176d74dc6fbba5876a 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -307,14 +307,14 @@ def create_account(request, post_override=None):
up = UserProfile(user=u)
up.name = post_vars['name']
- up.level_of_education = post_vars['level_of_education']
- up.gender = post_vars['gender']
- up.mailing_address = post_vars['mailing_address']
- up.goals = post_vars['goals']
+ up.level_of_education = post_vars.get('level_of_education')
+ up.gender = post_vars.get('gender')
+ up.mailing_address = post_vars.get('mailing_address')
+ up.goals = post_vars.get('goals')
try:
up.year_of_birth = int(post_vars['year_of_birth'])
- except ValueError:
+ except (ValueError, KeyError):
up.year_of_birth = None # If they give us garbage, just ignore it instead
# of asking them to put an integer.
try:
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index 688da8d98e74d64491125211abd5ec3d0a7fcc32..f92efbe4eb7a2941eef901843a09e6e9449f5973 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -46,7 +46,7 @@ def course_static_url(course):
return settings.STATIC_URL + "/" + course.metadata['data_dir'] + "/"
def course_image_url(course):
- return course_static_url(course) + "images/course_image.png"
+ return course_static_url(course) + "images/course_image.jpg"
def get_course_about_section(course, section_key):
"""
diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index 80ca6931557cee9dbc0e6a449ad2757ff707db2b..6e4881865e54a01fc2815bb32936ddf8916b1751 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -82,8 +82,9 @@ a:link, a:visited {
.container {
@include clearfix;
margin: 0 auto 0;
- padding: 0px 10px;
+ padding: 0px 30px;
max-width: grid-width(12);
+ min-width: 760px;
}
span.edx {
diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss
index fd4891b8bf0cadb81f5955e4efff11d4737992ed..7b527c9a19def673d6a5cad5a99783fc4ae22ec1 100644
--- a/lms/static/sass/multicourse/_about_pages.scss
+++ b/lms/static/sass/multicourse/_about_pages.scss
@@ -1,5 +1,5 @@
.container.about {
- padding: 20px 10px 120px;
+ padding: 20px 30px 120px;
> nav {
margin-bottom: 80px;
@@ -102,7 +102,6 @@
img {
background: rgb(245,245,245);
display: block;
- //height: 200px;
width: 100%;
}
}
@@ -257,14 +256,14 @@
.contact {
@include clearfix;
margin: 0 auto;
- width: flex-grid(10);
- .map {
- background: rgb(245,245,245);
+ .photo {
+ @include box-sizing(border-box);
+ background: rgb(255,255,255);
+ border: 1px solid rgb(210,210,210);
+ padding: 1px;
float: left;
- margin-right: flex-gutter();
- overflow: hidden;
- width: flex-grid(6);
+ width: flex-grid(3);
img {
max-width: 100%;
@@ -275,7 +274,7 @@
@include box-sizing(border-box);
float: left;
padding-left: 40px;
- width: flex-grid(6);
+ width: flex-grid(9);
ul {
list-style: none;
diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss
index c7cda46cb4f8b90790541acb3c0cfb691936b3b0..89af76abaf7840d299f9ba940ad83b6ac512efd2 100644
--- a/lms/static/sass/multicourse/_home.scss
+++ b/lms/static/sass/multicourse/_home.scss
@@ -30,11 +30,11 @@
border: 1px solid rgb(100,100,100);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include box-sizing(border-box);
- height: 120px;
+ min-height: 120px;
margin-left: grid-width(2) + $gw-gutter;
+ width: flex-grid(6);
float: left;
position: relative;
- text-align: center;
@include transition(all, 0.2s, linear);
vertical-align: top;
@@ -46,7 +46,6 @@
> hgroup {
@include box-sizing(border-box);
- height: 120px;
@include inline-block;
left: 0px;
opacity: 1;
@@ -86,7 +85,7 @@
padding: 4px;
position: relative;
vertical-align: top;
- width: 210px;
+ width: flex-grid(2) + flex-gutter();
z-index: 2;
&:hover {
@@ -97,6 +96,8 @@
height: 100%;
overflow: hidden;
position: relative;
+ background: url('../images/courses/video-thumb.jpg') center no-repeat;
+ @include background-size(cover);
.play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.65), rgba(0,0,0, 0.75)));
diff --git a/lms/static/sass/multicourse/_jobs.scss b/lms/static/sass/multicourse/_jobs.scss
index 136281c561a3943278ab304ba5e6393c8a0c26ef..306851e602ac0fae0383e85f3a9bb6c8add309a2 100644
--- a/lms/static/sass/multicourse/_jobs.scss
+++ b/lms/static/sass/multicourse/_jobs.scss
@@ -1,5 +1,5 @@
.container.jobs {
- padding: 60px 0 120px;
+ padding: 60px 30px 120px;
q {
display: block;
@@ -34,8 +34,7 @@
img {
background: rgb(245,245,245);
display: block;
- height: 200px;
- width: 100%;
+ max-width: 100%;
}
}
@@ -54,7 +53,7 @@
p {
margin-left: 0;
font-style: italic;
- line-height: 1.4;
+ line-height: 1.6;
font-size: 1.1em;
color: #666;
}
@@ -63,6 +62,7 @@
margin-top: 12px;
display: block;
color: #a0a0a0;
+ font-weight: 300;
}
}
}
diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss
index aea82910c702129ce9802d84da3b6e521c5da5f4..7e90eeb01dcf071ffdf38de23ce3e7802730b70f 100644
--- a/lms/static/sass/shared/_modal.scss
+++ b/lms/static/sass/shared/_modal.scss
@@ -195,9 +195,8 @@
.citizenship, .gender, .date-of-birth {
margin-bottom: 20px;
-
- .input-wrapper {
- }
+ float: left;
+ width: flex-grid(4);
label {
display: block;
@@ -205,36 +204,15 @@
select {
width: 100%;
+ @include box-sizing(border-box);
+ display: block;
}
}
.citizenship, .gender {
- float: left;
- width: flex-grid(4);
- }
-
- .citizenship {
margin-right: flex-gutter();
}
- .date-of-birth {
- float: left;
- width: flex-grid(12);
-
- select {
- @include box-sizing(border-box);
- display: block;
- float: left;
- margin-right: flex-gutter();
- max-width: flex-grid(4);
- width: flex-grid(4);
-
- &:last-child {
- margin: 0px;
- }
- }
- }
-
.submit {
padding-top: 10px;
diff --git a/lms/templates/contact.html b/lms/templates/contact.html
index 940d4862c4553e7a8680ad1720cd205376f22631..a8f5e6b732edf662bcd8bdbc09a1e70760eac54c 100644
--- a/lms/templates/contact.html
+++ b/lms/templates/contact.html
@@ -11,12 +11,12 @@
</nav>
<section class="contact">
- <div class="map">
+ <div class="photo">
<img src="${static.url('images/contact-page.jpg')}">
</div>
<div class="contacts">
<h2>Class Feedback</h2>
- <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.</p>
+ <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.</p>
<h2>General Inquiries and Feedback</h2>
<p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
diff --git a/lms/templates/index.html b/lms/templates/index.html
index e3786b1af27ed7ab1f7e022d80ce7abaa2100907..be779769a685496be4825d57800a6519464391f6 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -36,7 +36,6 @@
<a href="#video-modal" class="media" rel="leanModal">
<div class="hero">
- <img src="${static.url('images/courses/video-thumb.jpg')}" />
<div class="play-intro"></div>
</div>
</a>
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index f456a4c214f7faf42ff3756d824255597b48419a..5ea4af16086c523f92e549bc36ab8e656044e89c 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -54,7 +54,7 @@
</div>
</section>
- <section class="gender">
+ <section class="date-of-birth">
<label>Year of birth</label>
<div class="input-wrapper">
<select name="year_of_birth">
diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html
index 2d92c9b0052527c3d2854b2da302d21c4993e590..74045221668b7809824c8f3dcd817be23259c9e7 100644
--- a/lms/templates/static_templates/contact.html
+++ b/lms/templates/static_templates/contact.html
@@ -14,12 +14,12 @@
</nav>
<section class="contact">
- <div class="map">
+ <div class="photo">
<img src="${static.url('images/contact-page.jpg')}">
</div>
<div class="contacts">
<h2>Class Feedback</h2>
- <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.</p>
+ <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.</p>
<h2>General Inquiries and Feedback</h2>
<p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index 24023b1edce68f0c85ef1852174f07d352b7861f..d95d07a8b334dd88aaa83b84003b90b8857a332d 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.html
@@ -1,116 +1,106 @@
-<%! from django.core.urlresolvers import reverse %>
-<%namespace name='static' file='../static_content.html'/>
-
-<%inherit file="../main.html" />
-
-<%block name="title"><title>FAQ</title></%block>
-
-<section class="container about">
- <nav>
- <a href="${reverse('about_edx')}">Vision</a>
- <a href="${reverse('faq_edx')}" class="active">Faq</a>
- <a href="${reverse('press')}">Press</a>
- <a href="${reverse('contact')}">Contact</a>
- </nav>
-
- <section class="faq">
-
- <section class="responses">
- <section id="the-organization" class="category">
- <h2>Organization</h2>
- <article class="response">
- <h3>What is edX?</h3>
- <p>EdX is a not-for-profit enterprise, governed by the Massachusetts Institute of Technology (MIT) and Harvard University to offer online learning to on-campus students and to millions of people around the world. To do so, edX is building an open-source online learning platform and hosts an online web portal at <a href="www.edx.org">www.edx.org</a> for online education.</p>
- <p>EdX currently offers HarvardX, <em>MITx</em> and BerkeleyX classes online for free. These institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning – both on-campus and online throughout the world.</p>
- </article>
- <article class="response">
- <h3>What are "X Universities"?</h3>
- <p>Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the X University Consortium, whose membership will expand to include additional X Universities as soon as possible. Each member of the consortium will offer courses on the edX platform as an X University. The gathering of many universities' educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.</p>
- </article>
- <article class="response">
- <h3>Why is UC Berkeley joining edX?</h3>
- <p>Like Harvard and MIT, UC Berkeley seeks to advance the edX mission "to enhance human fulfillment worldwide through online learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based students and the worldwide community of online learners".</p>
- <p>UC Berkeley shares the edX commitment to the not-for-profit and open-platform model as a way to transform learning and enhance education on campus and around the world and is providing significant new, open source software to the collaboration.</p>
- </article>
- <article class="response">
- <h3>What will UC Berkeley's direct participation entail?</h3>
- <p>UC Berkeley will begin by offering two courses on edX in Fall 2012, and will collaborate on the development of the technology platform. We will explore, experiment and innovate together.</p>
- </article>
- <article class="response">
- <h3>Why is edX only adding one X University?</h3>
- <p>More than 120 universities from around the world have expressed interested in collaborating with edX since Harvard and MIT announced its creation in May. EdX is obsessed with quality and developing the best non-profit model for online education. In addition to providing online courses on the edX platform, the X University Consortium will be a forum in which members can share experiences around online learning.</p>
- <p>EdX will actively explore the addition of other institutions from around the world to the X University platform based on a series of priorities, including, for example: adherence to the edX non-profit model; diversifying the geographic base of X Universities; and bringing together the world’s thought leaders in online education, among other criteria.</p>
- </article>
- <article class="response">
- <h3>Who leads edX?</h3>
- <p>Anant Agarwal, formerly Director of the Computer Science and Artificial Intelligence Laboratory at MIT, serves as the first president of edX, and edX is governed by a board consisting of key leaders from Harvard and MIT, along with Agarwal, as President of edX. UC Berkeley will participate on the board as the Chair of the X University Consortium.</p>
- </article>
- <article class="response">
- <h3>How may another university participate in edX?</h3>
- <p>If you are from a university interested in discussing edX, please email <a href="mailto:university@edxonline.org">university@edxonline.org</a></p>
- </article>
- </section>
-
- ##<section id="objectives" class="category">
- ## <h2>Objectives</h2>
- ##</section>
-
- <section id="students" class="category">
- <h2>Students</h2>
- <article class="response">
- <h3>Who can take edX courses? Will there be an admissions process?</h3>
- <p>EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.</p>
- </article>
- <article class="response">
- <h3>How may I apply to study with edX?</h3>
- <p>Simply complete the <a href="#signup-modal" rel="leanModal">sign up form</a>. Enrolling will create your unique student record in the edX database, allow you to register for classes, and to receive a certificate on successful completion.</p>
- </article>
- <article class="response">
- <h3>Will certificates be awarded?</h3>
- <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying X University from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX. For the courses in fall 2012, those certificates will be free. There is plan to charge a modest fee for certificates in the future. Exact pricing has not been determined, and pricing may vary by student location, but a charge in the range of $100-$200 per course has been discussed.</p>
- </article>
- <article class="response">
- <h3>What will the scope of the online courses be? How many? Which faculty?</h3>
- <p>Our goal is to offer a wide variety of courses across disciplines. There are currently seven courses offered for <a href="${reverse('courses')}">Fall 2012.</a></p>
- </article>
- <article class="response">
- <h3>Who is the learner? Domestic or international? Age range?</h3>
- <p>Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don’t have a target group of potential learners, as the goal is to make these courses available to anyone in the world – from any demographic – who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for <em>MITx</em>'s first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.</p>
- </article>
- <article class="response">
- <h3>Will participating universities' standards apply to all courses offered on the edX platform?</h3>
- <p>Yes: the reach changes exponentially, but the rigor remains the same.</p>
- </article>
- </section>
-
- <section id="technology-platform" class="category">
- <h2>Technology Platform</h2>
- <article class="response">
- <h3>What technology will edX use?</h3>
- <p>The edX open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators.</p>
- <p>The first version of the technology was used in the first <em>MITx</em> course, 6.002x Circuits and Electronics, which launched in Spring, 2012.</p>
- </article>
- <article class="response">
- <h3>How is this different from what other universities are doing online?</h3>
- <p>EdX is a not-for-profit enterprise built by the shared educational missions of its founding partners, Harvard University and MIT. The edX platform will be available as open source. Also, a primary goal of edX is to improve teaching and learning on campus by experimenting with blended models of learning and by supporting faculty in conducting significant research on how students learn.</p>
- </article>
- <article class="response">
- <h3>How do you intend to test whether this approach is improving learning?</h3>
- <p>EdX institutions have assembled faculty who will study data collection and analytical tools to assess results and the impact edX is having on learning.</p>
- </article>
- </section>
-
- </section>
-
- <nav class="categories">
- <a href="#organization">Organization</a>
- ##<a href="#objectives">Objectives</a>
- <a href="#students">Students</a>
- <a href="#technology-platform">Technology Platform</a>
- </nav>
- </section>
-</section>
-
-%if user.is_authenticated():
- <%include file="../signup_modal.html" />
-%endif
+<%! from django.core.urlresolvers import reverse %>
+<%namespace name='static' file='../static_content.html'/>
+
+<%inherit file="../main.html" />
+
+<%block name="title"><title>FAQ</title></%block>
+
+<section class="container about">
+ <nav>
+ <a href="${reverse('about_edx')}">Vision</a>
+ <a href="${reverse('faq_edx')}" class="active">Faq</a>
+ <a href="${reverse('press')}">Press</a>
+ <a href="${reverse('contact')}">Contact</a>
+ </nav>
+ <section class="faq">
+ <section class="responses">
+ <section id="the-organization" class="category">
+ <h2>Organization</h2>
+ <article class="response">
+ <h3>What is edX?</h3>
+ <p>EdX is a not-for-profit enterprise of its founding partners, the Massachusetts Institute of Technology (MIT) and Harvard University that offers online learning to on-campus students and to millions of people around the world. To do so, edX is building an open-source online learning platform and hosts an online web portal at <a href="http://www.edx.org">www.edx.org</a> for online education.</p>
+ <p>EdX currently offers HarvardX, <em>MITx</em> and BerkeleyX classes online for free. These institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning – both on-campus and online throughout the world.</p>
+ </article>
+ <article class="response">
+ <h3>What are "X Universities"?</h3>
+ <p>Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities" as soon as possible. Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities. </p>
+ </article>
+ <article class="response">
+ <h3>Why is UC Berkeley joining edX?</h3>
+ <p>Like Harvard and MIT, UC Berkeley seeks to transform education in quality, efficiency and scale through technology and research, for the benefit of campus-based students and the global community of online learners. </p>
+ <p>UC Berkeley also shares the edX commitment to the not-for-profit and open-platform model as a way to enhance human fulfillment worldwide. </p>
+ </article>
+ <article class="response">
+ <h3>What will UC Berkeley's direct participation entail?</h3>
+ <p>UC Berkeley will begin by offering two courses on edX in Fall 2012, and will collaborate on the development of the technology platform. We will explore, experiment and innovate together.</p>
+ </article>
+ <article class="response">
+ <h3>Why is edX only adding one X University?</h3>
+ <p>More than 120 universities from around the world have expressed interest in collaborating with edX since Harvard and MIT announced its creation in May. EdX is focused above all on quality and developing the best non-profit model for online education. In addition to providing online courses on the edX platform, the "X University" Consortium will be a forum in which members can share experiences around online learning. </p>
+ <p>EdX will actively explore the addition of other institutions from around the world to the edX platform, and we look forward to adding more "X Universities" as capacity increases. </p>
+ </article>
+ </section>
+
+ <section id="students" class="category">
+ <h2>Students</h2>
+ <article class="response">
+ <h3>Who can take edX courses? Will there be an admissions process?</h3>
+ <p>EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.</p>
+ </article>
+ <article class="response">
+ <h3>Will certificates be awarded? </h3>
+ <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX. For the courses in Fall 2012, those certificates will be free. There is a plan to charge a modest fee for certificates in the future</p>
+ </article>
+ <article class="response">
+ <h3>What will the scope of the online courses be? How many? Which faculty?</h3>
+ <p>Our goal is to offer a wide variety of courses across disciplines. There are currently <a href="${reverse('courses')}">seven courses</a> offered for Fall 2012.</p>
+ </article>
+ <article class="response">
+ <h3>Who is the learner? Domestic or international? Age range?</h3>
+ <p>Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don’t have a target group of potential learners, as the goal is to make these courses available to anyone in the world – from any demographic – who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for MITx's first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.</p>
+ </article>
+ <article class="response">
+ <h3>Will participating universities’ standards apply to all courses offered on the edX platform?</h3>
+ <p>Yes: the reach changes exponentially, but the rigor remains the same.</p>
+ </article>
+ <article class="response">
+ <h3>How do you intend to test whether this approach is improving learning?</h3>
+ <p>Edx institutions have assembled faculty members who will collect and analyze data to assess results and the impact edX is having on learning.</p>
+ </article>
+ <article class="response">
+ <h3>How may I apply to study with edX?</h3>
+ <p>Simply complete the online <a href="#signup-modal" rel="leanModal">signup form</a>. Enrolling will create your unique student record in the edX database, allow you to register for classes, and to receive a certificate on successful completion.</p>
+ </article>
+ <article class="response">
+ <h3>How may another university participate in edX? </h3>
+ <p>If you are from a university interested in discussing edX, please email <a href="mailto:university@edx.org">university@edx.org</a></p>
+ </article>
+ </section>
+
+ <section id="technology-platform" class="category">
+ <h2>Technology Platform</h2>
+ <article class="response">
+ <h3>What technology will edX use?</h3>
+ <p>The edX open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.</p>
+ <p>The first version of the technology was used in the first <em>MITx</em> course, 6.002x Circuits and Electronics, which launched in Spring, 2012.</p>
+ </article>
+ <article class="response">
+ <h3>How is this different from what other universities are doing online?</h3>
+ <p>EdX is a not-for-profit enterprise built upon the shared educational missions of its founding partners, Harvard University and MIT. The edX platform will be available as open source. Also, a primary goal of edX is to improve teaching and learning on campus by experimenting with blended models of learning and by supporting faculty in conducting significant research on how students learn.</p>
+ </article>
+ </section>
+
+ </section>
+
+ <nav class="categories">
+ <a href="#organization">Organization</a>
+ ##<a href="#objectives">Objectives</a>
+ <a href="#students">Students</a>
+ <a href="#technology-platform">Technology Platform</a>
+ </nav>
+ </section>
+</section>
+
+%if user.is_authenticated():
+ <%include file="../signup_modal.html" />
+%endif
diff --git a/lms/templates/static_templates/honor.html b/lms/templates/static_templates/honor.html
index 121bcba44e78bdcb3f6fa879dceee1d052fdf5ed..dc88b3f1efd1cf7250e0bf0939550cfe10df0637 100644
--- a/lms/templates/static_templates/honor.html
+++ b/lms/templates/static_templates/honor.html
@@ -7,55 +7,27 @@
<%block name="title"><title>Honor Code</title></%block>
<section class="static-container honor-code">
- <h1> Honor Code </h1>
+ <h1>Honor Code</h1>
<hr class="horizontal-divider">
<div class="inner-wrapper">
- <p> By enrolling in a course on <i>edX</i>, you are joining a
- special worldwide community of learners. The aspiration
- of <i>edX</i> is to provide anyone in the world who has the
- motivation and ability to engage edX coursework the opportunity
- to attain the best edX-based educational experience that
- Internet technology enables. You are part of the community who
- will help <i>edX</i> achieve this goal.</p>
-
- <p> <i>edX</i> depends upon your motivation to learn the material
- and to do so with honesty. In order to participate
- in <i>edX</i>, you must agree to the Honor Code below and any
- additional terms specific to a class. This Honor Code, and any
- additional terms, will be posted on each class website.</p>
-
- <h2><i>edX</i> Honor Code Pledge</h2>
-
- <p> By enrolling in an <i>edX</i> course, I agree that I will:</p>
+ <h2>Collaboration Policy</h2>
+ <p>By enrolling in a course on edX, you are joining a special worldwide community of learners. The aspiration of edX is to provide anyone in the world who has the motivation and ability to engage coursework from the Massachusetts Institute of Technology, Harvard University and the University of California, Berkeley the opportunity to attain the best MIT, Harvard and UC Berkeley-based educational experience that internet technology enables. You are part of the community who will help edX achieve this goal.</p>
+ <p>EdX depends upon your motivation to learn the material and to do so with honesty. In order to participate in edX, you must agree to the Honor Code below and any additional terms specific to a class. This Honor Code, and any additional terms, will be posted on each class website.</p>
+ <h2>edX Honor Code Pledge</h2>
+ <p>By enrolling in an edX course, I agree that I will:</p>
<ul>
- <li>
- <p>Complete all mid-terms and final exams with my own work and only my own work. I will not submit the work of any other person.</p>
- </li>
- <li>
- <p>Maintain only one user account and not let anyone else use my username and/or password.</p>
- </li>
- <li>
- <p>Not engage in any activity that would dishonestly improve my results, or improve or hurt the results of others.</p>
- </li>
- <li>
- <p>Not post answers to problems that are being used to assess student performance.</p>
- </li>
+ <li>Complete all mid-terms and final exams with my own work and only my own work. I will not submit the work of any other person.</li>
+ <li>Maintain only one user account and not let anyone else use my username and/or password.</li>
+ <li>Not engage in any activity that would dishonestly improve my results, or improve or hurt the results of others.</li>
+ <li>Not post answers to problems that are being used to assess student performance.</li>
</ul>
-
- <p> Unless otherwise indicated by the instructor of an <i>edX</i> course, learners on <i>edX</i> are encouraged to:</p>
-
+ <p>Unless otherwise indicated by the instructor of an edX course, learners on edX are encouraged to:</p>
<ul>
- <li>
- <p>Collaborate with others on the lecture videos, exercises, homework and labs.</p>
- </li>
- <li>
- <p>Discuss with others general concepts and materials in each course.</p>
- </li>
- <li>
- <p>Present ideas and written work to fellow <i>edX</i> learners or others for comment or criticism.</p>
- </li>
+ <li>Collaborate with others on the lecture videos, exercises, homework and labs.</li>
+ <li>Discuss with others general concepts and materials in each course.</li>
+ <li>Present ideas and written work to fellow edX learners or others for comment or criticism.</li>
</ul>
</div>
</section>
diff --git a/lms/templates/static_templates/privacy.html b/lms/templates/static_templates/privacy.html
index ec50d074337c21958fcb3b98b3efcd5b8caeb5b7..f4106c080f63480a1a8bf640fc2947c8753e0789 100644
--- a/lms/templates/static_templates/privacy.html
+++ b/lms/templates/static_templates/privacy.html
@@ -10,194 +10,56 @@
<hr class="horizontal-divider">
<div class="inner-wrapper">
- <h2>Confidentiality & Security of Personally
- Identifiable Information</h2>
+ <h2>Confidentiality & Security of Personally Identifiable Information</h2>
+ <p>We care about the confidentiality and security of your personal information. We will use commercially reasonable efforts to keep your Personally Identifiable Information private and will not share it with third parties, except as set forth in this Privacy Policy. However, no method of transmitting or storing electronic data is ever completely secure, and we cannot guarantee that such information will never be accessed, used or released in a manner that is inconsistent with this policy.</p>
+ <p>This Privacy Policy only applies to information that we collect through the Site and does not apply to information that we may collect from you in other ways (for example, this policy does not apply to information that you may provide to us over the phone, by fax or through conventional mail). In addition, please note your educational records are protected by the Family Educational Rights and Privacy Act ("FERPA") to the extent FERPA applies.</p>
- <p>We care about the confidentiality and security of your personal
- information. We will use commercially reasonable efforts to keep your
- Personally Identifiable Information private and will not share it with third
- parties, except as set forth in this Privacy Policy. However, no method of
- transmitting or storing electronic data is ever completely secure, and we
- cannot guarantee that such information will never be accessed, used, or
- released in a manner that is inconsistent with this policy. </p>
-
- <p>This Privacy Policy only applies to information that we collect
- through the Site and does not apply to information that we may collect
- from you in other ways (for example, this policy does not apply to
- information that you may provide to us over the phone, by fax or
- through conventional mail). In addition, please note your educational
- records are protected by the Family Educational Rights and Privacy Act
- ("FERPA") to the extent FERPA applies.</p>
-
- <h2>Usernames and Postings </h2>
-
- <p>Comments or other information posted by you to our forums,
- wikis, or other areas of the Site designed for public communications may be
- viewed and downloaded by others who visit the Site. For this reason, we
- encourage you to use an anonymous username, and to not post any personally
- identifiable information to those forums (or other public areas).</p>
+ <h2>Usernames and Postings</h2>
+ <p>Comments or other information posted by you to our forums, wikis or other areas of the Site designed for public communications may be viewed and downloaded by others who visit the Site. For this reason, we encourage you to use an anonymous username, and to not post any personally identifiable information to those forums (or other public areas).</p>
<h2>What You Consent to by Using Our Site</h2>
+ <p>By submitting any Personally Identifiable Information to us, you consent and agree that such Personally Identifiable Information may be collected, used and disclosed in accordance with the Privacy Policy and our Terms of Service (“TOSâ€) and as permitted or required by law, and that such Personally Identifiable Information may be transferred to, processed in and stored in the United States. If you do not agree with these terms, then please do not provide any Personally Identifiable Information to us. As used herein, ‘Personally Identifiable Information’ means any information about yourself that you may provide to us, including, but not limited to, your name, contact information, gender and date of birth. If you refuse, or if you choose not to provide us with any required Personally Identifiable Information, we may not be able to provide you with the services that can be offered on our Site.</p>
- <p>Please understand that by submitting any Personally Identifiable
- Information to us, you consent and agree that we may collect, use and
- disclose such Personally Identifiable Information in accordance with
- this Privacy Policy and our Terms of Service ("TOS"), and as
- permitted or required by law. If you do not agree with these terms,
- then please do not provide any Personally Identifiable Information to
- us. As used herein, "Personally Identifiable Information"
- means your full name, email address, your physical address (if you
- provide it) and your student identification number, if applicable. If
- you refuse, or if you choose not to provide us with any required
- Personally Identifiable Information, we may not be able to provide you
- with the services that can be offered on our Site.</p>
-
- <h2>Information We Collect and How We Use It </h2>
+ <h2>Information We Collect and How We Use It</h2>
+ <p>We collect information, including Personally Identifiable Information, when you sign up for a User Account, participate in online courses, send us email messages and/or participate in our public forums. We collect information about student performance and patterns of learning. We track information indicating, among other things, which pages of our Site were visited, the order in which they were visited, when they were visited and which hyperlinks and other user interface controls were used.</p>
- <p>We collect information, including Personally Identifiable
- Information, when you sign up for a User Account, participate in
- online courses, send us email messages and/or participate in our
- public forums. We collect information about student performance and
- patterns of learning. We track information indicating, among other
- things, which pages of our Site were visited, the order in which they
- were visited, when they were visited, and which hyperlinks and other
- user interface controls were used.</p>
-
- <p>We may log the IP address, operating system and browser software
- used by each user of the Site, and we may be able to determine from an
- IP address a user's Internet Service Provider and the geographic
- location of his or her point of connectivity. Various web analysis
- tools are used to collect this information. Some of the information is
- collected through cookies (a small text file placed on your
- computer). You should be able to control how and whether cookies will
- be accepted by your web browser. Most browsers offer instructions on
- how to reset the browser to reject cookies in the "Help"
- section of the toolbar. If you reject our cookies, many functions and
- conveniences of this Site may not work properly.</p>
-
- <p>Among other things, we may use the information that you provide
- (including your Personally Identifiable Information) in connection
- with the following:</p>
+ <p>We may log the IP address, operating system and browser software used by each user of the Site, and we may be able to determine from an IP address a user's Internet Service Provider and the geographic location of his or her point of connectivity. Various web analysis tools are used to collect this information. Some of the information is collected through cookies (a small text file placed on your computer). You should be able to control how and whether cookies will be accepted by your web browser. Most browsers offer instructions on how to reset the browser to reject cookies in the "Help" section of the toolbar. If you reject our cookies, many functions and conveniences of this Site may not work properly.</p>
+ <p>Among other things, we may use the information that you provide (including your Personally Identifiable Information) in connection with the following:</p>
<ul>
- <li>To help us improve <i>MITx</i> offerings, both individually
- (e.g. by course staff when working with a student) and in
- aggregate, and to individualize the experience and to evaluate
- the access and use of the Site and the impact of <i>MITx</i> on
- the worldwide educational community.
- </li>
- <li>For purposes of scientific research, particularly, for
- example, in the areas of cognitive science and education. </li>
- <li>For the purpose for which you specifically provided
- the personal information, for example to respond to a specific inquiry or
- provide you the specific course and/or services you select. </li>
- <li>To track both individual and aggregate attendance,
- progress and completion of an online course, and to analyze statistics on
- student performance and how students learn. </li>
- <li>To monitor and detect violations of the Honor Code, the
- Terms of Service, as well as other misuses and potential misuses of the
- site. </li>
- <li>To publish information gathered about <i>MITx</i>
- access, use, impact, and student performance but only as non-personally
- identifiable data.</li>
- <li>To send you updates about online courses offered by <i>MITx</i>
- or other MIT events or to send you email messages about Site maintenance
- or updates.</li>
- <li>To archive this information and/or use it for future
- communications with you.</li>
- <li>As otherwise described to you at the point of
- collection. </li>
+ <li>To help us improve edX offerings, both individually (e.g. by course staff when working with a student) and in aggregate, and to individualize the experience and to evaluate the access and use of the Site and the impact of edX on the worldwide educational community. </li>
+ <li>For purposes of scientific research, particularly, for example, in the areas of cognitive science and education. </li>
+ <li>For the purpose for which you specifically provided the personal information, for example, to respond to a specific inquiry or provide you the specific course and/or services you select.</li>
+ <li>To track both individual and aggregate attendance, progress and completion of an online course, and to analyze statistics on student performance and how students learn.</li>
+ <li>To monitor and detect violations of the Honor Code, the Terms of Service, as well as other misuses and potential misuses of the site. </li>
+ <li>To publish information gathered about edX access, use, impact and student performance but only as non-personally identifiable data.</li>
+ <li>To send you updates about online courses offered by edX or other events or to send you email messages about Site maintenance or updates.</li>
+ <li>To archive this information and/or use it for future communications with you.</li>
+ <li>As otherwise described to you at the point of collection.</li>
</ul>
- <p> In addition to the above situations where your information may be
- shared with others, there is also the possibility that <i>MITx</i>
- will affiliate with other educational institutions and/or
- that <i>MITx</i> will become a (or part of a) nonprofit entity
- separate from MIT. In those events, the other educational
- institutions and/or separate entity will have access to the
- information you provide, to the extent permitted by FERPA.</p>
+ <p>In addition to the above situations where your information may be shared with others, there is also the possibility that edX will affiliate with other educational institutions and/or that edX will become a (or part of a) nonprofit entity separate from MIT, Harvard University and UC Berkeley. In those events, the other educational institutions and/or separate entity will have access to the information you provide, to the extent permitted by FERPA.</p>
<h2>Sharing with Third Parties</h2>
-
- <p>We may share the information we collect with third parties
- as follows:</p>
-
+ <p>We may share the information we collect with third parties as follows:</p>
<ul>
- <li> With service providers or
- contractors that perform certain functions on our behalf, including processing
- information that you provide to us on the Site, operating the Site or portions
- of it, or in connection with other aspects of <i>MITx</i> services. These
- service providers and contractors will be obligated to keep your information
- confidential.</li>
-
- <li> With all users and other visitors
- to the Site, to the extent that you submit post comments or other information
- to a portion of the Site designed for public communications. As provided in the
- Terms of Service, we may provide those postings to students in future offerings
- of the course, either within the context of the forums, the courseware, or
- otherwise, for marketing purposes, or in any other way. If we do use your postings,
- we will use them without your real name and e-mail (except with explicit
- permission), but we may use your username. </li>
-
- <li>To connect you to other users of the Site. For instance, we
- may recommend specific study partners, or connect potential student
- mentees and mentors. In such cases, we may use all information
- collected to determine who to connect you to, but we will only connect
- you by username, and not disclose your real name or e-mail address to
- your contact. </li>
-
- <li> To respond to subpoenas, court orders, or other legal process, in
- response to a request for cooperation from law enforcement or another
- government agency, to investigate, prevent, or take action regarding
- illegal activities, suspected fraud, or to enforce our user agreement
- or privacy policy, or to protect our rights or the rights of
- others.</li>
-
- <li> As otherwise described to you at the point of collection or
- pursuant to your consent. For example, from time to time, we may ask
- your permission to use your Personally Identifiable Information in
- other ways. In the future, <i>MITx</i> may have an alumni association,
- resume book, etc. We may offer services where it is possible to
- verify <i>MITx</i> credentials. </li>
-
- <li> For integration with third party services. Videos and other
- content may be hosted on YouTube and other web sites not controlled
- by <i>MITx</i>. We may provide links and other integration with social
- networks, and other sites. Those web sites are guided by their own
- privacy policies. </li>
+ <li>With service providers or contractors that perform certain functions on our behalf, including processing information that you provide to us on the Site, operating the Site or portions of it or in connection with other aspects of edX services. These service providers and contractors will be obligated to keep your information confidential.</li>
+ <li>With all users and other visitors to the Site, to the extent that you submit post comments or other information to a portion of the Site designed for public communications. As provided in the Terms of Service, we may provide those postings to students in future offerings of the course, either within the context of the forums, the courseware or otherwise, for marketing purposes, or in any other way. If we do use your postings, we will use them without your real name and e-mail (except with explicit permission), but we may use your username. </li>
+ <li>To connect you to other users of the Site. For instance, we may recommend specific study partners or connect potential student mentees and mentors. In such cases, we may use all information collected to determine who to connect you to, but we will only connect you by username, and not disclose your real name or e-mail address to your contact. </li>
+ <li>To respond to subpoenas, court orders, or other legal process, in response to a request for cooperation from law enforcement or another government agency, to investigate, prevent or take action regarding illegal activities, suspected fraud, or to enforce our user agreement or privacy policy, or to protect our rights or the rights of others.</li>
+ <li>As otherwise described to you at the point of collection or pursuant to your consent. For example, from time to time, we may ask your permission to use your Personally Identifiable Information in other ways. In the future, edX may have an alumni association, resume book, etc. We may offer services where it is possible to verify edX credentials. </li>
+ <li>For integration with third party services. Videos and other content may be hosted on YouTube and other web sites not controlled by edX. We may provide links and other integration with social networks and other sites. Those web sites are guided by their own privacy policies. </li>
</ul>
<h2>Personalization and Pedagogical Improvements</h2>
-
- <p>Our goal is to provide current and future visitors with the best
- possible educational experience. To further this goal, we sometimes
- present different users with different versions of course materials
- and software. We do this to personalize the experience to the
- individual learner (assess the learner's level of ability and learning
- style, and present materials best suited to the learner), to evaluate
- the effectiveness of our course materials, to improve our
- understanding of the learning process, and to otherwise improve the
- effectiveness of our offerings. We may publish or otherwise publicize
- results from this process, but only as non-personally-identifiable
- data. </p>
+ <p>Our goal is to provide current and future visitors with the best possible educational experience. To further this goal, we sometimes present different users with different versions of course materials and software. We do this to personalize the experience to the individual learner (assess the learner's level of ability and learning style, and present materials best suited to the learner), to evaluate the effectiveness of our course materials, to improve our understanding of the learning process and to otherwise improve the effectiveness of our offerings. We may publish or otherwise publicize results from this process, but only as non-personally-identifiable data.</p>
<h2>Changing Our Privacy Policy</h2>
-
- <p>Please note that we review our privacy practices from time to time,
- and that these practices are subject to change. We will publish notice
- of any such modifications online on this page for a reasonable period
- of time following such modifications, and by changing the effective
- date of this Privacy Policy. By continuing to access the Site after
- such changes have been posted, you signify your agreement to be bound
- by them. Be sure to return to this page periodically to ensure
- familiarity with the most current version of this Privacy Policy. </p>
+ <p>Please note that we review our privacy practices from time to time, and that these practices are subject to change. We will publish notice of any such modifications online on this page for a reasonable period of time following such modifications, and by changing the effective date of this Privacy Policy. By continuing to access the Site after such changes have been posted, you signify your agreement to be bound by them. Be sure to return to this page periodically to ensure familiarity with the most current version of this Privacy Policy.</p>
<h2>Privacy Concerns</h2>
+ <p>If you have privacy concerns, or have disclosed data you would prefer to keep private, please contact us at <a href="mailto:privacy@edx.org">privacy@edx.org</a>.</p>
- <p>If you have privacy concerns, or have disclosed data you would
- prefer to keep private, please contact us
- at <a href="mailto:privacy@mitx.mit.edu">privacy@mitx.mit.edu</a>.</p>
-
- <p> Effective Date: February 6, 2012</p>
+ <p><strong>Effective Date:</strong> February 6, 2012</p>
</div>
</section>
diff --git a/lms/templates/static_templates/tos.html b/lms/templates/static_templates/tos.html
index 69e421c76e1855b8155f2935e57b3c7a33d07977..a58d8dde4ddcf6867eea2cdcce82436f166e86c9 100644
--- a/lms/templates/static_templates/tos.html
+++ b/lms/templates/static_templates/tos.html
@@ -6,311 +6,92 @@
<%block name="title"><title>Terms of Service</title></%block>
<section class="static-container tos">
- <h1>MITx Terms of Service</h1>
+ <h1>edX Terms of Service</h1>
<hr class="horizontal-divider">
<div class="inner-wrapper">
- <p>Welcome to <i>MITx</i>. You must read and agree to these Terms of Service
- ("TOS"), <i>MITx</i>’s <a href="${reverse('privacy_edx')}">Privacy
- Policy</a>, and <a href="${reverse('honor')}">Honor Code</a> prior to
- registering for this site or using any portion of this site
- (“Site”), including accessing any course materials, chat
- room, mailing list, or other electronic service. These TOS, the
- Privacy Policy and the Honor Code are agreements (the
- “Agreements”) between you and the Massachusetts Institute
- of Technology (“MIT”). If you do not understand or do not
- agree to be bound by the terms of the Agreements, please immediately
- exit this site. </p>
+ <p>Welcome to edX. You must read and agree to these Terms of Service ("TOS"), edX's <a href="${reverse('privacy_edx')}">Privacy Policy</a> and <a href="${reverse('honor')}">Honor Code</a> prior to registering for this site or using any portion of this site ("Site"), including accessing any course materials, chat room, mailing list or other electronic service. These TOS, the Privacy Policy and the Honor Code are agreements (the "Agreements") between you and the edX. If you do not understand or do not agree to be bound by the terms of the Agreements, please immediately exit this site.</p>
- <p><i>MITx</i> reserves the right to modify these TOS at any time and
- will publish notice of any such modifications online on this page for
- a reasonable period of time following such modifications, and by
- changing the effective date of these TOS. By continuing to access the
- Site after notice of such changes have been posted, you signify your
- agreement to be bound by them. Be sure to return to this page
- periodically to ensure familiarity with the most current version of
- these TOS. </p>
+ <p>EdX reserves the right to modify these TOS at any time and will publish notice of any such modifications online on this page for a reasonable period of time following such modifications and by changing the effective date of these TOS. By continuing to access the Site after notice of such changes have been posted, you signify your agreement to be bound by them. Be sure to return to this page periodically to ensure familiarity with the most current version of these TOS.</p>
- <h2>Description of <i>MITx</i> </h2>
-
- <p><i>MITx</i> offers online courses that include opportunities for
- professor-to-student and student-to-student interactivity, individual
- assessment of a student's work, and for students who demonstrate their
- mastery of subjects, a certificate or credential. </p>
+ <h2>Description of edX</h2>
+ <p>EdX offers online courses that include opportunities for professor-to-student and student-to-student interactivity, individual assessment of a student's work and for students who demonstrate their mastery of subjects, a certificate of mastery.</p>
<h2>Rules for Online Conduct</h2>
+ <p>You agree that you are responsible for your own use of the Site and for your User Postings. "User Postings" include all content submitted, posted, published or distributed on the Site by you or other users of the Site, including but not limited to all forum posts, wiki edits, notes, questions, comments, videos and file uploads. You agree that you will use the Site in compliance with these TOS, the Honor Code and all applicable local, state, national and international laws, rules and regulations, including copyright laws and any laws regarding the transmission of technical data exported from your country of residence and all United States export control laws.</p>
- <p>You agree that you are responsible for your own use of the Site and
- for your User Postings. “User Postings” include all
- content submitted, posted, published or distributed on the Site by you
- or other users of the Site, including but not limited to all forum
- posts, wiki edits, notes, questions, comments, videos, and file
- uploads. You agree that you will use the Site in compliance with these
- TOS, the <a href="${reverse('honor')}">Honor Code</a>, and all applicable
- local, state, national, and international laws, rules and regulations,
- including copyright laws and any laws regarding the transmission of
- technical data exported from your country of residence and all United
- States export control laws.
-
- <p>As a condition of your use of the Services, you will not use the
- Site in any manner intended to damage, disable, overburden, or impair
- any <i>MITx</i> server, or the network(s) connected to any <i>MITx</i>
- server, or interfere with any other party's use and enjoyment of the
- Site. You may not attempt to gain unauthorized access to the Site,
- other accounts, computer systems or networks connected to
- any <i>MITx</i> server through hacking, password mining or any other
- means. You may not obtain or attempt to obtain any materials or
- information stored on the Site, its servers, or associated computers
- through any means not intentionally made available through the
- Site. </p>
+ <p>As a condition of your use of the Services, you will not use the Site in any manner intended to damage, disable, overburden or impair any edX server or the network(s) connected to any edX server or interfere with any other party's use and enjoyment of the Site. You may not attempt to gain unauthorized access to the Site, other accounts, computer systems or networks connected to any edX server through hacking, password mining or any other means. You may not obtain or attempt to obtain any materials or information stored on the Site, its servers or associated computers through any means not intentionally made available through the Site.</p>
<h2>The following list of items is strictly prohibited on the Site:</h2>
<ol>
- <li>Content that defames, harasses, or threatens others
-
- <li>Content that discusses illegal activities with the intent to commit them.
-
- <li>Content that infringes another's intellectual property,
- including, but not limited to, copyrights, or trademarks
-
- <li>Any inappropriate, profane, pornographic, obscene, indecent, or
- unlawful content
-
- <li>Advertising or any form of commercial solicitation
-
- <li>Political content or content related to partisan political
- activities
-
- <li>Viruses, trojan horses, worms, time bombs, corrupted files,
- malware, spyware, or any other similar software that may damage the
- operation of another’s computer or property
-
- <li>Content that contains intentional inaccurate information with the
- intent of misleading others.
-
- <li>You, furthermore, agree not to scrape, or otherwise download in
- bulk, user-contributed content, a list or directory of users on the
- system, or other material including but not limited to on-line
- textbooks, User Postings, or user information.
-
- <li>You agree to not misrepresent or attempt to misrepresent your
- identity while using the Sites (although you are welcome and
- encouraged to use an anonymous username in the forums).
+ <li>Content that defames, harasses or threatens others</li>
+ <li>Content that discusses illegal activities with the intent to commit them</li>
+ <li>Content that infringes another's intellectual property, including, but not limited to, copyrights or trademarks</li>
+ <li>Any inappropriate, profane, pornographic, obscene, indecent or unlawful content</li>
+ <li>Advertising or any form of commercial solicitation</li>
+ <li>Political content or content related to partisan political activities</li>
+ <li>Viruses, trojan horses, worms, time bombs, corrupted files, malware, spyware or any other similar software that may damage the operation of another's computer or property</li>
+ <li>Content that contains intentional inaccurate information with the intent of misleading others</li>
+ <li>You, furthermore, agree not to scrape, or otherwise download in bulk, user-contributed content, a list or directory of users on the system or other material including but not limited to on-line textbooks, User Postings or user information. You agree to not misrepresent or attempt to misrepresent your identity while using the Sites (although you are welcome and encouraged to use an anonymous username in the forums).
</ol>
<h2>User Accounts and Authority</h2>
+ <p>In order to participate in Site activities, you must provide your name, an email address ("Email Address") and a user password ("User Password") in order to create a user account ("User Account"). You agree that you will never divulge or share access or access information to your User Account with any third party for any reason. In setting up your User Account, you may be prompted to enter additional optional information (i.e. your address). You understand and agree that all information provided by you is accurate and current. You agree to maintain and update your information to keep it accurate and current.</p>
- <p>In order to participate in Site activities, you must provide an
- email address ("Email Address") and a user password
- ("User Password") in order to create a user account
- (“User Account”). You agree that you will never divulge or
- share access or access information to your User Account with any third
- party for any reason. In setting up your User Account, you may be
- prompted or required to enter additional information, including your
- name. You understand and agree that all information provided by you is
- accurate and current. You agree to maintain and update your
- information to keep it accurate and current. </p>
-
- <p>We care about the confidentiality and security of your personal
- information. Please see our <a href="${reverse('privacy_edx')}">Privacy
- Policy</a> for more information about what information about
- you <i>MITx</i> collects and how <i>MITx</i> uses that
- information.</p>
+ <p>We care about the confidentiality and security of your personal information. Please see our <a href="${reverse('privacy_edx')}">Privacy Policy</a> for more information about what information about you edX collects and how edX uses that information.</p>
<h2>Your Right to Use Content on the Site</h2>
+ <p>Unless indicated as being in the public domain, all content on the Site is protected by United States copyright. The texts, exams and other instructional materials provided with the courses offered on this Site are for your personal use in connection with those courses only. The institutions of MIT, Harvard and the University of California, Berkeley ("UC Berkeley") are planning to make edX course content and software infrastructure available under open source licenses that will help create a vibrant ecosystem of contributors and further edX's goal of making education accessible and affordable to the world.</p>
- <p>Unless indicated as being in the public domain, all content on the
- Site is protected by United States copyright. The texts, exams and
- other instructional materials provided with the courses offered on
- this Site are for your personal use in connection with those courses
- only. MIT is planning to make <i>MITx</i> course content and software
- infrastructure available under open source licenses that will help
- create a vibrant ecosystem of contributors and further MIT’s
- goal of making education accessible and affordable to the world. </p>
-
- <p>Certain reference documents, digital textbooks, articles and other
- information on the Site are used with the permission of third parties
- and use of that information is subject to certain rules and
- conditions, which will be posted along with the information. By using
- this Site you agree to abide by all such rules and conditions. Due to
- privacy concerns, User Postings shall be licensed to <i>MITx</i> with
- the terms discussed below. Please
- see <a href="${reverse('copyright')}"><i>MITx's Copyright Page</i></a> for
- more information.</p>
+ <p>Certain reference documents, digital textbooks, articles and other information on the Site are used with the permission of third parties and use of that information is subject to certain rules and conditions, which will be posted along with the information. By using this Site you agree to abide by all such rules and conditions. Due to privacy concerns, User Postings shall be licensed to edX with the terms discussed below.</p>
<h2>User Postings</h2>
+ <p><strong>User Postings Representations and Warranties.</strong> By submitting or distributing your User Postings, you affirm, represent and warrant that you are the creator and owner of, or have the necessary licenses, rights, consents and permissions to reproduce and publish the posted information, authorize edX's Users to reproduce, modify, publish and otherwise use that information and distribute your User Postings as necessary to exercise the licenses granted by you below. You, and not edX, are solely responsible for your User Postings and the consequences of posting or publishing them.</p>
- <p><strong>User Postings Representations and Warranties.</strong> By
- submitting or distributing your User Postings, you affirm, represent,
- and warrant that you are the creator and owner of or have the
- necessary licenses, rights, consents, and permissions to reproduce and
- publish the posted information, and to authorize MIT and <i>MITx</i>'s
- Users to reproduce, modify, publish, and otherwise use that infomation
- and distribute your User Postings as necessary to exercise the
- licenses granted by you below. You, and not <i>MITx</i>, are solely
- responsible for your User Postings and the consequences of posting or
- publishing them.</p>
-
- <p><strong>Limited License Grant to MIT.</strong> By submitting or
- distributing User Postings to the Site, you hereby grant to MIT a
- worldwide, non-exclusive, transferable, assignable, fully paid-up,
- royalty-free, perpetual, irrevocable right and license to host,
- transfer, display, perform, reproduce, modify, distribute and
- re-distribute, relicense, and otherwise exploit your User Postings, in
- whole or in part, in any form, and in any media formats and through
- any media channels (now known or hereafter developed).</p>
-
- <p><strong>Limited License Grant to <i>MITx</i> Users.</strong> By
- submitting or distributing User Postings to the Site, you hereby grant
- to each User of the Site a non-exclusive license to access and use
- your User Postings in connection with their use of the Site for their
- own personal purposes. </p>
+ <p><strong>Limited License Grant to edX.</strong> By submitting or distributing User Postings to the Site, you hereby grant to edX a worldwide, non-exclusive, transferable, assignable, fully paid-up, royalty-free, perpetual, irrevocable right and license to host, transfer, display, perform, reproduce, modify, distribute, re-distribute, relicense and otherwise exploit your User Postings, in whole or in part, in any form and in any media formats and through any media channels (now known or hereafter developed).</p>
- <h2>Use of <i>MITx</i> and MIT Names, Trademarks and Service Marks</h2>
+ <p><strong>Limited License Grant to edX Users.</strong> By submitting or distributing User Postings to the Site, you hereby grant to each User of the Site a non-exclusive license to access and use your User Postings in connection with their use of the Site for their own personal purposes.</p>
- <p>“<i>MITx</i>,” "MIT", "Massachusetts Institute
- of Technology", and its logos and seal are trademarks of the
- Massachusetts Institute of Technology. You may not use MIT’s
- names or logos, or any variations thereof, without prior written
- consent of MIT. You may not use the MIT name in any of its forms nor
- MIT seals or logos for promotional purposes, or in any way that
- deliberately or inadvertently claims, suggests, or in MIT's sole
- judgment gives the appearance or impression of a relationship with or
- endorsement by MIT.
-
- <p>All Trademarks not owned by MIT that appear on the Site or on or
- through the services made available on or through the Site, if any,
- are the property of their respective owners. Nothing contained
- on the Site should be construed as granting, by implication, estoppel,
- or otherwise, any license or right to use any such Trademark displayed
- on the Site without the written permission of the third party that may
- own the applicable Trademark.</a>
+ <p><strong>Use of edX, MIT, Harvard University and UC Berkeley Names, Trademarks and Service Marks.</strong> The "edX," "MIT," "Harvard University" and "UC Berkeley" names, logos and seals are trademarks ("Trademarks") of the respective universities. You may not use these institutions' Trademarks, or any variations thereof, without their prior written consent. You may not use their Trademarks, or any variations thereof, for promotional purposes, or in any way that deliberately or inadvertently claims, suggests or, in these institutions' sole judgment, gives the appearance or impression of a relationship with or endorsement by these institutions.</p>
+ <p>All Trademarks not owned by these institutions that appear on the Site or on or through the services made available on or through the Site, if any, are the property of their respective owners. Nothing contained on the Site should be construed as granting, by implication, estoppel or otherwise, any license or right to use any such Trademark displayed on the Site without the written permission of the third party that may own the applicable Trademark.</p>
<h2>Digital Millennium Copyright Act</h2>
+ <p>Copyright owners who believe their material has been infringed on the Site should contact edX's designated copyright agent at <a href="mailto:dcma-agent@mit.edu">dcma-agent@mit.edu</a> or at 77 Massachusetts Avenue, Cambridge, MA 02138-4307 Attention: MIT DCMA Agent, W92-263A.</p>
- <p> Copyright owners who believe their material has been infringed on
- the Site should contact MITx's designated copyright agent at
- dcma-agent@mit.edu or at 77 Massachusetts Avenue, Cambridge, MA
- 02138-4307 Attention: MIT DCMA Agent, W92-263A.</p>
-
- <p> Notification must include:</P>
+ <p>Notification must include:</p>
<ul>
- <li> Identification of the copyrighted work, or, in the case of
- multiple works at the same location, a representative list of such
- works at that site.</li>
- <li> Identification of the material that is claimed to be infringing
- or to be the subject of infringing activity. You must include
- sufficient information for us to locate the material (e.g., url, ip
- address, computer name).</li>
- <li> Information for us to be able to contact the complaining party
- (e.g., email address, phone number).</li>
- <li> A statement that the complaining party believes that the use of
- the material has not been authorized by the copyright owner or an
- authorized agent.</li>
- <li> A statement that the information in the notification is accurate
- and that the complaining party is authorized to act on behalf of the
- copyright owner.</li>
+ <li>Identification of the copyrighted work, or, in the case of multiple works at the same location, a representative list of such works at that site.</li>
+ <li>Identification of the material that is claimed to be infringing or to be the subject of infringing activity. You must include sufficient information for us to locate the material (e.g., url, ip address, computer name).</li>
+ <li>Information for us to be able to contact the complaining party (e.g., email address, phone number).</li>
+ <li>A statement that the complaining party believes that the use of the material has not been authorized by the copyright owner or an authorized agent.</li>
+ <li>A statement that the information in the notification is accurate and that the complaining party is authorized to act on behalf of the copyright owner.</li>
</ul>
<h2>Disclaimer of Warranty / Indemnification/Limitation of Liabilities</h2>
+ <p>THE SITE IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR USE FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. EdX does not warrant the Site will operate in an uninterrupted or error-free manner or that the Site is free of viruses or other harmful components. Use of information obtained from or through this Site is at your own risk. Your access to or download of information, materials or data through the Site or any reference sites is at your own discretion and risk and that you will be solely responsible for any damage to your property (including your computer system) or loss of data that results from the download or use of such material or data. We may close or limit enrollment for pedagogical or technological reasons.</p>
+ <p><strong>User Postings Disclaimer.</strong> You understand that when using the Site you will be exposed to User Postings from a variety of sources and that edX is not responsible for the accuracy, usefulness, reliability or intellectual property rights of or relating to such User Postings. You further understand and acknowledge that you may be exposed to User Postings that are inaccurate, offensive, defamatory, indecent or objectionable and you agree to waive, and hereby do waive, any legal or equitable rights or remedies you have or may have against edX with respect thereto. EdX does not endorse any User Postings or any opinion, recommendation or advice expressed therein. EdX has no obligation to monitor any User Postings or any other user communications through the Site.</p>
+ <p>However, edX reserves the right to review User Postings and to edit or remove, in whole or in part, such User Postings in its sole discretion. If notified by a User or a content owner of a User Posting that allegedly does not conform to the TOS, edX may investigate the allegation and determine in its sole discretion whether to remove the User Posting, which it reserves the right to do at any time and without notice.</p>
- <p>THE SITE IS PROVIDED "AS IS" AND "AS AVAILABLE"
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
- WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
- FOR USE FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. MIT does not
- warrant the Site will operate in an uninterrupted or error-free manner
- or that the Site is free of viruses or other harmful components. Use
- of information obtained from or through this Site is at your own
- risk. Your access to or download of information, materials, or data
- through the Site or any reference sites is at your own discretion and
- risk and that you will be solely responsible for any damage to your
- property (including your computer system) or loss of data that results
- from the download or use of such material or data. We may close or
- limit enrollment for pedagogical or technological reasons.</p>
-
- <p><strong>User Postings Disclaimer.</strong> You understand that when
- using the Site you will be exposed to User Postings from a variety of
- sources, and that MIT is not responsible for the accuracy, usefulness,
- reliability, or intellectual property rights of or relating to such
- User Postings. You further understand and acknowledge that you may be
- exposed to User Postings that are inaccurate, offensive, defamatory,
- indecent or objectionable, and you agree to waive, and hereby do
- waive, any legal or equitable rights or remedies you have or may have
- against MIT with respect thereto. MIT does not endorse any User
- Postings or any opinion, recommendation or advice expressed
- therein. <i>MITx</i> has no obligation to monitor any User Postings or
- any other user communications through the Site. However, <i>MITx</i> reserves
- the right to review User Postings and to edit or remove, in whole or
- in part, such User Postings in its sole discretion. If notified by a
- User or a content owner of a User Posting that allegedly does not
- conform to the TOS, MIT may investigate the allegation and determine
- in its sole discretion whether to remove the User Posting, which it
- reserves the right to do at any time and without notice. </p>
+ <p><strong>Links to Other Sites.</strong> The Site may include hyperlinks to sites maintained or controlled by others. EdX is not responsible for and does not routinely screen, approve, review or endorse the contents of or use of any of the products or services that may be offered at these sites. If you decide to access linked third party web sites, you do so at your own risk.</p>
- <p><strong>Links to Other Sites.</strong> The Site may include
- hyperlinks to sites maintained or controlled by others. MIT is not
- responsible for and does not routinely screen, approve, review or
- endorse the contents of or use of any of the products or services that
- may be offered at these sites. If you decide to access linked third
- party web sites, you do so at your own risk.</p>
+ <p><strong>YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO THESE TERMS OF SERVICE, OR TO YOUR (OR ANY THIRD PARTY'S) USE OR INABILITY TO USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE SITE, OR TO YOUR RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH THE SITE WHETHER BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, EXCEPT ONLY IN THE CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO THE EXTENT THAT APPLICABLE LAW REQUIRES SUCH LIABILITY.</strong></p>
- <p><strong>YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR
- DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO
- THESE TERMS OF SERVICE, OR TO YOUR (OR ANY THIRD PARTY'S) USE OR
- INABILITY TO USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE
- SITE, OR TO YOUR RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH
- THE SITE WHETHER BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW,
- EXCEPT ONLY IN THE CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO
- THE EXTENT THAT APPLICABLE LAW REQUIRES SUCH LIABILITY.</strong></p>
-
- <p><strong>IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL,
- INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER
- FORESEEABLE OR UNFORESEEABLE, (INCLUDING, BUT NOT LIMITED TO, CLAIMS
- FOR DEFAMATION, ERRORS, LOSS OF DATA, OR INTERRUPTION IN AVAILABILITY
- OF DATA).</strong</p>
+ <p><strong>IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL, INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER FORESEEABLE OR UNFORESEEABLE, (INCLUDING, BUT NOT LIMITED TO, CLAIMS FOR DEFAMATION, ERRORS, LOSS OF DATA OR INTERRUPTION IN AVAILABILITY OF DATA).</strong></p>
<h2>Indemnification</h2>
-
- <p>You agree to defend, hold harmless and indemnify MIT, and its
- subsidiaries, affiliates, officers, agents, and employees from and
- against any third-party claims, actions or demands arising out of,
- resulting from or in any way related to your use of the Site,
- including any liability or expense arising from any and all claims,
- losses, damages (actual and consequential), suits, judgments,
- litigation costs and attorneys' fees, of every kind and nature. In
- such a case, MIT will provide you with written notice of such claim,
- suit or action.</p>
+ <p>You agree to defend, hold harmless and indemnify edX and its subsidiaries, affiliates, officers, agents and employees from and against any third-party claims, actions or demands arising out of, resulting from or in any way related to your use of the Site, including any liability or expense arising from any and all claims, losses, damages (actual and consequential), suits, judgments, litigation costs and attorneys' fees, of every kind and nature. In such a case, edX will provide you with written notice of such claim, suit or action.</p>
<h2>Miscellaneous</h2>
+ <p><strong>Termination Rights.</strong> You agree that edX, in its sole discretion, may terminate your use of the Site or your participation in it thereof, for any reason or no reason. If you no longer desire to participate in the Site, you may terminate your participation therein upon notice to edX.</p>
- <p><strong>Termination Rights.</strong> You agree that MIT, in its sole
- discretion, may terminate your use of the Site or your participation
- in it thereof, for any reason or no reason. If you no longer desire to
- participate in the Site, you may terminate your participation therein
- upon notice to MIT.</p>
+ <p><strong>Entire Agreement.</strong> This Agreement constitutes the entire agreement between you and edX with respect to your use of the Site, superseding any prior agreements between you and edX regarding your use of the Site.</p>
- <p><strong>Entire Agreement.</strong> This Agreement constitutes the entire agreement
- between you and MIT with respect to your use of the Site, superseding
- any prior agreements between you and MIT regarding your use of the
- Site. </p>
+ <p><strong>Waiver and Severability of TOS.</strong> The failure of edX to exercise or enforce any right or provision of the TOS of Site shall not constitute a waiver of such right or provision. If any provision of the TOS is found by a court of competent jurisdiction to be invalid, the parties nevertheless agree that the court should endeavor to give effect to the parties' intentions as reflected in the provision and the other provisions of the TOS remain in full force and effect.</p>
- <p><strong>Waiver and Severability of TOS.</strong> The failure of MIT to exercise or
- enforce any right or provision of the TOS of Site shall not constitute
- a waiver of such right or provision. If any provision of the TOS is
- found by a court of competent jurisdiction to be invalid, the parties
- nevertheless agree that the court should endeavor to give effect to
- the parties' intentions as reflected in the provision, and the
- other provisions of the TOS remain in full force and effect.</p>
+ <p><strong>Choice of Law/Forum Selection.</strong> You agree that any dispute arising out of or relating to these Terms or any content posted to a Site will be governed by the laws of the Commonwealth of Massachusetts, excluding its conflicts of law provisions. You further consent to the personal jurisdiction of and exclusive venue in the federal and state courts located in and serving Boston, Massachusetts as the legal forum for any such dispute.</p>
- <p><strong>Choice of Law/Forum Selection.</strong> You agree that any dispute
- arising out of or relating to these Terms or any content posted to a
- Site will be governed by the laws of the Commonwealth of
- Massachusetts, excluding its conflicts of law provisions. You further
- consent to the personal jurisdiction of and exclusive venue in the
- federal and state courts located in and serving Boston, Massachusetts
- as the legal forum for any such dispute.</p>
+ <p><strong>Effective Date:</strong> July 24, 2012</p>
- <p><strong>Effective Date:</strong> February 20, 2012</p><div>
</div>
</section>