diff --git a/lms/djangoapps/static_template_view/views.py b/lms/djangoapps/static_template_view/views.py
index 8773b88197660756164a9d67b017719e388fb9f6..b5e3ff859aec7925f32832a9c5089364e5ad1770 100644
--- a/lms/djangoapps/static_template_view/views.py
+++ b/lms/djangoapps/static_template_view/views.py
@@ -13,6 +13,7 @@ valid_templates=['index.html',
'tos.html',
'privacy.html',
'honor.html',
+ 'help.html',
'copyright.html',
'404.html',
'mitx_help.html',
@@ -20,10 +21,9 @@ valid_templates=['index.html',
'about.html',
'faq.html',
'press.html',
- 'contact.html',
- 'terms_and_conditions.html']
+ 'contact.html']
-if settings.STATIC_GRAB:
+if settings.STATIC_GRAB:
valid_templates = valid_templates+['server-down.html',
'server-error.html'
'server-overloaded.html',
@@ -33,7 +33,7 @@ if settings.STATIC_GRAB:
'6002x-press-release.html'
]
-def index(request, template):
+def index(request, template):
csrf_token = csrf(request)['csrf_token']
if template in valid_templates:
return render_to_response(template, {'error' : '',
@@ -43,7 +43,7 @@ def index(request, template):
valid_auth_templates=['help.html']
-def auth_index(request, template):
+def auth_index(request, template):
if not request.user.is_authenticated():
return redirect('/')
diff --git a/lms/static/images/edx-location.png b/lms/static/images/edx-location.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e12854c10649f502ec81b3b103c07d0522c2fbe
Binary files /dev/null and b/lms/static/images/edx-location.png differ
diff --git a/lms/static/images/email-sharing.png b/lms/static/images/email-sharing.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e5e972c2b03e3e3215a609af452aca9e02ec177
Binary files /dev/null and b/lms/static/images/email-sharing.png differ
diff --git a/lms/static/images/facebook-sharing.png b/lms/static/images/facebook-sharing.png
new file mode 100644
index 0000000000000000000000000000000000000000..782e8306802b663ae61b2be1c0df595807987e81
Binary files /dev/null and b/lms/static/images/facebook-sharing.png differ
diff --git a/lms/static/images/twitter-sharing.png b/lms/static/images/twitter-sharing.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b29fafc0fa96a29a8dc77de2a2a3ecc3caa922
Binary files /dev/null and b/lms/static/images/twitter-sharing.png differ
diff --git a/lms/static/sass/_about.scss b/lms/static/sass/_about.scss
index e1063e74c6d90f3fa7ca7e6032fdb3a654379600..249b0e3b48e77182a2c6edf03b5485996e8668ba 100644
--- a/lms/static/sass/_about.scss
+++ b/lms/static/sass/_about.scss
@@ -194,14 +194,32 @@
.map {
background: rgb(245,245,245);
float: left;
- height: 180px;
+ height: 280px;
margin-right: flex-gutter();
+ overflow: hidden;
width: flex-grid(6);
+
+ img {
+ min-height: 100%;
+ max-width: 100%;
+ }
}
- .address {
+ .contacts {
+ @include box-sizing(border-box);
float: left;
+ padding-left: 40px;
width: flex-grid(6);
+
+ ul {
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+
+ li {
+ margin-bottom: 10px;
+ }
+ }
}
}
}
diff --git a/lms/static/sass/_base.scss b/lms/static/sass/_base.scss
index 02575607e345bc379925d97e77a7ada3eb8cb7e0..3f230ae753975bf777245da40b287729f4cb0164 100644
--- a/lms/static/sass/_base.scss
+++ b/lms/static/sass/_base.scss
@@ -43,19 +43,17 @@ h2 {
-webkit-font-smoothing: antialiased;
}
+p + h2, ul + h2, ol + h2 {
+ margin-top: 40px;
+}
+
p {
color: $base-font-color;
font: normal 1.3rem/2rem $serif;
margin: 0px;
}
-span {
- color: $lighter-base-font-color;
- font: normal 1.3rem/2rem $sans-serif;
- margin: 0px;
-}
-
-p + p {
+p + p, ul + p, ol + p {
margin-top: 20px;
}
@@ -96,3 +94,42 @@ a:link, a:visited {
max-width: 1200px;
width: flex-grid(12);
}
+
+.static-container {
+ @include clearfix;
+ margin: 0 auto 0;
+ max-width: 1200px;
+ padding: 60px 0px 120px;
+ width: flex-grid(12);
+
+ .inner-wrapper {
+ margin: 0 auto 0;
+ width: flex-grid(10);
+ }
+
+ ol, ul {
+ list-style: disc;
+
+ li {
+ color: $base-font-color;
+ font: normal 1.3rem/2rem $serif;
+ margin: 0px;
+ }
+ }
+
+ h1 {
+ margin-bottom: 30px;
+ }
+
+ h1 + hr {
+ margin-bottom: 60px;
+ }
+
+ p + h2, ul + h2, ol + h2 {
+ margin-top: 40px;
+ }
+
+ ul + p, ol + p {
+ margin-top: 20px;
+ }
+}
diff --git a/lms/static/sass/_base_animations.scss b/lms/static/sass/_base_animations.scss
index a3c05c7f22eef1d954346b0a87abc2ef98c17f9b..e3bc4dd670650795b74153763a3024318dd50233 100644
--- a/lms/static/sass/_base_animations.scss
+++ b/lms/static/sass/_base_animations.scss
@@ -1,3 +1,35 @@
+// home-header-pop-up animation
+//************************************************************************//
+
+.animation-home-header-pop-up {
+ @include animation(home-header-pop-up 1.25s ease-in-out);
+ @include animation-fill-mode(both);
+ @include animation-delay(1s);
+}
+
+@mixin home-header-pop-up-keyframes {
+ 0% {
+ //opacity: 0;
+ top: 300px;
+ //@include transform(scale(0.9));
+ }
+ 65% {
+ //opacity: 1;
+ top: -40px;
+ //@include transform(scale(1));
+ }
+ 85% {
+ top: 10px;
+ }
+ 100% {
+ top: 0px;
+ }
+}
+
+@-webkit-keyframes home-header-pop-up { @include home-header-pop-up-keyframes; }
+ @-moz-keyframes home-header-pop-up { @include home-header-pop-up-keyframes; }
+ @keyframes home-header-pop-up { @include home-header-pop-up-keyframes; }
+
// title appear animation
//************************************************************************//
diff --git a/lms/static/sass/_course_info.scss b/lms/static/sass/_course_info.scss
index cde7eb373f28eccdead6bf1f0060207ab2a66863..1d74cc0e2932f04e07027fcab789b452cd7384be 100644
--- a/lms/static/sass/_course_info.scss
+++ b/lms/static/sass/_course_info.scss
@@ -7,7 +7,6 @@
background: rgb(245,245,245);
@include background-image(url('/static/images/shot-2-large.jpg'));
background-size: cover;
- //@include background-image(linear-gradient(-90deg, rgb(230,230,230), rgb(245,245,245)));
@include box-shadow(0 1px 80px 0 rgba(0,0,0, 0.5));
border-bottom: 1px solid rgb(100,100,100);
@include box-shadow(inset 0 1px 5px 0 rgba(0,0,0, 0.1));
@@ -122,6 +121,7 @@
}
.media {
+ background: #fff;
border-left: 1px solid rgb(100,100,100);
@include box-sizing(border-box);
float: right;
@@ -163,7 +163,8 @@
}
img {
- min-width: 100%;
+ display: block;
+ width: 100%;
}
}
diff --git a/lms/static/sass/_dashboard.scss b/lms/static/sass/_dashboard.scss
index af904eefd5c785cf14385a96a8715e0619654eb9..e4af5f1bc211347928070ecd4ed1a546e6ae1755 100644
--- a/lms/static/sass/_dashboard.scss
+++ b/lms/static/sass/_dashboard.scss
@@ -64,30 +64,41 @@
margin: 0px;
width: flex-grid(9);
+ > header {
+ border-bottom: 1px solid rgb(210,210,210);
+ margin-bottom: 40px;
+ }
+
.empty-dashboard-message {
- border-top: 1px solid rgb(210,210,210);
padding: 80px 0px;
text-align: center;
p {
color: $lighter-base-font-color;
font-style: italic;
+ margin-bottom: 20px;
text-shadow: 0 1px rgba(255,255,255, 0.6);
-webkit-font-smoothing: antialiased;
+ }
- a {
- background: rgb(240,240,240);
- @include background-image(linear-gradient(-90deg, rgb(245,245,245) 0%, rgb(243,243,243) 50%, rgb(237,237,237) 50%, rgb(235,235,235) 100%));
- border: 1px solid rgb(220,220,220);
- @include border-radius(4px);
- @include box-shadow(0 1px 8px 0 rgba(0,0,0, 0.1));
- @include box-sizing(border-box);
- color: $base-font-color;
- font: 300 1.2rem/1.6rem $sans-serif;
- @include inline-block;
- margin-left: 5px;
- padding: 5px 10px;
- text-shadow: 0 1px rgba(255,255,255, 0.6);
+ a {
+ background: rgb(240,240,240);
+ @include background-image(linear-gradient(-90deg, rgb(245,245,245) 0%, rgb(243,243,243) 50%, rgb(237,237,237) 50%, rgb(235,235,235) 100%));
+ border: 1px solid rgb(220,220,220);
+ @include border-radius(4px);
+ @include box-shadow(0 1px 8px 0 rgba(0,0,0, 0.1));
+ @include box-sizing(border-box);
+ color: $base-font-color;
+ font: 300 1.2rem/1.6rem $sans-serif;
+ @include inline-block;
+ letter-spacing: 1px;
+ margin-left: 5px;
+ padding: 5px 10px;
+ text-shadow: 0 1px rgba(255,255,255, 0.6);
+
+ &:hover {
+ color: $blue;
+ //text-decoration: none;
}
}
}
@@ -179,7 +190,6 @@
> hgroup {
border-bottom: 1px solid rgb(210,210,210);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
- margin-bottom: 20px;
padding: 15px 0px;
width: 100%;
@@ -223,12 +233,35 @@
}
}
+ .course-status {
+ background: rgb(250,250,250);
+ border: 1px solid rgb(200,200,200);
+ @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
+ margin-top: 14px;
+ padding: 5px;
+
+ p {
+ color: $lighter-base-font-color;
+ font: italic 300 1.2rem/1.4rem $sans-serif;
+ letter-spacing: 1px;
+ text-align: center;
+ text-transform: uppercase;
+
+ span {
+ color: $base-font-color;
+ font: italic 800 1.2rem/1.6rem $sans-serif;
+ }
+ }
+ }
+
.meta {
@include clearfix;
+ margin-top: 19px;
position: relative;
@include transition(opacity, 0.15s, linear);
width: 100%;
+
.course-work-icon {
background: rgb(200,200,200);
float: left;
diff --git a/lms/static/sass/_index.scss b/lms/static/sass/_index.scss
index 40be1b1d396a901b7ede119043c6c910499aa7c6..2ff36051d88b7198e0eb44a80ffd3a9989362db3 100644
--- a/lms/static/sass/_index.scss
+++ b/lms/static/sass/_index.scss
@@ -2,44 +2,274 @@
padding: 0px 0px 100px;
> header {
- //background: rgb(250,250,250);
- @include background-image(url('/static/images/shot-5-large.jpg'));
+ background: rgb(255,255,255);
+ @include background-image(url('/static/images/shot-2-large.jpg'));
background-size: cover;
border-bottom: 1px solid rgb(80,80,80);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.9), inset 0 -1px 5px 0 rgba(0,0,0, 0.1));
@include clearfix;
margin-top: -69px;
- min-height: 300px;
- padding: 129px 0px 50px;
+ overflow: hidden;
+ padding: 149px 0px 90px;
width: flex-grid(12);
- .inner-wrapper {
+ .outer-wrapper {
+ @extend .animation-home-header-pop-up;
max-width: 1200px;
margin: 0 auto;
position: relative;
+ text-align: center;
+
+ &:hover {
+ .main-cta {
+ @include box-shadow(0 1px 16px 0 rgba($blue, 0.35));
+ }
+ }
}
- h1 {
- color: rgb(255,255,255);
+ .inner-wrapper {
+ background: rgba(255,255,255, 0.9);
+ border: 1px solid rgb(100,100,100);
+ @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
+ @include inline-block;
+ padding: 30px 50px 30px;
+ position: relative;
text-align: center;
+ z-index: 1;
+ }
+
+ .title {
+ @include inline-block;
+ margin-right: 50px;
+ padding-right: 50px;
+ position: relative;
+ text-align: left;
+ vertical-align: middle;
+
+ &::after {
+ @extend .faded-vertical-divider;
+ content: "";
+ display: block;
+ height: 170px;
+ position: absolute;
+ right: 0px;
+ top: -20px;
+ }
+
+ h1 {
+ border-bottom: 1px solid rgb(200,200,200);
+ margin-bottom: 25px;
+ padding-bottom: 15px;
+ text-align: left;
+ text-shadow: 0 1px rgba(255,255,255, 0.6);
+ }
+
+ p {
+ color: $lighter-base-font-color;
+ display: none;
+ font-style: italic;
+ letter-spacing: 2px;
+ margin-bottom: 30px;
+ text-shadow: 0 1px rgba(255,255,255, 0.6);
+ text-transform: lowercase;
+ }
+
+ .main-cta {
+ @include clearfix;
+ float: left;
+ margin-right: flex-gutter();
+ @include transition(all, 0.15s, linear);
+ width: flex-grid(6);
+
+ > a.find-courses {
+ @include button(shiny, $blue);
+ @include box-sizing(border-box);
+ @include border-radius(3px);
+ display: block;
+ font: italic 1.4rem/1.6rem $serif;
+ letter-spacing: 1px;
+ padding: 12px 0px;
+ text-transform: uppercase;
+ text-align: center;
+ -webkit-font-smoothing: antialiased;
+ width: flex-grid(12);
+
+ &:hover {
+ color: rgb(255,255,255);
+ }
+ }
+ }
+
+ .social-sharing {
+ @include box-sizing(border-box);
+ float: left;
+ height: 44px;
+ position: relative;
+ text-align: center;
+ width: flex-grid(6);
+
+ &:hover {
+ .sharing-message {
+ opacity: 1;
+ top: 63px;
+ }
+ }
+
+ .sharing-message {
+ @include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
+ rgba(0,0,0, 0.7) 100%));
+ border: 1px solid rgba(0,0,0, 0.5);
+ @include border-radius(4px);
+ @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
+ @include box-sizing(border-box);
+ color: rgb(255,255,255);
+ float: right;
+ font: italic 1.2rem/1.6rem $serif;
+ left: 50%;
+ margin-left: -110px;
+ opacity: 0;
+ padding: 5px 10px;
+ position: absolute;
+ text-align: center;
+ @include transition(all, 0.15s, ease-out);
+ top: 73px;
+ width: 220px;
+
+ &::before {
+ background: transparent;
+ border: {
+ top: 6px solid rgba(0,0,0, 1);
+ right: 6px solid rgba(0,0,0, 1);
+ bottom: 6px solid transparent;
+ left: 6px solid transparent;
+ }
+ @include box-shadow(1px 0 0 0 rgb(0,0,0), 0 -1px 0 0 rgb(0,0,0));
+ content: "";
+ display: block;
+ height: 0px;
+ left: 50%;
+ margin-left: -7px;
+ position: absolute;
+ @include transform(rotate(-45deg));
+ top: -6px;
+ width: 0px;
+ }
+ }
+
+ .share {
+ height: 44px;
+ @include inline-block;
+ margin-right: 10px;
+ opacity: 0.5;
+ @include transition(all, 0.15s, linear);
+ width: 44px;
+
+ &:hover {
+ opacity: 1;
+ }
+
+ img {
+ width: 100%;
+ }
+
+ &:last-child {
+ margin-right: 0px;
+ }
+ }
+ }
}
- a {
- @include button(shiny, $blue);
+ .media {
+ background: #fff;
+ border: 1px solid rgb(200,200,200);
@include box-sizing(border-box);
- @include border-radius(3px);
- display: block;
- font: italic 1.4rem/1.6rem $serif;
+ @include inline-block;
+ padding: 1px;
+ position: relative;
+ vertical-align: middle;
+ width: 210px;
+ z-index: 2;
+
+ .hero {
+ height: 125px;
+ overflow: hidden;
+ position: relative;
+
+ .play-intro {
+ @include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.6), rgba(255,255,255, 0.4)));
+ @include border-radius(4px);
+ @include box-shadow(0 1px 10px 0 rgba(0,0,0, 0.2));
+ border: 1px solid rgba(0,0,0, 0.3);
+ height: 80px;
+ left: 50%;
+ margin-top: -40px;
+ margin-left: -40px;
+ position: absolute;
+ top: 50%;
+ width: 80px;
+
+ &::after {
+ color: $base-font-color;
+ content: "\25B6";
+ display: block;
+ font: normal 3.2rem/3.2rem $sans-serif;
+ left: 50%;
+ margin-left: -12px;
+ margin-top: -17px;
+ position: absolute;
+ text-shadow: 0 1px rgba(255,255,255, 0.8);
+ top: 50%;
+ }
+ }
+
+ img {
+ display: block;
+ width: 100%;
+ }
+ }
+
+ &:hover {
+ cursor: pointer;
+
+ .play-intro {
+ @include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.7), rgba(255,255,255, 0.5)));
+ @include box-shadow(0 1px 10px 0 rgba(0,0,0, 0.2));
+ border: 1px solid rgba(0,0,0, 0.4);
+
+ &::after {
+ color: $pink;
+ }
+ }
+ }
+ }
+ }
+
+ .highlighted-courses {
+ border-bottom: 1px solid rgb(210,210,210);
+ @include box-sizing(border-box);
+ margin-bottom: 60px;
+ position: relative;
+ width: flex-grid(12);
+ z-index: 1;
+
+ > h2 {
+ @include background-image(linear-gradient(-90deg, rgb(250,250,250), rgb(230,230,230)));
+ border: 1px solid rgb(200,200,200);
+ @include border-radius(4px);
+ border-top-color: rgb(190,190,190);
+ @include box-shadow(inset 0 0 0 1px rgba(255,255,255, 0.4), 0 0px 12px 0 rgba(0,0,0, 0.2));
+ color: $lighter-base-font-color;
letter-spacing: 1px;
- margin: 0 auto;
- padding: 15px 0px;
- text-transform: uppercase;
+ margin-bottom: 0px;
+ margin-top: -15px;
+ padding: 15px 10px;
text-align: center;
- -webkit-font-smoothing: antialiased;
- width: flex-grid(3);
+ text-transform: uppercase;
+ text-shadow: 0 1px rgba(255,255,255, 0.6);
- &:hover {
- color: rgb(255,255,255);
+ .lowercase {
+ color: $lighter-base-font-color;
+ text-transform: none;
}
}
}
@@ -176,34 +406,6 @@
}
}
- .highlighted-courses {
- border-bottom: 1px solid rgb(210,210,210);
- @include box-sizing(border-box);
- margin-bottom: 60px;
- width: flex-grid(12);
-
- > h2 {
- @include background-image(linear-gradient(-90deg, rgb(250,250,250), rgb(230,230,230)));
- border: 1px solid rgb(200,200,200);
- @include border-radius(4px);
- border-top-color: rgb(190,190,190);
- @include box-shadow(inset 0 0 0 1px rgba(255,255,255, 0.4), 0 0px 12px 0 rgba(0,0,0, 0.2));
- color: $lighter-base-font-color;
- letter-spacing: 1px;
- margin-bottom: 0px;
- margin-top: -15px;
- padding: 15px 10px;
- text-align: center;
- text-transform: uppercase;
- text-shadow: 0 1px rgba(255,255,255, 0.6);
-
- .lowercase {
- color: $lighter-base-font-color;
- text-transform: none;
- }
- }
- }
-
.more-info {
margin-bottom: 60px;
width: flex-grid(12);
diff --git a/lms/static/sass/_shared_footer.scss b/lms/static/sass/_shared_footer.scss
index e5d94b2e9e63541aa093b3f4d67c9732a998d984..a78dd86453f1c16311f256e41fbe191a3575b32c 100644
--- a/lms/static/sass/_shared_footer.scss
+++ b/lms/static/sass/_shared_footer.scss
@@ -3,7 +3,6 @@ footer {
border-top: 1px solid rgb(200,200,200);
@include box-shadow(inset 0 1px 3px 0 rgba(0,0,0, 0.1));
margin: 0 auto;
- padding: 0 0 40px;
width: flex-grid(12);
&.fixed-bottom {
@@ -14,12 +13,28 @@ footer {
nav {
@include box-sizing(border-box);
- @include clearfix;
max-width: 1200px;
margin: 0 auto;
padding: 20px 10px 0;
width: flex-grid(12);
+ .primary-links {
+ @include clearfix;
+ margin-bottom: 30px;
+ }
+
+ .secondary-links {
+ padding-bottom: 10px;
+ text-align: left;
+
+ a {
+ color: $lighter-base-font-color;
+ font: 300 1.2rem/1.6rem $sans-serif;
+ letter-spacing: 1px;
+ margin-right: 20px;
+ }
+ }
+
.copyright {
float: left;
padding-top: 2px;
diff --git a/lms/templates/about.html b/lms/templates/about.html
index f6c5276e501789ecd603ca170d8453afc66f951e..71d3a67e50947a5e0e1556baa420e679ee7577b8 100644
--- a/lms/templates/about.html
+++ b/lms/templates/about.html
@@ -27,9 +27,9 @@
<div class="photo">
<img src="">
</div>
- <h2>What it's like to work here</h2>
- <p>“Harvard and MIT will use these new technologies and the research they will make possible to lead the direction of online learning in a way that benefits our students, our peers, and people across the nation and the globe,†Faust continued.</p>
- <p>[fast-moving not-for-profit startup][institutional backing, funding, benefits, and stability][industry salaries]</p>
+ <h2>Mission: Educate 1 billion people around the world</h2>
+ <p>“EdX represents a unique opportunity to improve education on our own campuses through online learning, while simultaneously creating a bold new educational path for millions of learners worldwide,†MIT President Susan Hockfield said.</p>
+ <p>Harvard President Drew Faust said, “edX gives Harvard and MIT an unprecedented opportunity to dramatically extend our collective reach by conducting groundbreaking research into effective education and by extending online access to quality higher education.â€
<hr class="fade-left-hr-divider">
</section>
diff --git a/lms/templates/contact.html b/lms/templates/contact.html
index c21ad8d4c6891100d8c45ebf60ed12ec5d1e7ff5..32c95b2c2c0b1c30f3511c27c840450536ea1212 100644
--- a/lms/templates/contact.html
+++ b/lms/templates/contact.html
@@ -12,15 +12,22 @@
<section class="contact">
<div class="map">
+ <img src="${static.url('images/edx-location.png')}">
</div>
- <div class="address">
- Suggest a Feature
- Suggest a Topic
- Report a Problem
- Ask the Community
- Send Thanks
- Submit a Comment
- Mailing Address
+ <div class="contacts">
+ <h2>Email Contacts</h2>
+ <ul>
+ <li><p>System-related questions: <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></p></li>
+ <li><p>Content-related questions: <a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></p></li>
+ <li><p>Bug reports: <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a></p></li>
+ <li><p>Suggestions: <a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></p></li>
+ </ul>
+
+ <h2>Physical Address</h2>
+ <ul>
+ <li><p>11 Cambridge Center</p></li>
+ <li><p>Cambridge, MA 02142</p></li>
+ </ul>
</div>
</section>
</section>
diff --git a/lms/templates/copyright.html b/lms/templates/copyright.html
index 003db8c2af6c1d0491d037297d4b0377fcfced3c..14e7074c2a00fd34ca039270f4f4c24926ab763b 100644
--- a/lms/templates/copyright.html
+++ b/lms/templates/copyright.html
@@ -1,38 +1,22 @@
-<%inherit file="marketing.html" />
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="main.html" />
-<section class="copyright">
+<%namespace name='static' file='static_content.html'/>
- <div>
+<section class="static-container copyright">
<h1> Licensing Information </h1>
+ <hr class="horizontal-divider">
- <ul>
- <li>
- <h2>Videos and Exercises</h2>
- <p> Copyright © 2012 MIT. All rights reserved. In order to
- further MIT's goal of making education accessible and affordable
- to the world, MIT is planning to make <i>MITx</i> course content
- available under open source licenses.
-</p>
- </li>
+ <div class="inner-wrapper">
+ <h2>Videos and Exercises</h2>
+ <p> Copyright © 2012 MIT. All rights reserved. In order to further MIT's goal of making education accessible and affordable to the world, MIT is planning to make <i>MITx</i> course content available under open source licenses.</p>
- <li>
- <h2>Textbook</h2>
- <p> Copyright © 2005 Elsevier Inc. All Rights
- Reserved. Used with permission. While our goal is to build
- courses with as much free and open content as possible, we
- apologize that we do not have the ability to do so
- entirely. </p>
- </li>
+ <h2>Textbook</h2>
+ <p> Copyright © 2005 Elsevier Inc. All Rights Reserved. Used with permission. While our goal is to build courses with as much free and open content as possible, we apologize that we do not have the ability to do so entirely. </p>
- <li>
- <h2>Student-generated content</h2>
- <td>Copyright © 2012. All Rights Reserved. Due to privacy
- concerns, we do not know what portion of these will be released
- under open licenses. </td></li>
- </ul>
+ <h2>Student-generated content</h2>
+ <p>Copyright © 2012. All Rights Reserved. Due to privacy concerns, we do not know what portion of these will be released under open licenses.</p>
- <p>MIT and <i>MITx</i> are trademarks of the Massachusetts Institute
- of Technology, and may not be used without permission.</p>
+ <p>MIT and <i>MITx</i> are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.</p>
</div>
-
</section>
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 6d6e0efeb1dc76e89fe806c73899d3101f2dc5fe..71429a4ba68554be6cfadb68a702266f9dbe0618 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -31,79 +31,41 @@
% if len(courses) > 0:
% for course in courses:
+
<article class="my-course">
- <a href="${reverse('info', args=[course.id])}">
- <div class="cover">
- <div class="shade"></div>
- <div class="arrow"></div>
- <img src="${static.url('images/circuits.jpeg')}" />
- </div>
- <section class="info">
- <hgroup>
- % for instructor in course.instructors:
- <h3>${course.get_about_section('university')}</h3>
- % endfor
- <h2>${course.get_about_section("title")}</h2>
- </hgroup>
- <section class="meta">
- <div class="complete">
- <p>60% complete</p>
- </div>
- <div class="progress">
- <div class="meter">
- <div class="meter-fill"></div>
- </div>
- </div>
- <div class="end-date">
- <p>End date: <time>6/10/12</time></p>
+ <a href="${reverse('info', args=[course.id])}" class="cover" style="background-image: url('static/images/courses/python.png')">
+ <div class="shade"></div>
+ <div class="arrow"></div>
+ </a>
+ <section class="info">
+ <hgroup>
+ <h3><a href="#">${course.get_about_section('university')}</a></h3>
+ <h2><a href="${reverse('info', args=[course.id])}">${course.get_about_section("title")}</a></h2>
+ </hgroup>
+ <section class="course-status">
+ <p>Class starts - <span>9/2/2012</span></div>
+ </section>
+ <section class="meta">
+ <div src="" class="course-work-icon"></div>
+ <div class="progress">
+ <div class="meter">
+ <div class="meter-fill"></div>
</div>
- </section>
+ </div>
+ <div class="complete">
+ <p><span class="completeness">60%</span> compleat</p>
+ </div>
</section>
- </a>
+ </section>
</article>
+
% endfor
% else:
<section class="empty-dashboard-message">
- <p>Looks like you aren't registered for any courses. You should take a minute and <a href="${reverse('courses')}" class="find-courses">Find some courses!</a></p>
+ <p>Looks like you haven't registered for any courses yet.</p>
+ <a href="${reverse('courses')}">Find courses now!</a>
</section>
% endif
- <article class="my-course">
- <a href="/info" class="cover" style="background-image: url('static/images/courses/python.png')">
- <div class="shade"></div>
- <div class="arrow"></div>
- </a>
- <section class="info">
- <hgroup>
- <h3><a href="">HarvardX</a></h3>
- <h2><a href="/info">CS 102 Python</a></h2>
- </hgroup>
- </section>
- </article>
-
- <article class="my-course">
- <a href="/info" class="cover" style="background-image: url('static/images/courses/python.png')">
- <div class="shade"></div>
- <div class="arrow"></div>
- </a>
- <section class="info">
- <hgroup>
- <h3><a href="">HarvardX</a></h3>
- <h2><a href="/info">CS 102 Python</a></h2>
- </hgroup>
- <section class="meta">
- <div src="" class="course-work-icon"></div>
- <div class="progress">
- <div class="meter">
- <div class="meter-fill"></div>
- </div>
- </div>
- <div class="complete">
- <p><span class="completeness">60%</span> compleat</p>
- </div>
- </section>
- </section>
- </article>
</section>
-
</section>
diff --git a/lms/templates/footer.html b/lms/templates/footer.html
index 3f5f5ce66481e306c3ab621db501cd83e6acea74..f5dfcb0edc2873a2e756e97d9900ef0c662843de 100644
--- a/lms/templates/footer.html
+++ b/lms/templates/footer.html
@@ -3,28 +3,36 @@
<footer>
<nav>
- <section class="copyright">
- <a href="${reverse('root')}" class="logo"></a>
- <p>© 2012 edX, <a href="#">some rights reserved.</a></p>
+ <section class="primary-links">
+ <section class="copyright">
+ <a href="${reverse('root')}" class="logo"></a>
+ <p>© 2012 edX, <a href="/t/copyright.html">some rights reserved.</a></p>
+ </section>
+ <ol>
+ <li>
+ <a href="${reverse('courses')}">Find Courses</a>
+ </li>
+ <li>
+ <a href="/t/about.html">About</a>
+ </li>
+ <li>
+ <a href="#">Blog</a>
+ </li>
+ <li>
+ <a href="/t/jobs.html">Jobs</a>
+ </li>
+ <li class="social">
+ <a href="#"><img src="${static.url('images/linkedin.png')}" /></a>
+ <a href="#"><img src="${static.url('images/facebook.png')}" /></a>
+ <a href="#"><img src="${static.url('images/twitter.png')}" /></a>
+ </li>
+ </ol>
+ </section>
+ <section class="secondary-links">
+ <a href="/t/tos.html">Terms of Service</a>
+ <a href="/t/privacy.html">Privacy Policy</a>
+ <a href="/t/honor.html">Honor Code</a>
+ <a href="/t/help.html">Help</a>
</section>
- <ol>
- <li>
- <a href="${reverse('courses')}">Find Courses</a>
- </li>
- <li>
- <a href="${reverse('about_edx')}">About</a>
- </li>
- <li>
- <a href="#">Blog</a>
- </li>
- <li>
- <a href="${reverse('jobs')}">Jobs</a>
- </li>
- <li class="social">
- <a href="#"><img src="${static.url('images/linkedin.png')}" /></a>
- <a href="#"><img src="${static.url('images/facebook.png')}" /></a>
- <a href="#"><img src="${static.url('images/twitter.png')}" /></a>
- </li>
- </ol>
</nav>
</footer>
diff --git a/lms/templates/help.html b/lms/templates/help.html
index 550a2d9ecd49a952270b8a9c9548062f2678f793..7eb531f93cd33ed37f3c6f01cc2dc1786497bb70 100644
--- a/lms/templates/help.html
+++ b/lms/templates/help.html
@@ -1,48 +1,35 @@
+<%! from django.core.urlresolvers import reverse %>
<%inherit file="main.html" />
+
+<%namespace name='static' file='static_content.html'/>
+
<%block name="title"><title>Help - MITx 6.002x</title></%block>
-<section class="help main-content">
+<section class="static-container help">
<h1>Help</h1>
+ <hr class="horizontal-divider">
- <section class="self-help">
+ <div class="inner-wrapper">
<h2>Self-help</h2>
<ul>
- <li>Read
- the <a href="http://mitx.mit.edu/6002x-faq.html">FAQ</a>
- carefully</li>
- <li>Check the <a href="/info">course updates</a> -- we will
- announce major errors and issues there </li>
- <li>Check whether the issues has been asked on
- the <a href="/discussion">discussion forums</a>, and if not,
- ask</li>
- <li>Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]</li>
- <li>Check the <a href="/info">course handouts.</a></li>
+ <li><p>Read the <a href="/t/faq.html">FAQ</a> carefully</p></li>
+ <li><p>Check the <a href="/info">course updates</a> -- we will announce major errors and issues there </p></li>
+ <li><p>Check whether the issues has been asked on the <a href="/discussion">discussion forums</a>, and if not, ask</p></li>
+ <li><p>Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]</p></li>
+ <li><p>Check the <a href="/info">course handouts.</a></p></li>
</ul>
- </section>
-
- <section class="help-email">
- <h2>Help email</h2>
- <p> If you can't solve your problems with self-help, we have several
- e-mail addresses set up:</p>
-
- <dl>
- <dt>System-related questions</dt>
- <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
- <dt>Content-related questions</dt>
- <dd><a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></dd>
- <dt>Bug reports</dt>
- <dd><a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a></dd>
- <dt>Suggestions</dt>
- <dd><a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></dd>
- </dl>
-
- <p> Please bear in mind that while we read them, we do not
- expect to have time to respond to all e-mails. For technical
- questions, please make sure you are using the latest version
- of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a>
- or <a href="https://www.google.com/chrome/">Chrome</a>, and
- include browser and version in your e-mail, as well as
- screenshots or other pertinent details. </p>
- </section>
+
+ <h2>Help email</h2>
+ <p> If you can't solve your problems with self-help, we have several e-mail addresses set up:</p>
+
+ <ul>
+ <li><p>System-related questions: <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></p></li>
+ <li><p>Content-related questions: <a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></p></li>
+ <li><p>Bug reports: <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a></p></li>
+ <li><p>Suggestions: <a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></p></li>
+ </ul>
+
+ <p>Please bear in mind that while we read them, we do not expect to have time to respond to all e-mails. For technical questions, please make sure you are using the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome/">Chrome</a>, and include browser and version in your e-mail, as well as screenshots or other pertinent details.</p>
+ </div>
</section>
diff --git a/lms/templates/honor.html b/lms/templates/honor.html
index cfdefb5465174493baf2db79ba866c68a55420cd..b1ada83728205ec5763737687fee256781dbd904 100644
--- a/lms/templates/honor.html
+++ b/lms/templates/honor.html
@@ -1,49 +1,58 @@
-<%inherit file="marketing.html" />
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="main.html" />
-<section class="honor-code">
- <div>
- <h1> Collaboration Policy </h1>
+<%namespace name='static' file='static_content.html'/>
+<section class="static-container honor-code">
+ <h1> Collaboration Policy </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.
+ 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.
-
- <div style="color:darkred;">
- <h2> <i>edX</i> Honor Code Pledge</h2>
-
- <p> By enrolling in an <i>edX</i> course, I agree that I will:
-
- <ul>
- <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> Maintain only one user account and not let anyone else
- use my username and/or password.
- <li> Not engage in any activity that would dishonestly improve
- my results, or improve or hurt the results of others.
- <li> Not post answers to problems that are being used to
- assess student performance.
- </ul>
- </div>
- <p> Unless otherwise indicated by the instructor of an <i>edX</i>
- course, learners on <i>edX</i> are encouraged to:
- <ul>
- <li> Collaborate with others on the lecture videos, exercises,
- homework and labs.
- <li> Discuss with others general concepts and materials in
- each course.
- <li> Present ideas and written work to fellow <i>edX</i>
- learners or others for comment or criticism.
- </ul>
+ 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>
+
+ <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>
+ </ul>
+
+ <p> Unless otherwise indicated by the instructor of an <i>edX</i> course, learners on <i>edX</i> 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>
+ </ul>
</div>
</section>
diff --git a/lms/templates/index.html b/lms/templates/index.html
index 4deec79e313cc79b5f8033428a279435d58eff53..a4acb6f82966272ed49aa9ad3eb24c53f39fa27f 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -4,9 +4,36 @@
<section class="home">
<header>
- <div class="inner-wrapper">
- <h1>The Future of Online Education</h1>
- <a href="${reverse('courses')}" class="find-courses">Find Courses</a>
+ <div class="outer-wrapper">
+ <div class="inner-wrapper">
+ <div class="title">
+ <h1>The Future of Online Education</h1>
+ <p>Free. Online. World Class.</p>
+ <div class="main-cta">
+ <a href="${reverse('courses')}" class="find-courses">Find Courses</a>
+ </div>
+
+ <div class="social-sharing">
+ <div class="sharing-message">Share with friends and family!</div>
+ <a href="#" class="share">
+ <img src="${static.url('images/twitter-sharing.png')}">
+ </a>
+ <a href="#" class="share">
+ <img src="${static.url('images/facebook-sharing.png')}">
+ </a>
+ <a href="#" class="share">
+ <img src="${static.url('images/email-sharing.png')}">
+ </a>
+ </div>
+ </div>
+
+ <div class="media">
+ <div class="hero">
+ <img src="${static.url('images/courses/space1.jpg')}" />
+ <div class="play-intro"></div>
+ </div>
+ </div>
+ </div>
</div>
</header>
diff --git a/lms/templates/privacy.html b/lms/templates/privacy.html
index 715578b36af3d790a72ac058ec5858c36ac12f7f..36ed779dc48a1aaee2a760bda79308339d89c663 100644
--- a/lms/templates/privacy.html
+++ b/lms/templates/privacy.html
@@ -1,198 +1,201 @@
-<%inherit file="marketing.html" />
-
-<section class="privacy-policy">
- <div>
-<h1>Privacy Policy</h1>
-
-<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>
-
-<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>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>
-
-<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>
-
-<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>
-</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.
-
-<h2>Sharing with Third Parties</h2>
-
-<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.</p>
-
-<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. </p>
-
-<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. </p>
-
-<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.</p>
-
-<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. </p>
-
-<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. </p>
-</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>
-
-<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>
-
-<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@mitx.mit.edu">privacy@mitx.mit.edu</a>. </p>
-
-<p> Effective Date: February 6, 2012
-
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="main.html" />
+
+<%namespace name='static' file='static_content.html'/>
+
+<section class="static-container privacy-policy">
+ <h1>Privacy Policy</h1>
+ <hr class="horizontal-divider">
+
+ <div class="inner-wrapper">
+ <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>
+
+ <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>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>
+
+ <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>
+
+ <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>
+ </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>
+
+ <h2>Sharing with Third Parties</h2>
+
+ <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>
+ </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>
+
+ <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>
+
+ <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@mitx.mit.edu">privacy@mitx.mit.edu</a>.</p>
+
+ <p> Effective Date: February 6, 2012</p>
</div>
</section>
diff --git a/lms/templates/terms_and_conditions.html b/lms/templates/terms_and_conditions.html
deleted file mode 100644
index 3687cb141c2071ca3d7cfafcc9f6084c91020caa..0000000000000000000000000000000000000000
--- a/lms/templates/terms_and_conditions.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<%! from django.core.urlresolvers import reverse %>
-<%inherit file="main.html" />
-
-<%namespace name='static' file='static_content.html'/>
-
-<section class="container">
-</section>
diff --git a/lms/templates/tos.html b/lms/templates/tos.html
index c76dd1314373267e7d53b75cf06d41e4a55bcb76..4a11e2d2c5bb25cba4fcefe6390c35379f23c706 100644
--- a/lms/templates/tos.html
+++ b/lms/templates/tos.html
@@ -1,305 +1,314 @@
-<%inherit file="marketing.html" />
-
-<section class="tos">
- <div>
-
-<h1><i>MITx</i> Terms of Service</h1>
-
-<p>Welcome to <i>MITx</i>. You must read and agree to these Terms of Service
-("TOS"), <i>MITx</i>’s <a href="/t/privacy.html">Privacy
-Policy</a>, and <a href="/t/honor.html">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><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>
-
-<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>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 <a href="/t/honor.html">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>
-
-<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.
-<lu>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 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="/t/privacy.html">Privacy
-Policy</a> for more information about what information about
-you <i>MITx</i> collects and how <i>MITx</i> 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. 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="/t/copyright.html"><i>MITx's Copyright Page</i></a> for
-more information.</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, 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>
-
-<h2>Use of <i>MITx</i> and MIT Names, Trademarks and Service Marks</h2>
-
-<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>
-
-
-<h2>Digital Millennium Copyright Act</h2>
-
-<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> Notification must
-include:
-<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> 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> Information for us to be able to contact the complaining party
-(e.g., email address, phone number).
-<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> 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.
-</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. 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. 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>
-
-<strong>
-<p>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. </p>
-
-<p>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).</p>
-</strong>
-
-<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>
-
-<h2>Miscellaneous</h2>
-
-<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 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 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>Effective Date:</strong> February 20, 2012</p><div>
-</div>
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="main.html" />
+
+<%namespace name='static' file='static_content.html'/>
+
+<section class="static-container tos">
+ <h1>MITx 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="/t/privacy.html">Privacy
+ Policy</a>, and <a href="/t/honor.html">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><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>
+
+ <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>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 <a href="/t/honor.html">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>
+
+ <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).
+ </ol>
+
+ <h2>User Accounts and Authority</h2>
+
+ <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="/t/privacy.html">Privacy
+ Policy</a> for more information about what information about
+ you <i>MITx</i> collects and how <i>MITx</i> 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. 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="/t/copyright.html"><i>MITx's Copyright Page</i></a> for
+ more information.</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, 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>
+
+ <h2>Use of <i>MITx</i> and MIT Names, Trademarks and Service Marks</h2>
+
+ <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>
+
+
+ <h2>Digital Millennium Copyright Act</h2>
+
+ <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>
+ <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>
+ </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. 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. 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>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>
+
+ <h2>Miscellaneous</h2>
+
+ <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 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 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>Effective Date:</strong> February 20, 2012</p><div>
+ </div>
</section>