Merge remote-tracking branch 'origin/release/1.0' into unenroll

Conflicts:
	lms/urls.py

common/djangoapps/student/management/commands/6002exportusers.py

+##
+## One-off script to export 6.002x users into the edX framework
+##
+## Could be modified to be general by:
+## * Changing user_keys and up_keys to handle dates more cleanly
+## * Providing a generic set of tables, rather than just users and user profiles
+## * Handling certificates and grades
+## * Handling merge/forks of UserProfile.meta
+
+
+import datetime
+import json
+
+import os.path
+
+from lxml import etree
+
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from django.contrib.auth.models import User
+
+from student.models import UserProfile
+
+import mitxmako.middleware as middleware
+
+middleware.MakoMiddleware()
+
+class Command(BaseCommand):
+    help = \
+'''Exports all users and user profiles. 
+Caveat: Should be looked over before any run
+for schema changes. 
+
+Current version grabs user_keys from 
+django.contrib.auth.models.User and up_keys
+from student.userprofile. '''
+    def handle(self, *args, **options):
+        users = list(User.objects.all())
+        user_profiles = list(UserProfile.objects.all())
+        user_profile_dict = dict([(up.user_id, up) for up in user_profiles])
+    
+        user_tuples = [(user_profile_dict[u.id], u) for u in users if u.id in user_profile_dict]
+    
+        user_keys = ['id', 'username', 'email', 'password', 'is_staff', 
+                     'is_active', 'is_superuser', 'last_login', 'date_joined', 
+                     'password']
+        up_keys = ['language', 'location','meta','name', 'id','user_id']
+        
+        def extract_dict(keys, object):
+            d = {}
+            for key in keys:
+                item = object.__getattribute__(key)
+                if type(item) == datetime.datetime:
+                    item = item.isoformat()
+                d[key] = item
+            return d
+
+        extracted = [{'up':extract_dict(up_keys, t[0]), 'u':extract_dict(user_keys, t[1])} for t in user_tuples]
+        fp = open('transfer_users.txt', 'w')
+        json.dump(extracted, fp)
+        fp.close()

common/djangoapps/student/management/commands/6002importusers.py

+##
+## One-off script to import 6.002x users into the edX framework
+## See export for more info
+
+
+import datetime
+import json
+
+import dateutil.parser
+
+import os.path
+
+from lxml import etree
+
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from django.contrib.auth.models import User
+
+from student.models import UserProfile
+
+import mitxmako.middleware as middleware
+
+middleware.MakoMiddleware()
+
+def import_user(u):
+    user_info = u['u']
+    up_info = u['up']
+
+    # HACK to handle dates
+    user_info['last_login'] = dateutil.parser.parse(user_info['last_login'])
+    user_info['date_joined'] = dateutil.parser.parse(user_info['date_joined'])
+
+    user_keys = ['id', 'username', 'email', 'password', 'is_staff', 
+                 'is_active', 'is_superuser', 'last_login', 'date_joined', 
+                 'password']
+    up_keys = ['language', 'location','meta','name', 'id','user_id']
+
+
+    u = User()
+    for key in user_keys:
+        u.__setattr__(key, user_info[key])
+    u.save()
+
+    up = UserProfile()
+    up.user = u
+    for key in up_keys:
+        up.__setattr__(key, up_info[key])
+    up.save()
+
+class Command(BaseCommand):
+    help = \
+'''Exports all users and user profiles. 
+Caveat: Should be looked over before any run
+for schema changes. 
+
+Current version grabs user_keys from 
+django.contrib.auth.models.User and up_keys
+from student.userprofile. '''
+    def handle(self, *args, **options):
+        extracted = json.load(open('transfer_users.txt'))
+        n=0
+        for u in extracted:
+            import_user(u)
+            if n%100 == 0: 
+                print n
+            n = n+1

common/djangoapps/student/views.py

@@ -254,8 +254,7 @@ def create_account(request, post_override=None):
                 int(post_vars['date_of_birth__day']))
 
     up.save()
-
-    # TODO (vshnayder): the LMS should probably allow signups without a particular course too
+    
     d = {'name': post_vars['name'],
          'key': r.activation_key,
          }

common/djangoapps/track/middleware.py

@@ -12,8 +12,32 @@ class TrackMiddleware:
             if request.META['PATH_INFO'] in ['/event', '/login']:
                 return
             
-            event = { 'GET'  : dict(request.GET),
-                      'POST' : dict(request.POST)}
+            # Removes passwords from the tracking logs
+            # WARNING: This list needs to be changed whenever we change
+            # password handling functionality. 
+            #
+            # As of the time of this comment, only 'password' is used
+            # The rest are there for future extension. 
+            #
+            # Passwords should never be sent as GET requests, but 
+            # this can happen due to older browser bugs. We censor
+            # this too. 
+            # 
+            # We should manually confirm no passwords make it into log
+            # files when we change this. 
+
+            censored_strings = ['password', 'newpassword', 'new_password', 
+                                'oldpassword', 'old_password']
+            post_dict = dict(request.POST)
+            get_dict = dict(request.GET)
+            for string in censored_strings: 
+                if string in post_dict: 
+                    post_dict[string] = '*'*8                    
+                if string in get_dict: 
+                    get_dict[string] = '*'*8                    
+
+            event = { 'GET'  : dict(get_dict),
+                      'POST' : dict(post_dict)}
             
             # TODO: Confirm no large file uploads
             event = json.dumps(event)

lms/djangoapps/static_template_view/views.py

@@ -16,10 +16,6 @@ if settings.STATIC_GRAB:
     valid_templates = valid_templates+['server-down.html',
                                        'server-error.html'
                                        'server-overloaded.html', 
-                                       'mitx_global.html', 
-                                       'mitx-overview.html', 
-                                       '6002x-faq.html',
-                                       '6002x-press-release.html'
                                        ]
 
 def index(request, template): 
@@ -47,13 +43,4 @@ def render_404(request):
 def render_500(request):
     return render_to_response('static_templates/server-error.html', {})
 
-valid_auth_templates=[]
 
-def auth_index(request, template):
-    if not request.user.is_authenticated():
-        return redirect('/')
-
-    if template in valid_auth_templates:
-        return render_to_response(template,{})
-    else:
-        return redirect('/')

lms/envs/common.py

@@ -262,7 +262,6 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     'util.middleware.ExceptionLoggingMiddleware',
-    'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -294,9 +293,13 @@ PIPELINE_CSS = {
         'source_filenames': ['sass/application.scss'],
         'output_filename': 'css/application.css',
     },
+    'ie-fixes': {
+        'source_filenames': ['sass/ie.scss'],
+        'output_filename': 'css/ie.css',
+    },
 }
 
-PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss']
+PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss', 'sass/ie.scss']
 
 PIPELINE_JS = {
     'application': {

lms/static/sass/_about_pages.scss

@@ -262,13 +262,11 @@
     .map {
       background: rgb(245,245,245);
       float: left;
-      height: 280px;
       margin-right: flex-gutter();
       overflow: hidden;
       width: flex-grid(6);
 
       img {
-        min-height: 100%;
         max-width: 100%;
       }
     }

lms/static/sass/_course_about.scss

@@ -25,8 +25,9 @@
       @include clearfix;
       margin: 0 auto;
       max-width: 1200px;
+      min-width: 760px;
       position: relative;
-      width: grid-width(12);
+      width: 100%;
       z-index: 2;
 
 

lms/static/sass/_courses.scss

@@ -15,19 +15,20 @@
       height: 120px;
       margin: 0 auto;
       max-width: 1200px;
+      min-width: 760px;
       padding-top: 200px;
       position: relative;
       text-align: center;
       width: flex-grid(12);
 
       > hgroup {
+        background: #FFF;
         background: rgba(255,255,255, 0.93);
         border: 1px solid rgb(100,100,100);
         @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
         padding: 20px 30px;
         position: relative;
         z-index: 2;
-
       }
 
       &.main-search, &.university-search {

lms/static/sass/_dashboard.scss

@@ -73,6 +73,10 @@
               &.email-icon {
                 @include background-image(url('../images/portal-icons/email-icon.png'));
               }
+              
+              &.name-icon {
+                @include background-image(url('../images/portal-icons/course-info-icon.png'));
+              }
 
               &.location-icon {
                 @include background-image(url('../images/portal-icons/home-icon.png'));

lms/static/sass/_home.scss

@@ -19,10 +19,12 @@
       margin: 0 auto;
       padding: 200px 10px 0px;
       position: relative;
-      width: grid-width(12);
+      max-width: 1200px;
+      min-width: 760px;
     }
 
     .title {
+      background: #FFF;
       background: rgba(255,255,255, 0.93);
       border: 1px solid rgb(100,100,100);
       @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@@ -188,6 +190,7 @@
     }
 
     .media {
+      background: #FFF;
       background: rgba(255,255,255, 0.93);
       border: 1px solid rgb(100,100,100);
       @include box-sizing(border-box);
@@ -225,6 +228,7 @@
           width: 60px;
 
           &::after {
+            color: #fff;
             color: rgba(255,255,255, 0.8);
             content: "\25B6";
             display: block;
@@ -253,6 +257,7 @@
           border-color: rgba(255,255,255, 0.9);
 
           &::after {
+            color: #fff;
             color: rgba(255,255,255, 1);
           }
         }

lms/static/sass/_jobs.scss

@@ -38,6 +38,34 @@
         width: 100%;
       }
     }
+
+    header {
+      float: left;
+      width: flex-grid(7);
+
+      blockquote {
+        margin-left: 0;
+        margin-bottom: 40px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        p {
+          margin-left: 0;
+          font-style: italic;
+          line-height: 1.4;
+          font-size: 1.1em;
+          color: #666;
+        }
+
+        cite {
+          margin-top: 12px;
+          display: block;
+          color: #a0a0a0;
+        }
+      }
+    }
   }
 
   .jobs-wrapper {

lms/static/sass/_password_reset.scss

@@ -6,7 +6,7 @@
   @include box-shadow(0 5px 50px 0 rgba(0,0,0, 0.3));
   margin: 120px auto 0;
   padding: 0px 40px 40px;
-  width: grid-width(5);
+  width: flex-grid(5);
 
   header {
     margin-bottom: 30px;

lms/static/sass/base/_base.scss

@@ -83,7 +83,7 @@ a:link, a:visited {
   @include clearfix;
   margin: 0 auto 0;
   padding: 0px 10px;
-  width: grid-width(12);
+  max-width: grid-width(12);
 }
 
 span.edx {

lms/static/sass/ie.scss

+@import "bourbon/bourbon";
+@import "base/variables";
+
+// These are all quick solutions for IE please rewrite
+.highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview,
+.home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1,
+header.global {
+  background: #FFF;
+}
+
+.home > header .title .actions,
+.home > header .title:hover .actions {
+  display: none;
+  height: auto;
+}
+
+.home > header .title {
+  &:hover {
+    height: 120px;
+
+    > hgroup {
+      h1 {
+        border-bottom: 0;
+        padding-bottom: 0;
+      }
+
+      h2 {
+        opacity: 1;
+      }
+    }
+
+    .actions {
+      opacity: 0;
+    }
+  }
+}
+
+.last {
+  margin-right: 0  !important;
+}
+
+.home .university-partners .partners a {
+  .name {
+    position: static;
+  }
+
+  &:hover {
+    text-decoration: none;
+
+    &::before {
+      opacity: 1;
+    }
+
+    .name {
+      bottom: 0px;
+    }
+
+    img {
+      top: 0px;
+    }
+  }
+
+}
+
+
+.home .university-partners .partners { 
+  width: 660px;
+
+  li.partner {
+    float: left;
+    display: block;
+    padding: 0;
+    width: 220px;
+    overflow: hidden;
+  }
+}
+
+.highlighted-courses .courses .course, .find-courses .courses .course {
+  .meta-info {
+    display: none;
+  }
+
+  .inner-wrapper {
+    height: 100%;
+    overflow: visible;
+    position: relative;
+  }
+
+  header.course-preview {
+    left: 0px;
+    position: relative;
+    top: 0px;
+    width: 100%;
+    z-index: 3;
+    height: auto;
+
+    hgroup {
+      position: relative;
+      right: 0;
+      top: 0;
+    }
+
+  }
+  // }
+
+  .info {
+    height: auto;
+    position: static;
+    overflow: visible;
+
+    .desc {
+      height: auto;
+    }
+  }
+
+  &:hover {
+    background: rgb(245,245,245);
+    border-color: rgb(170,170,170);
+    @include box-shadow(0 1px 16px 0 rgba($blue, 0.4));
+
+    .info {
+      top: 0;
+    }
+
+    .meta-info {
+      opacity: 0;
+    }
+  }
+}
+

lms/static/sass/shared/_course_object.scss

@@ -141,6 +141,7 @@
         top: 0px;
         @include transition(all, 0.15s, linear);
         width: 100%;
+        overflow: hidden;
 
         .cover-image {
           height: 200px;
@@ -174,7 +175,6 @@
           padding: 0px 10px 10px 10px;
           width: 100%;
 
-
           .university {
             border-right: 1px solid rgb(200,200,200);
             color: $lighter-base-font-color;

lms/static/sass/shared/_footer.scss

@@ -15,7 +15,8 @@ footer {
     max-width: 1200px;
     margin: 0 auto;
     padding: 30px 10px 0;
-    width: grid-width(12);
+    max-width: grid-width(12);
+    min-width: 760px;
 
     .top {
       border-bottom: 1px solid rgb(200,200,200);

lms/static/sass/shared/_header.scss

@@ -13,7 +13,8 @@ header.global {
     margin: 0 auto;
     max-width: 1200px;
     padding: 14px 10px 0px;
-    width: grid-width(12);
+    max-width: grid-width(12);
+    min-width: 760px;
   }
 
   h1.logo {

lms/templates/contact.html

@@ -12,14 +12,14 @@
 
   <section class="contact">
     <div class="map">
-      <img src="${static.url('images/edx-location.png')}">
+      <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>
 
       <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>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
+      <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>
 
       <h2>Technical Inquiries and Feedback</h2>
       <p>If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at <a href="mailto:technical@edx.org">technical@edx.org</a>. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: <a href="mailto:bugs@edx.org">bugs@edx.org</a>.</p>

lms/templates/courses.html

@@ -2,6 +2,8 @@
 
 <%namespace name='static' file='static_content.html'/>
 
+<%block name="title"><title>Courses</title></%block>
+
 <section class="find-courses">
   <header class="search" style="background: url('/static/images/homepage_interns_placeholder_2025x550.jpg')">
     <div class="inner-wrapper main-search">
@@ -28,7 +30,7 @@
           <%include file="course.html" args="course=course" />
         %endfor
       </section>
-      <section class='university-column'>
+      <section class='university-column last'>
         %for course in universities['BerkeleyX']:
           <%include file="course.html" args="course=course" />
         %endfor

lms/templates/dashboard.html

@@ -6,6 +6,8 @@
 
 <%namespace name='static' file='static_content.html'/>
 
+<%block name="title"><title>Dashboard</title></%block>
+
 <section class="container dashboard">
 
   <section class="profile-sidebar">
@@ -15,10 +17,10 @@
     <section class="user-info">
       <ul>
         <li>
-          <span class="title"><div class="icon email-icon"></div>Email</span><span class="data">${ user.email }</span>
+          <span class="title"><div class="icon name-icon"></div>Full Name</span><span class="data">${ user.profile.name | h }</span>
         </li>
         <li>
-          <span class="title"><div class="icon location-icon"></div>Location</span><span class="data">${ user.profile.location }</span>
+          <span class="title"><div class="icon email-icon"></div>Email</span><span class="data">${ user.email | h }</span>
         </li>
       </ul>
     </section>

lms/templates/index.html

@@ -19,15 +19,15 @@
 
           <div class="secondary-actions">
             <div class="social-sharing">
-              <div class="sharing-message">Share with friends and family!</div>
-              <a href="#" class="share">
+              <div class="sharing-message">Stay up to date with all edX has to offer!</div>
+              <a href="https://twitter.com/edXOnline" class="share">
                 <img src="${static.url('images/social/twitter-sharing.png')}">
               </a>
-              <a href="#" class="share">
+              <a href="http://www.facebook.com/EdxOnline" class="share">
                 <img src="${static.url('images/social/facebook-sharing.png')}">
               </a>
-              <a href="#" class="share">
-                <img src="${static.url('images/social/email-sharing.png')}">
+              <a href="https://plus.google.com/108235383044095082735/posts" class="share">
+                <img src="${static.url('images/social/google-plus-sharing.png')}">
               </a>
             </div>
           </div>
@@ -36,7 +36,7 @@
 
         <a href="#video-modal" class="media" rel="leanModal">
           <div class="hero">
-            <img src="${static.url('images/courses/space3.jpg')}" />
+            <img src="${static.url('images/courses/video-thumb.jpg')}" />
             <div class="play-intro"></div>
           </div>
         </a>
@@ -66,7 +66,7 @@
               </div>
             </a>
           </li>
-          <li class="partner">
+          <li class="partner last">
             <a href="${reverse('university_profile', args=['BerkeleyX'])}">
               <img src="${static.url('images/university/berkeley/berkeley.png')}" />
               <div class="name">
@@ -88,7 +88,7 @@
             <%include file="course.html" args="course=course" />
           %endfor
         </section>
-        <section class='university-column'>
+        <section class='university-column last'>
           %for course in universities['BerkeleyX']:
             <%include file="course.html" args="course=course" />
           %endfor

lms/templates/main.html

@@ -9,10 +9,16 @@
 
 % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
  <%static:css group='application'/>
+  <!--[if lt IE 9]>
+  <%static:css group='ie-fixes'/>
+  <![endif]-->
 % endif
 
 % if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
   <link rel="stylesheet" href="/static/sass/application.css" type="text/css" media="all" / >
+  <!--[if lt IE 9]>
+  <link rel="stylesheet" href="/static/sass/ie.css" type="text/css" media="all" / >
+  <![endif]-->
 % endif
 
   <script type="text/javascript" src="${static.url('js/vendor/jquery.min.js')}"></script>
@@ -64,10 +70,6 @@
 
 <body class="<%block name='bodyclass'/>">
   <%include file="navigation.html" />
-  <!--[if lte IE 9]>
-  <p class="ie-warning">You are using a browser that is not supported by <span class="edx">edX</span>, and you might not be able to complete pieces of the course. Please download 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> to get the full experience.</p>
-  <![endif]-->
-
   <section class="content-wrapper">
     ${self.body()}
   </section>

lms/templates/portal/course_about.html

@@ -9,6 +9,9 @@
 
 <%inherit file="../main.html" />
 
+
+<%block name="title"><title>About ${course.number}</title></%block>
+
 <section class="course-info">
   <header class="course-profile">
     <div class="intro-inner-wrapper">
@@ -68,13 +71,12 @@
         <header>
           <div class="social-sharing">
             <div class="sharing-message">Share with friends and family!</div>
-            <a href="#" class="share">
+            <a href="http://twitter.com/intent/tweet?text=I+just+registered+for+${course.number}+${get_course_about_section(course, 'title')}+through+@edxonline:+http://edx.org/${reverse('about_course', args=[course.id])}" class="share">
               <img src="${static.url('images/social/twitter-sharing.png')}">
             </a>
-            <a href="#" class="share">
-              <img src="${static.url('images/social/facebook-sharing.png')}">
+            <a href="http://www.facebook.com/EdxOnline" class="share"> <img src="${static.url('images/social/facebook-sharing.png')}">
             </a>
-            <a href="#" class="share">
+            <a href="mailto:?subject=Take%20a%20course%20with%20edX%20online&body=I%20just%20registered%20for%20${course.number}%20${get_course_about_section(course, 'title')}%20through%20edX:+http://edx.org/${reverse('about_course', args=[course.id])}" class="share">
               <img src="${static.url('images/social/email-sharing.png')}">
             </a>
           </div>

lms/templates/signup_modal.html

@@ -19,14 +19,14 @@
         <div id="enroll_error" name="enroll_error"></div>
 
         <div class="input-group">
-          <label>E-mail</label>
-          <input name="email" type="email" placeholder="E-mail">
-          <label>Password</label>
-          <input name="password" type="password" placeholder="Password">
-          <label>Public Username</label>
-          <input name="username" type="text" placeholder="Public Username">
+          <label>E-mail*</label>
+          <input name="email" type="email" placeholder="E-mail*">
+          <label>Password*</label>
+          <input name="password" type="password" placeholder="Password*">
+          <label>Public Username*</label>
+          <input name="username" type="text" placeholder="Public Username*">
           <label>Full Name</label>
-          <input name="name" type="text" placeholder="Full Name">
+          <input name="name" type="text" placeholder="Full Name*">
           <label>Mailing address</label>
           <textarea name="mailing_address" placeholder="Mailing address"></textarea>
         </div>
@@ -86,13 +86,13 @@
           <label class="terms-of-service">
             <input name="terms_of_service" type="checkbox" value="true">
             I agree to the
-            <a href="${reverse('tos')}">Terms of Service</a>
+            <a href="${reverse('tos')}">Terms of Service</a>*
           </label>
 
           <label class="honor-code">
             <input name="honor_code" type="checkbox" value="true">
             I agree to the
-            <a href="${reverse('honor')}">Honor Code</a>
+            <a href="${reverse('honor')}">Honor Code</a>*
           </label>
         </div>
 

lms/templates/static_templates/404.html

 <%inherit file="../main.html" />
 
+<%block name="title"><title>404</title></%block>
+
 <section class="outside-app">
   <h1>Page not found</h1>
   <p>The page that you were looking for was not found. Go back to the <a href="/">homepage</a> or let us know about any pages that may have been moved at <a href="mailto:technical@edx.org">technical@edx.edu</a>.</p>

lms/templates/static_templates/6002x-press-release.html

-<%inherit file="../marketing.html" />
-<%block name="login_area">
-</%block>
-
-<section class="subpage">
-<div>
-
-<h1> <i>MITx</i> prototype course opens for enrollment&mdash;Online-learning
-initiative&rsquo;s first offering, &lsquo;6.002x: Circuits and
-Electronics,&rsquo; accepting registrants now.</h1>
-
-<p> MIT News Office</p>
-
-<p> In December,
-MIT <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html">announced </a>the
-launch of an online learning initiative called &ldquo;<i>MITx</i>.&rdquo;
-Starting this week, interested learners can now enroll for free in the
-initiative&rdquo;s prototype course -- 6.002x: Circuits and
-Electronics.</p>
-
-<p>Students can sign up for the course
-at <a href="http://mitx.mit.edu">mitx.mit.edu</a>. The course will
-officially begin on March 5 and run through June 8.</p>
-
-<p> Modeled after MIT&rsquo;s 6.002 &mdash; an introductory course for
-undergraduate students in MIT&rsquo;s Department of Electrical
-Engineering and Computer Science (EECS) &mdash; 6.002x will introduce
-engineering in the context of the lumped circuit abstraction, helping
-students make the transition from physics to the fields of electrical
-engineering and computer science. It will be taught by Anant Agarwal,
-EECS professor and director of MIT's Computer Science and
-Artificial Intelligence Laboratory (CSAIL); Chris Terman, CSAIL
-co-director; EECS Professor Gerald Sussman; and CSAIL Research
-Scientist Piotr Mitros.</p>
-
-<blockquote>
-  <p>
-    &ldquo;We are very excited to begin <i>MITx</i> with this prototype
-    class,&rdquo; says MIT Provost L. Rafael Reif. &ldquo;We will use
-    this prototype course to optimize the tools we have built by
-    soliciting and acting on feedback from learners.&rdquo;
-  </p>
-</blockquote>
-
-<p>
-To access the course, registered students will log in
-at <a href="http://mitx.mit.edu">mitx.mit.edu</a>, where they will
-find a course schedule, an e-textbook for the course, and a discussion
-board.  Each week, students will watch video lectures and
-demonstrations, work with practice exercises, complete homework
-assignments, and participate in an online interactive lab specifically
-designed to replicate its real-world counterpart. Students will also
-take exams and be able to check their grades as they progress in the
-course. Overall, students can expect to spend approximately 10 hours
-each week on the course.
-</p>
-
-<blockquote>
-&ldquo;We invite you to join us for this pilot course of <i>MITx</i>,&rdquo;
-Agarwal says. &ldquo;The 6.002x team of professors and teaching
-assistants is excited to work with you on the discussion forum, and we
-look forward to your feedback to improve the learning
-experience.&rdquo;
-</blockquote>
-
-<p> <a href="http://mitx.mit.edu"> A video introduction to 6.002x can
-be found here.</a></p>
-
-<p> <a href="/6002x-faq.html"> A set of Frequently Asked Questions
-about 6.002x can be found here.</a></p>
-
-<p>
-<a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219">
-FAQs about <i>MITx</i> as a whole can be found here.
-</a>
-</p>
-
-<p>
-At the end of the prototype course, students who demonstrate their
-mastery will be able to receive a certificate of completion for
-free. In future <i>MITx</i> courses, students who complete the mastery
-requirement on <i>MITx</i> will be able to receive the credential for a
-modest fee.
-</p>
-
-<p>
-Further courses are expected to become
-available beginning in the fall.
-</p>
-
-
-<h3>
-RELATED:
-</h3>
- <p>
- <a href="/index.html">
- 6.002x course website
- </a>
- </p>
-
- <p>
- <a href="/6002x-faq.html">
- 6.002x FAQ
- </a>
- </p>
-
-<h3>
-ARCHIVE: &quot;MIT launches online learning initiative&quot;
-</h3>
-<a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html">
-http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html
-</a>
-
-<h3>
-<i>MITx</i> website
-</h3>
-<a href="http://mitx.mit.edu">
-http://mitx.mit.edu
-</a>
-
-<!--h3>
-TAGS:
-</h3>
-<p>
-<i>MITx</i>; students; education, teaching, academics; innovation and
-invention; faculty; mit administration; learning; electrical
-engineering and computer science; csail
-</p-->
-</div>
-</section>

lms/templates/static_templates/about.html

@@ -3,6 +3,8 @@
 
 <%inherit file="../main.html" />
 
+<%block name="title"><title>About edX</title></%block>
+
 <section class="container about">
   <nav>
     <a href="${reverse('about_edx')}" class="active">Vision</a>
@@ -16,7 +18,7 @@
       <div class="logo">
         <img src="${static.url('images/edx-logo-large-bw.png')}">
       </div>
-      <h2 class="mission-quote">&rdquo;The mission of <span class="edx">edX</span> is 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.&ldquo;</h2>
+      <h2 class="mission-quote">&ldquo;The mission of <span class="edx">edX</span> is 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.&rdquo;</h2>
     </div>
 
     <section class="message left">
@@ -25,10 +27,7 @@
       </div>
       <article>
         <h2>About <span class="edx">edX</span></h2>
-        <p>EdX is a joint partnership between the Massachusetts Institute of Technology (MIT) and Harvard University to offer online learning to millions of people around the world. EdX offers Harvard and MIT classes online for free. Through this partnership, with other partners to follow, the institutions aim to extend their collective reach to build a global community of online students</p>
-        <p>MIT’s Director of the Computer Science and Artificial Intelligence Laboratory Anant Agarwal serves as the first president of edX, and Harvard’s Faculty of Arts and Sciences Dean Michael D. Smith leads faculty in developing courses. Along with offering online courses, the institutions will use edX to research how students learn and how technology can facilitate teaching—both on-campus and online.</p>
-        <p>EdX is based on an open-source technological platform that provides interactive educational materials designed specifically for the web, and is available to anyone in the world with an internet connection.</p>
-        <p>EdX is a Cambridge-based not-for-profit, equally owned and funded by Harvard and MIT.</p>
+        <p>EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology that features learning designed specifically for interactive study via the web. Based on a long history of collaboration and their shared educational missions, the founders are creating a new distance-learning experience. Anant Agarwal, former Director of MIT's Computer Science and Artificial Intelligence Laboratory, serves as the first president of edX. Along with offering online courses, the institutions will use edX to research how students learn and how technology can transform learning&mdash;both on-campus and worldwide. EdX is based in Cambridge, Massachusetts and is governed by MIT and Harvard.</p>
       </article>
       <hr class="fade-right-hr-divider">
     </section>
@@ -39,9 +38,8 @@
       </div>
       <article>
         <h2>Harvard University</h2>
-        <p>Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge. For students who are excited to investigate the biggest issues of the 21st century, Harvard offers an unparalleled student experience and a generous financial aid program, with over $160 million awarded to more than 60% of our undergraduate students. The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study, offering a truly global education.</p>
-        <p>Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world.
-Massachusetts Institute of Technology</p>
+        <p>Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge.  The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study.</p>
+        <p>Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world.</p>
       </article>
       <hr class="fade-left-hr-divider">
     </section>
@@ -52,8 +50,8 @@ Massachusetts Institute of Technology</p>
       </div>
       <article>
         <h2>Massachusetts Institute of Technology</h2>
-        <p>The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.</p>
-        <p>MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Seventy-eight MIT alumni, faculty, researchers and staff have won Nobel Prizes.</p>
+        <p>The Massachusetts Institute of Technology &mdash; a coeducational, privately endowed research university founded in 1861 &mdash; is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.</p>
+        <p>MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.</p>
         <p>Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.</p>
       </article>
     </section>

lms/templates/static_templates/contact.html

@@ -3,6 +3,8 @@
 
 <%inherit file="../main.html" />
 
+<%block name="title"><title>Contact edX</title></%block>
+
 <section class="container about">
   <nav>
     <a href="${reverse('about_edx')}">Vision</a>
@@ -13,14 +15,14 @@
 
   <section class="contact">
     <div class="map">
-      <img src="${static.url('images/edx-location.png')}">
+      <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>
 
       <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>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
+      <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>
 
       <h2>Technical Inquiries and Feedback</h2>
       <p>If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at <a href="mailto:technical@edx.org">technical@edx.org</a>. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: <a href="mailto:bugs@edx.org">bugs@edx.org</a>.</p>

lms/templates/static_templates/copyright.html

@@ -3,6 +3,8 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>Copyright</title></%block>
+
 <section class="static-container copyright">
   <h1> Licensing Information </h1>
   <hr class="horizontal-divider">

lms/templates/static_templates/help.html

@@ -3,7 +3,7 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
-<%block name="title"><title>Help - MITx 6.002x</title></%block>
+<%block name="title"><title>edX Help</title></%block>
 
 <section class="static-container help">
   <h1>Help</h1>

lms/templates/static_templates/honor.html

@@ -4,6 +4,8 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>Honor Code</title></%block>
+
 <section class="static-container honor-code">
   <h1> Honor Code </h1>
   <hr class="horizontal-divider">

lms/templates/static_templates/jobs.html

@@ -2,6 +2,8 @@
 
 <%inherit file="../main.html" />
 
+<%block name="title"><title>Jobs</title></%block>
+
 <section class="container jobs">
   <h1>Do You Want to Change the Future of Education?</h1>
   <hr class="horizontal-divider">
@@ -11,14 +13,19 @@
       <div class="photo">
         <img src="${static.url('images/jobs.jpeg')}">
       </div>
+      <header>
       <h2>Our mission is to transform learning.</h2>
-      <h2>Our goal is to educate 1 billion people around the world.</h2>
 
-      <q>“Edx represents a unique opportunity to improve education on our campuses though online learning, while simultaneously creating a bold new educational path for millions of learners worldwide.” </q>
-      <small class="author">Rafael Reif, MIT President </small>
+      <blockquote>
+        <p>&ldquo;Edx represents a unique opportunity to improve education on our campuses though online learning, while simultaneously creating a bold new educational path for millions of learners worldwide.&rdquo;</p>
+        <cite>&mdash;Rafael Reif, MIT President </cite>
+      </blockquote>
 
-      <q>“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.”</q>
-      <small class="author">Drew Faust, Harvard President</small>
+      <blockquote>
+        <p>&ldquo;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.&rdquo;</p>
+        <cite>&mdash;Drew Faust, Harvard President</cite>
+      </blockquote>
+      </header>
     </div>
   </section>
   <hr class="horizontal-divider">

lms/templates/static_templates/mitx-overview.html

-<%inherit file="marketing.html" /> 
-<%block name="login_area">
-</%block>
-<section class="subpage">
-<div>
-
-<h1> <i>MITx</i> Advances MIT&rsquo;s Vision for Online Learning</h1>
-
-<p> Education has entered an era of rapid, exciting,
-technology-enabled change. At MIT, we welcome the opportunity to
-harness the power of on-line technology for our students and for the
-world. On December 19, 2011, we announced <i>MITx</i>, an initiative to
-offer exciting, challenging and enriching courses to anyone,
-anywhere, who has the motivation and ability to engage MIT&rsquo;s
-educational content.</p>
-
-<p> Ten years ago, MIT
-launched <a href="http://ocw.mit.edu/index.htm">OpenCourseWare</a>,
-which places online the course materials for substantially the entire
-MIT curriculum, and was the genesis of today&rsquo;s worldwide
-movement in free, open educational resources. <i>MITx</i> is the next step
-in opening MIT&rsquo;s educational doors to the world. Through OCW and
-<i>MITx</i>, MIT invites the world to join it in the passion, hard work and
-thrill of learning and discovery.</p>
-
-<h2><i>MITx</i> will e-publish interactive online courses that:</h2>
-
-<ul>
- <li>Empower students to learn at their own pace;</li>
- <li>Offer online laboratories where students can experiment and apply their learning;</li>
- <li>Connect students to each other in online discussion groups and wiki-based collaborative learning; </li>
- <li>Challenge learners with MIT-rigor course materials; and</li>
- <li>Assess individual student learning as the student progresses through the course.</li>
-</ul>
-
-<p> <i>MITx</i> students who demonstrate their mastery of a subject can earn
-a certificate of completion awarded by <i>MITx</i>.</p>
-
-<p> <i>MITx</i> courses will be available to the world through an Internet
-platform that MIT will make freely available. MIT hopes that other
-educational institutions, anywhere in the world, will adapt and use
-the platform to publish their own educational content online for the
-benefit of learners. Because the platform will be open-source and
-scalable, adopters and users can continuously improve it, for the
-benefit of everyone.</p>
-
-<h2> Why Is MIT Creating <i>MITx</i>?</h2>
-
-<p> Excellence in teaching and learning. MIT must always provide its
-students the very best teaching and learning tools possible. MIT
-began experimenting with online technologies in its educational
-programs long before we launched OCW in 2001. We have only increased
-our emphasis in recent years, as several MIT committees have studied
-how MIT might enhance the learning experience of its students and
-expand its impact worldwide through new online offerings.</p>
-
-<p> These efforts, combined with those of numerous individual MIT
-faculty members, confirmed MIT&rsquo;s conviction that digital
-technologies enrich learning. Many other innovative institutions and
-enterprises believe the same and are bringing creative online
-offerings forward. Having brain-stormed, investigated and studied,
-we were ready to act and eager to start. We announced our <i>MITx</i>
-aspiration to capture and encourage the energy of our faculty in
-creating new online teaching and learning tools. </p>
-
-<p> Once up and running, <i>MITx</i> will be a laboratory for online
-learning. Whether <i>MITx</i> learners are MIT&rsquo;s on-campus students,
-university students elsewhere, or independent learners, <i>MITx</i> will help
-us understand how online learning occurs and how virtual communities
-of learners assemble -- information that in turn will allow us to
-improve both <i>MITx</i> and our on-campus teaching. </p>
-
-<p> Access to higher education. <i>MITx</i> will help shatter barriers to
-education. The constraints of MIT&rsquo;s physical campus allow us to
-admit less than 10 percent of our undergraduate applicants. We teach
-on-campus only a tiny fraction of the people in the world with the
-ability and motivation to learn MIT content. Online technology
-provides a new and different portal into MIT-quality education.
-Through <i>MITx</i>, MIT educational content can reach, augment, and enrich
-the education and livelihood of many learners who cannot attend
-MIT. </p>
-
-<p> <i>MITx</i> does not provide a full MIT education. Our residential
-campus is the heart of MIT&rsquo;s knowledge creation and
-dissemination. MIT students enjoy a comprehensive curriculum and
-distinct educational environment. Without MIT, there would be no
-<i>MITx</i>. </p>
-
-<p> Advancing the public good. <i>MITx</i> is an opportunity to help
-preserve and expand higher education as a public good. Historically,
-the investment of public and private assets in enormous amounts has
-produced the public benefits of knowledge creation and dissemination,
-leading to capable citizens, innovation, job creation, economic
-development, and broader welfare.</p>
-
-<p> Today, as computation and Internet technologies enable higher
-education to migrate online, MIT sees the opportunity to democratize
-education with unprecedented efficiency and scalability. We possess a
-strong desire and feel a compelling obligation to offer a
-not-for-profit, mission-driven, open-technology approach to online
-learning. <i>MITx</i> is our contribution. </p>
-
-</div>
-</section>

lms/templates/static_templates/mitx_global.html

-<%inherit file="marketing.html" />
-<%namespace name='static' file='static_content.html'/>
-
-<%block name="header_class">home</%block>
-
-<section class="index-content">
-  <section class="about">
-
-    <section class="intro">
-      <section class="intro-text">
-      <p><em>MITx</em>  will offer a portfolio of MIT courses for free to a virtual community of learners around the world. It will also enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences.</p>
-      <p>The first <em>MITx</em> course, 6.002x (Circuits and Electronics), was launched in an experimental prototype form. Watch this space for further upcoming courses, which will become available in Fall 2012.</p>
-      </section>
-
-    <section class="intro-video">
-      <a id="video-overlay-link" rel="leanModal" href="#video-overlay"><img src="${static.url('images/video-image.png')}" id="video-img" alt="Link to MITx introduction video" /><span> Watch intro video</span></a>
-    </section>
-
-    </section>
-
-    <section class="features">
-      <h2><em>MIT<span>x</span></em> courses will be offered on an online learning platform that:</h2>
-
-      <ul>
-        <li>organizes and presents course material to enable students to learn worldwide</li>
-        <li>features interactive instruction, online laboratories and student-to-student and student-to-professor communication</li>
-        <li>allows for the individual assessment of any student&rsquo;s work and allows students who demonstrate their mastery of subjects to earn certificates awarded by <em>MITx</em></li>
-        <li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions, such as universities and K-12 school systems.</li>
-      </ul>
-
-      <p><strong>Press &amp; links:</strong> <a href="/6002x-press-release.html">6.002x Press Release</a>, <a href="/6002x-faq.html">6.002x FAQ</a>, <a href="/mitx-overview.html">MITx overview</a>, <a href="http://www.boston.com/news/local/massachusetts/articles/2011/12/19/mit_to_launch_online_only_graded_courses_free_to_all/?page=full" target="_blank">Boston Globe</a>, <a href="http://www.nytimes.com/2011/12/19/education/mit-expands-free-online-courses-offering-certificates.html?_r=3&hpw=" target="_blank">New York Times</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html" target="_blank">MIT Press Release</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219" target="_blank"><em>MITx</em> FAQ</a>, <a href="http://ocw.mit.edu/index.htm" target="_blank">OpenCourseWare</a></p>
-    </section>
-
-  </section>
-
-  <section class="course">
-    <div class="announcement">
-      <h1> Announcement </h1>
-<img src="/static/images/marketing/edx-logo.png" alt="" />
-      <p>
-      On May 2, it was announced that Harvard University will join MIT as a partner in edX.  MITx, which offers online versions of MIT courses, will be a core offering of edX, as will Harvardx, a set of course offerings from Harvard.
-      </p>
-
-      <p class="announcement-button">
-        <a href="http://edxonline.org">Read more details here <span class="arrow">&#8227;</span></a>
-      </p>
-    </div>
-
-  <hgroup>
-  <h1>Spring 2012 Course offering</h1>
-  <h2>Circuits and Electronics</h2>
-  <h3>6.002x</h3>
-  </hgroup>
-
-    <p>
-      <a href="http://6002x.mitx.mit.edu/" class="more-info">More information <span>&amp;</span> Enroll <span class="arrow">&#8227;</span></a>
-    </p>
-
-    <p>Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT&rsquo;s first undergraduate analog design course. This prototype course is running, free of charge, for students worldwide from March 5, 2012 through June 8, 2012. Students are given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
-  </section>
-</section>
-
-<div id="video-overlay" class="leanModal_box">
-  <iframe id="player" type="text/html" width="560" height="390" src="http://www.youtube.com/embed/p2Q6BrNhdh8?enablejsapi=1" frameborder="0">
-  </iframe>
-</div>
-
-<%block name="js_extra">
-<script>
-
-var player;
-function onYouTubePlayerAPIReady() {
-  player = new YT.Player('player', {
-  });
-}
-
-$(function() {
-
-    var tag = document.createElement('script');
-    tag.src = "http://www.youtube.com/player_api";
-    var firstScriptTag = document.getElementsByTagName('script')[0];
-    firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
-
-    $("a#video-overlay-link").click(function(){
-      player.playVideo();
-      $("a.modal_close, #lean_overlay").click(function(){
-        player.pauseVideo();
-      });
-    });
-
-
-    // TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
-
-    /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
-            Either shows error, or shows success. */
-
-    $('#create_account_button').click(function() {
-      var submit_data={};
-      $.each($("[id^=ca_]"), function(index,value){
-        submit_data[value.name]=value.value;
-      });
-      $.each($("[id^=cb_]"), function(index,value){
-        submit_data[value.name]=value.checked;
-      });
-
-        postJSON('/create_account',
-           submit_data,
-           function(json) {
-               if(json.success) {
-                  $('#enroll').html(json.value);
-               } else {
-                  $('#enroll_error').html(json.value);
-               }
-             }
-        );
-    });
-
-    /* Activate stupid spinner drop-downs in enrollment form */
-    var spinner_array=$("[id^=spinner_]");
-       spinner_array.each(function(i) {
-          var s=spinner_array[i];
-          $("#"+s.id).click(function(){
-             $("#sregion"+s.id.substring(7)).toggle();
-          });
-        })
-
-   /*$("sregion"+$("[id^=spinner_]")[1].id.substring(7)) */
-});
-
-</script>
-</%block>

lms/templates/static_templates/press.html

@@ -3,6 +3,8 @@
 
 <%inherit file="../main.html" />
 
+<%block name="title"><title>edX in the Press</title></%block>
+
 <section class="container about">
   <nav>
     <a href="${reverse('about_edx')}">Vision</a>
@@ -91,18 +93,6 @@
       </div>
       <div class="press-info">
         <header>
-          <h3>Why Comparing edX to MIT is like Comparing a Toyota to a Ferrari</h3>
-          <span class="post-date">7/06/2012</span>
-          <a href="http://bostinno.com/2012/07/06/why-comparing-edx-to-mit-is-like-comparing-a-toyota-to-a-ferrari/">http://bostinno.com/2012/07/06/why-comparing-edx-to-mit-is-like-comparing-a-toyota-to-a-ferrari/</a>
-        </header>
-      </div>
-    </article>
-    <article class="press-story">
-      <div class="article-cover">
-        <img src="${static.url('images/courses/circuits.jpeg')}" />
-      </div>
-      <div class="press-info">
-        <header>
           <h3>Online Classes Cut Costs, But Do They Dilute Brands?</h3>
           <span class="post-date">7/02/2012</span>
           <a href="http://www.npr.org/2012/07/02/156122748/online-classes-cut-costs-but-do-they-dilute-brands">http://n.pr/Lt5ydM</a>

lms/templates/static_templates/pressrelease.html

@@ -3,6 +3,8 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>MIT and Harvard announce edX</title></%block>
+
 <section class="pressrelease">
   <section class="container">
     <h1>MIT and Harvard announce edX</h1>

lms/templates/static_templates/privacy.html

@@ -3,6 +3,8 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>Privacy Policy</title></%block>
+
 <section class="static-container privacy-policy">
   <h1>Privacy Policy</h1>
   <hr class="horizontal-divider">

lms/templates/static_templates/tos.html

@@ -3,6 +3,8 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>Terms of Service</title></%block>
+
 <section class="static-container tos">
   <h1>MITx Terms of Service</h1>
   <hr class="horizontal-divider">

lms/templates/static_templates/university_profile.html

-<%inherit file="../main.html" />
-
-<%namespace name='static' file='../static_content.html'/>
-
-<section class="university-profile">
-  <header class="search" style="background: url('/static/images/shot-5-large.jpg')">
-    <div class="inner-wrapper university-search">
-      <hgroup>
-        <div class="logo">
-          <img src="${static.url('images/mit.png')}" />
-        </div>
-        <h1>MITx</h1>
-      </hgroup>
-    </div>
-  </header>
-
-  <section class="container">
-    <section class="courses">
-    </section>
-  </section>
-</section>

lms/templates/university_profile/berkeleyx.html

 <%inherit file="base.html" />
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>BerkeleyX</title></%block>
+
 <%block name="university_header">
-  <header class="search" style="background: url('/static/images/berkeley_fountain_2025x550.jpg')">
+  <header class="search" style="background: url('/static/images/university/berkeley/berkeley_fountain_2025x550.jpg')">
     <div class="inner-wrapper university-search">
       <hgroup>
         <div class="logo">
-           <img src="${static.url('images/berkeley.png')}" />
+           <img src="${static.url('images/university/berkeley/berkeley.png')}" />
         </div>
         <h1>BerkeleyX</h1>
       </hgroup>
@@ -16,7 +18,7 @@
 </%block>
 
 <%block name="university_description">
-    <p>The University of California, Berkeley was chartered in 1868 and its flagship campus — envisioned as a "City of Learning" — was established at Berkeley, on San Francisco Bay. Berkeley Faculty consists of 1,582 fulltime and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units.  28 Nobel prizes have been awarded to Berkeley Alumni. There are 8 Nobel Laureates, 32 MacArthur Fellows, and 4 Pulitzer Prize winners among the current faculty.</p>
+    <p>The University of California, Berkeley was chartered in 1868 and its flagship campus — envisioned as a "City of Learning" — was established at Berkeley, on San Francisco Bay. Berkeley Faculty consists of 1,582 fulltime and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units.  28 Nobel prizes have been awarded to Berkeley Alumni. There are eight Nobel Laureates, 32 MacArthur Fellows, and four Pulitzer Prize winners among the current faculty.</p>
 </%block>
 
 ${parent.body()}

lms/templates/university_profile/harvardx.html

 <%inherit file="base.html" />
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>HarvardX</title></%block>
+
 <%block name="university_header">
-  <header class="search" style="background: url('/static/images/about_harvard_page_2025x550.jpg')">
+  <header class="search" style="background: url('/static/images/university/harvard/about_harvard_page_2025x550.jpg')">
     <div class="inner-wrapper university-search">
       <hgroup>
         <div class="logo">
-           <img src="${static.url('images/harvard.png')}" />
+           <img src="${static.url('images/university/harvard/harvard.png')}" />
         </div>
         <h1>HarvardX</h1>
       </hgroup>
@@ -16,8 +18,8 @@
 </%block>
 
 <%block name="university_description">
-    <p>Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge. For students who are excited to investigate the biggest issues of the 21st century, Harvard offers an unparalleled student experience and a generous financial aid program, with over $160 million awarded to more than 60% of our undergraduate students. The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study, offering a truly global education.</p>
-    <p>Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world.</p>
+  <p>Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge.  The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study.</p>
+  <p>Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world.</p>
 </%block>
 
 ${parent.body()}

lms/templates/university_profile/mitx.html

 <%inherit file="base.html" />
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="title"><title>MITx</title></%block>
+
 <%block name="university_header">
-  <header class="search" style="background: url('/static/images/shot-2-large.jpg')">
+  <header class="search" style="background: url('/static/images/university/mit/shot-2-large.jpg')">
     <div class="inner-wrapper university-search">
       <hgroup>
         <div class="logo">
-           <img src="${static.url('images/mit.png')}" />
+           <img src="${static.url('images/university/mit/mit.png')}" />
         </div>
         <h1>MITx</h1>
       </hgroup>
@@ -16,9 +18,9 @@
 </%block>
 
 <%block name="university_description">
-    <p>The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.</p>
-    <p>MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Seventy-eight MIT alumni, faculty, researchers and staff have won Nobel Prizes.</p>
-    <p>Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.</p>
+        <p>The Massachusetts Institute of Technology &mdash; a coeducational, privately endowed research university founded in 1861 &mdash; is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.</p>
+        <p>MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.</p>
+        <p>Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.</p>
 </%block>
 
 ${parent.body()}

lms/urls.py

@@ -13,21 +13,23 @@ if settings.DEBUG:
 urlpatterns = ('',
     url(r'^$', 'student.views.index', name="root"), # Main marketing page, or redirect to courseware
     url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
+    
     url(r'^change_email$', 'student.views.change_email_request'),
     url(r'^email_confirm/(?P<key>[^/]*)$', 'student.views.confirm_email_change'),
     url(r'^change_name$', 'student.views.change_name_request'),
     url(r'^accept_name_change$', 'student.views.accept_name_change'),
     url(r'^reject_name_change$', 'student.views.reject_name_change'),
     url(r'^pending_name_changes$', 'student.views.pending_name_changes'),
-    url(r'^gradebook$', 'courseware.views.gradebook'),
+    
     url(r'^event$', 'track.views.user_track'),
-    url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),
+    url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'), # TODO: Is this used anymore? What is STATIC_GRAB?
+    
     url(r'^login$', 'student.views.login_user'),
     url(r'^login/(?P<error>[^/]*)$', 'student.views.login_user'),
     url(r'^logout$', 'student.views.logout_user', name='logout'),
     url(r'^create_account$', 'student.views.create_account'),
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account'),
-#    url(r'^reactivate/(?P<key>[^/]*)$', 'student.views.reactivation_email'),
+    
     url(r'^password_reset/$', 'student.views.password_reset', name='password_reset'),
     ## Obsolete Django views for password resets
     ## TODO: Replace with Mako-ized views
@@ -42,10 +44,10 @@ urlpatterns = ('',
         name='auth_password_reset_complete'),
     url(r'^password_reset_done/$', django.contrib.auth.views.password_reset_done,
         name='auth_password_reset_done'),
-    ## Feedback
-    url(r'^send_feedback$', 'util.views.send_feedback'),
     
+    url(r'^heartbeat$', include('heartbeat.urls')),
     
+    url(r'^university_profile/(?P<org_id>[^/]+)$', 'courseware.views.university_profile', name="university_profile"),
     
     #Semi-static views (these need to be rendered and have the login bar, but don't change)
     url(r'^404$', 'static_template_view.views.render', 
@@ -72,15 +74,11 @@ urlpatterns = ('',
         {'template': 'copyright.html'}, name="copyright"),
     url(r'^honor$', 'static_template_view.views.render', 
         {'template': 'honor.html'}, name="honor"),
+        
     
-    
-    url(r'^university_profile/(?P<org_id>[^/]+)$', 'courseware.views.university_profile', name="university_profile"),
-    
-    #TODO: Convert these pages to the new edX layout
-    # 'tos.html', 
-    # 'privacy.html', 
-    # 'honor.html', 
-    # 'copyright.html', 
+    # TODO: These urls no longer work. They need to be updated before they are re-enabled
+    # url(r'^send_feedback$', 'util.views.send_feedback'),
+    # url(r'^reactivate/(?P<key>[^/]*)$', 'student.views.reactivation_email'),
 )
 
 if settings.PERFSTATS:
@@ -93,20 +91,18 @@ if settings.COURSEWARE_ENABLED:
         url(r'^modx/(?P<id>.*?)/(?P<dispatch>[^/]*)$', 'courseware.module_render.modx_dispatch'), #reset_problem'),
         url(r'^xqueue/(?P<username>[^/]*)/(?P<id>.*?)/(?P<dispatch>[^/]*)$', 'courseware.module_render.xqueue_callback'),
         url(r'^change_setting$', 'student.views.change_setting'),
-        url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'),
-        #    url(r'^course_info/$', 'student.views.courseinfo'),
-        #    url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'),
-        url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
-        url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),
-        url(r'^calculate$', 'util.views.calculate'),
-        url(r'^heartbeat$', include('heartbeat.urls')),
-        
         
+        # TODO: These views need to be updated before they work
+        # url(r'^calculate$', 'util.views.calculate'),
+        # url(r'^gradebook$', 'courseware.views.gradebook'),
+        # TODO: We should probably remove the circuit package. I believe it was only used in the old way of saving wiki circuits for the wiki
+        # url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
+        # url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),
+                
+        url(r'^courses/?$', 'courseware.views.courses', name="courses"),     
         url(r'^change_enrollment$', 
             'courseware.views.change_enrollment', name="change_enrollment"),
-        
-        # Multicourse related:
-        url(r'^courses/?$', 'courseware.views.courses', name="courses"),        
+           
         #About the course
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/about$', 
             'courseware.views.course_about', name="about_course"),
@@ -137,9 +133,6 @@ if settings.WIKI_ENABLED:
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/wiki/', include('simplewiki.urls')),
     )
 
-if settings.ENABLE_MULTICOURSE:
-	urlpatterns += (url(r'^mitxhome$', 'multicourse.views.mitxhome'),)
-
 if settings.QUICKEDIT:
 	urlpatterns += (url(r'^quickedit/(?P<id>[^/]*)$', 'dogfood.views.quickedit'),)
 	urlpatterns += (url(r'^dogfood/(?P<id>[^/]*)$', 'dogfood.views.df_capa_problem'),)