Merge branch 'release/1.0'

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py

cms/envs/common.py

@@ -132,10 +132,10 @@ IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
+DEFAULT_FROM_EMAIL = 'registration@edx.org'
+DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 ADMINS = (
-    ('MITx Admins', 'admin@mitx.mit.edu'),
+    ('edX Admins', 'admin@edx.org'),
 )
 MANAGERS = ADMINS
 

common/djangoapps/pipeline_mako/templates/static_content.html

 <%!
 from staticfiles.storage import staticfiles_storage
 from pipeline_mako import compressed_css, compressed_js
-from static_replace import replace_urls
 %>
 
 <%def name='url(file)'>${staticfiles_storage.url(file)}</%def>
@@ -24,5 +23,3 @@ from static_replace import replace_urls
     % endfor
   %endif
 </%def>
-
-<%def name='replace_urls(text)'>${replace_urls(text)}</%def>

common/djangoapps/student/views.py

@@ -266,13 +266,13 @@ def create_account(request, post_override=None):
     # TODO: Check password is sane
     for a in ['username', 'email', 'name', 'password', 'terms_of_service', 'honor_code']:
         if len(post_vars[a]) < 2:
-            error_str = {'username': 'Username of length 2 or greater',
-                         'email': 'Properly formatted e-mail',
-                         'name': 'Your legal name ',
-                         'password': 'Valid password ',
-                         'terms_of_service': 'Accepting Terms of Service',
-                         'honor_code': 'Agreeing to the Honor Code'}
-            js['value'] = "{field} is required.".format(field=error_str[a])
+            error_str = {'username': 'Username must be minimum of two characters long.',
+                         'email': 'A properly formatted e-mail is required.',
+                         'name': 'Your legal name must be a minimum of two characters long.',
+                         'password': 'A valid password is required.',
+                         'terms_of_service': 'Accepting Terms of Service is required.',
+                         'honor_code': 'Agreeing to the Honor Code is required.'}
+            js['value'] = error_str[a]
             return HttpResponse(json.dumps(js))
 
     try:
@@ -408,10 +408,11 @@ def password_reset(request):
         raise Http404
     form = PasswordResetForm(request.POST)
     if form.is_valid():
-        form.save(use_https=request.is_secure(),
-                   from_email=settings.DEFAULT_FROM_EMAIL,
-                   request=request)
-        return HttpResponse(json.dumps({'success': True,
+        form.save(use_https = request.is_secure(),
+                  from_email = settings.DEFAULT_FROM_EMAIL,
+                  request = request,
+                  domain_override = settings.SITE_NAME)
+        return HttpResponse(json.dumps({'success':True,
                                         'value': render_to_string('registration/password_reset_done.html', {})}))
     else:
         return HttpResponse(json.dumps({'success': False,

lms/djangoapps/courseware/courses.py

@@ -9,6 +9,8 @@ from django.http import Http404
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
+from static_replace import replace_urls
+from staticfiles.storage import staticfiles_storage
 
 log = logging.getLogger(__name__)
 
@@ -40,15 +42,8 @@ def check_course(course_id, course_must_be_open=True, course_required=True):
     return course
 
 
-### These methods look like they should be on the course_module object itself, but they rely
-### on the lms. Maybe they should be added dynamically to the class?
-
-def course_static_url(course):
-    return settings.STATIC_URL + "/" + course.metadata['data_dir'] + "/"
-
-
 def course_image_url(course):
-    return course_static_url(course) + "images/course_image.jpg"
+    return staticfiles_storage.url(course.metadata['data_dir'] + "/images/course_image.jpg")
 
 
 def get_course_about_section(course, section_key):
@@ -81,7 +76,7 @@ def get_course_about_section(course, section_key):
                         'effort', 'end_date', 'prerequisites']:
         try:
             with course.system.resources_fs.open(path("about") / section_key + ".html") as htmlFile:
-                return htmlFile.read().decode('utf-8').format(COURSE_STATIC_URL=course_static_url(course))
+                return replace_urls(htmlFile.read().decode('utf-8'), course.metadata['data_dir'])
         except ResourceNotFoundError:
             log.warning("Missing about section {key} in course {url}".format(key=section_key, url=course.location.url()))
             return None
@@ -111,11 +106,9 @@ def get_course_info_section(course, section_key):
     if section_key in ['handouts', 'guest_handouts', 'updates', 'guest_updates']:
         try:
             with course.system.resources_fs.open(path("info") / section_key + ".html") as htmlFile:
-                return htmlFile.read().decode('utf-8')
+                return replace_urls(htmlFile.read().decode('utf-8'), course.metadata['data_dir'])
         except ResourceNotFoundError:
             log.exception("Missing info section {key} in course {url}".format(key=section_key, url=course.location.url()))
             return "! Info section missing !"
 
     raise KeyError("Invalid about key " + str(section_key))
-
-

lms/envs/common.py

@@ -158,17 +158,17 @@ TEMPLATE_DEBUG = False
 
 # Site info
 SITE_ID = 1
-SITE_NAME = "localhost:8000"
+SITE_NAME = "edx.org"
 HTTPS = 'on'
 ROOT_URLCONF = 'lms.urls'
 IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
+DEFAULT_FROM_EMAIL = 'registration@edx.org'
+DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 ADMINS = (
-    ('MITx Admins', 'admin@mitx.mit.edu'),
+    ('edX Admins', 'admin@edx.org'),
 )
 MANAGERS = ADMINS
 

lms/static/js/toggle_login_modal.js

@@ -23,6 +23,17 @@
           $(".modal").hide();
 
           var modal_id = $(this).attr("href");
+          
+          if ($(modal_id).hasClass("video-modal")) {
+            //Video modals need to be cloned before being presented as a modal
+            //This is because actions on the video get recorded in the history.
+            //Deleting the video (clone) prevents the odd back button behavior.
+            var modal_clone = $(modal_id).clone(true, true);
+            modal_clone.attr('id', 'modal_clone');
+            $(modal_id).after(modal_clone);
+            modal_id = '#modal_clone';
+          }
+
 
           $("#lean_overlay").click(function() {
              close_modal(modal_id);
@@ -69,6 +80,9 @@
         $("#lean_overlay").fadeOut(200);
         $('iframe', modal_id).attr('src', '');
         $(modal_id).css({ 'display' : 'none' });
+        if (modal_id == '#modal_clone') {
+          $(modal_id).remove();
+        }
       }
     }
   });

lms/static/sass/application.scss

@@ -26,3 +26,4 @@
 @import 'multicourse/press_release';
 @import 'multicourse/password_reset';
 @import 'multicourse/error-pages';
+@import 'multicourse/help';

lms/static/sass/ie.scss

@@ -16,7 +16,6 @@ header.global {
 
 .home > header .title {
   &:hover {
-    height: 120px;
 
     > hgroup {
       h1 {
@@ -101,7 +100,6 @@ header.global {
     }
 
   }
-  // }
 
   .info {
     height: auto;
@@ -128,3 +126,10 @@ header.global {
   }
 }
 
+#lean_overlay {
+  background: #000;
+}
+
+.modal .inner-wrapper form label {
+  display: block;
+}

lms/static/sass/multicourse/_about_pages.scss

@@ -146,6 +146,7 @@
     }
   }
 
+
   .faq {
     @include clearfix;
 

lms/static/sass/multicourse/_course_about.scss

@@ -405,11 +405,6 @@
           p {
             margin-right: 10px;
           }
-
-          span {
-            float: none;
-            font-weight: normal;
-          }
         }
 
         &:hover {

lms/static/sass/multicourse/_help.scss

+.static-container.help {
+  section.questions {
+    float: left;
+    width: flex-grid(9);
+    margin-right: flex-gutter();
+
+    article {
+      margin-bottom: 40px;
+
+      h2 {
+        border-bottom: 1px solid rgb(220,220,220);
+        margin-bottom: 40px;
+        padding-bottom: 20px;
+      }
+    }
+  }
+
+  section.emails {
+    border: 1px solid rgb(220,220,220);
+    @include box-sizing(border-box);
+    float: left;
+    padding: 20px;
+    width: flex-grid(3);
+
+    ul {
+      margin-left: 0;
+      padding-left: 0;
+      list-style: none;
+
+      li {
+        margin-bottom: 1em;
+      }
+    }
+  }
+}
+

lms/static/sass/multicourse/_home.scss

@@ -425,6 +425,16 @@
           font-family: $serif;
           font-style: italic;
           margin-left: 10px;
+
+          &.read-more {
+            float: right;
+            color: lighten($base-font-color, 50%);
+
+            &:hover {
+              color: $blue;
+              text-decoration: underline;
+            }
+          }
         }
       }
     }

lms/static/sass/multicourse/_press_release.scss

@@ -18,6 +18,16 @@
       margin-bottom: 30px;
       text-align: center;
     }
+    
+    li {
+      color: $base-font-color;
+      font: normal 1em/1.6em $serif;
+      margin: 0px;
+    }
+    
+    li + li {
+      margin-top: 20px;
+    }
 
     > article {
       border: 1px solid rgb(220,220,220);
@@ -42,5 +52,42 @@
     h2 + p {
       margin-top: 30px;
     }
+    
+    .contact {
+      margin-top: 20px;
+      
+      p + p {
+       margin-top: 0px; 
+      }
+    }
+
+    h3.date {
+      margin-bottom: 0;
+    }
+
+    div.social-sharing {
+      @include clearfix;
+
+      hr.horizontal-divider {
+        margin-top: 40px !important;
+      }
+
+      .fb-like {
+        margin-top: 8px;
+        margin-left: 10px;
+        float: left;
+      }
+
+      p {
+        float: left;
+        margin-top: 8px;
+        margin-right: 10px;
+      }
+
+      a {
+        display: block;
+        float: left;
+      }
+    }
   }
 }

lms/templates/courses.html

@@ -11,7 +11,7 @@
         <div class="logo">
           <img src="${static.url('images/edx_bw.png')}" />
         </div>
-        <h2>Explore courses from leading universities.</h2>
+        <h2>Explore free courses from leading universities.</h2>
       </hgroup>
     </div>
   </header>

lms/templates/dashboard.html

@@ -95,7 +95,7 @@
             </section>
           </section>
         </article>
-        <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unenroll</a>
+        <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unregister</a>
 
       % endfor
     % else:
@@ -113,7 +113,7 @@
 <section id="unenroll-modal" class="modal unenroll-modal">
   <div class="inner-wrapper">
     <header>
-      <h2>Are you sure you want to unenroll from <span id="unenroll_course_number"></span>?</h2>
+      <h2>Are you sure you want to unregister from <span id="unenroll_course_number"></span>?</h2>
       <hr>
     </header>
 
@@ -121,7 +121,7 @@
       <input name="course_id" id="unenroll_course_id" type="hidden" />
       <input name="enrollment_action" type="hidden" value="unenroll" />
       <div class="submit">
-        <input name="submit" type="submit" value="Unenroll" />
+        <input name="submit" type="submit" value="Unregister" />
       </div>
     </form>
 

lms/templates/feed.rss

@@ -11,9 +11,9 @@
     <id>tag:www.edx.org,2012:Post/3</id>
     <published>2012-07-16T14:08:12-07:00</published>
     <updated>2012-07-16T14:08:12-07:00</updated>
-    <link type="text/html" rel="alternate" href="#"/>
+    <link type="text/html" rel="alternate" href="${reverse('press/uc-berkeley-joins-edx')}"/>
     <title>UC Berkeley joins edX</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/edx_logo_108x81.jpeg')}&quot; /&gt; 
+    <content type="html">&lt;img src=&quot;${static.url('images/edx.png')}&quot; /&gt; 
       &lt;p&gt;edX broadens course offerings&lt;/p&gt;</content>
   </entry>
   <entry>
@@ -22,7 +22,7 @@
     <updated>2012-07-16T14:08:12-07:00</updated>
     <link type="text/html" rel="alternate" href="http://edxonline.tumblr.com/post/27589840852/opening-doors-for-exceptional-students-6-002x-in"/>
     <title>Opening Doors For Exceptional Students: 6.002x in Mongolia</title>
-    <content type="html">&lt;img src=&quot;http://media.tumblr.com/tumblr_m6y5eyXV1F1rsal4c.jpg&quot; /&gt;</content>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/tumblr_tumbnail_opening_doors_mongolia.jpg')}&quot; /&gt;</content>
   </entry>
   <entry>
     <id>tag:www.edx.org,2012:Post/1</id>
@@ -30,6 +30,6 @@
     <updated>2012-07-16T14:08:12-07:00</updated>
     <link type="text/html" rel="alternate" href="http://edxonline.tumblr.com/post/27589835076/beyond-the-circuits-a-students-experience-with-6-002x"/>
     <title>Brazilian teen blogs about his 6.002x experience</title>
-    <content type="html">&lt;img src=&quot;http://media.tumblr.com/tumblr_m7bdkyV9Lp1rsal4c.png&quot; /&gt;</content>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/tumblr_tumbnail_brazilian_teen.jpg')}&quot; /&gt;</content>
   </entry>
 </feed>

lms/templates/footer.html

@@ -23,7 +23,8 @@
 
     <section class="bottom">
       <section class="copyright">
-        <p>&copy; 2012 edX, <a href="${reverse('copyright')}">some rights reserved.</a></p>
+##        <p>&copy; 2012 edX, <a href="${reverse('copyright')}">some rights reserved.</a></p> # TODO: (bridger) Update the copyright for edX, then re-enable the link.
+        <p>&copy; 2012 edX, some rights reserved.</p>
       </section>
 
       <section class="secondary">

lms/templates/index.html

@@ -45,7 +45,7 @@
 
   <section class="container">
     <section class="highlighted-courses">
-      <h2>Explore courses from <span class="edx">edX</span> universities</h2>
+      <h2>Explore free courses from <span class="edx">edX</span> universities</h2>
 
       <section class="university-partners">
         <ol class="partners">
@@ -100,7 +100,6 @@
     <section class="more-info">
       <header>
         <h2><span class="edx">edX</span> News &amp; Announcements</h2>
-        <a href="${reverse('press')}">Read More &rarr;</a>
       </header>
       <section class="news">
         <section class="blog-posts">
@@ -121,13 +120,15 @@
         </section>
         <section class="press-links">
           <h3>edX in the News:</h3>
-          ##<a href="${reverse('pressrelease')}">The edX Press Release</a>
+          ##<a href="${reverse('press/mit-and-harvard-announce-edx')}">The edX Press Release</a>
           <a target="_blank" href="http://www.nytimes.com/2012/07/20/education/edlife/anant-agarwal-discusses-free-online-courses-offered-by-a-harvard-mit-partnership.html">New York Times</a>,
           <a target="_blank" href="http://www.bostonglobe.com/magazine/2012/07/14/anant-agarwal-believes-online-education-from-mit-and-harvard-should-available-all/Af0kX44dPqpBKRV2IOSjPP/story.html"target="_blank" >Boston Globe</a>,
           <a target="_blank" href="http://www.huffingtonpost.co.uk/2012/06/20/harvard-and-mit-create-edx-free-university-courses_n_1612143.html?utm_hp_ref=uk">Huffington Post</a>,
           <a target="_blank" href="http://gigaom.com/cloud/everybody-codes/">GigaOM</a>,
           <a target="_blank" href="http://web.mit.edu/newsoffice/2012/mitx-edx-first-course-recap-0716.html">MIT News</a>,
           <a target="_blank" href="http://spectrum.ieee.org/at-work/education/review-mitxs-online-circuit-design-and-analysis-course">IEEE Spectrum</a>
+
+          <a href="${reverse('press')}" class="read-more">Read More &rarr;</a>
         </section>
       </section>
     </section>
@@ -135,8 +136,8 @@
 
 </section>
 
-<section id="video-modal" class="modal home-page-video-modal">
+<section id="video-modal" class="modal home-page-video-modal video-modal">
   <div class="inner-wrapper">
-    <iframe width="640" height="360" src="http://www.youtube.com/embed/SA6ELdIRkRU" frameborder="0" allowfullscreen></iframe>
+    <iframe width="640" height="360" src="http://www.youtube.com/embed/C2OQ51tu7W4?showinfo=0" frameborder="0" allowfullscreen></iframe>
   </div>
 </section>

lms/templates/login_modal.html

@@ -8,13 +8,13 @@
       <hr>
     </header>
 
-    <form id="login_form" method="post" data-remote="true" action="/login">
+    <form id="login_form" class="login_form" method="post" data-remote="true" action="/login">
       <label>E-mail</label>
       <input name="email" type="email" placeholder="E-mail">
       <label>Password</label>
       <input name="password" type="password" placeholder="Password">
       <label class="remember-me">
-        <input name="remember" type="checkbox">
+        <input name="remember" type="checkbox" value="true">
         Remember me
       </label>
       <div class="submit">

lms/templates/main.html

@@ -4,15 +4,19 @@
 <head>
   <%block name="title"><title>edX</title></%block>
   
-  <link rel="icon" type="image/image/x-icon" href="${static.url('images/favicon.ico')}" />
+  <link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
 
   <%static:css group='application'/>
-  <!--[if lt IE 9]>
+  <!--[if lte IE 9]>
   <%static:css group='ie-fixes'/>
   <![endif]-->
   <%static:js group='main_vendor'/>
   <%block name="headextra"/>
 
+  <!--[if lt IE 9]>
+  <script src="${static.url('js/html5shiv.js')}"></script>
+  <![endif]-->
+
   <meta name="path_prefix" content="${MITX_ROOT_URL}">
 </head>
 
@@ -27,10 +31,6 @@
 
   <%static:js group='application'/>
 
-  <!--[if lt IE 9]>
-  <script src="${static.url('js/html5shiv.js')}"></script>
-  <![endif]-->
-
   <%block name="js_extra"/>
 </body>
 </html>

lms/templates/portal/course_about.html

@@ -30,11 +30,11 @@
       <script type="text/javascript">
       (function() {
         $(".register").click(function() {
-          if ($("#login_form .enroll_fieldset").length === 0) {
-            $("#login_form").append( $(".enroll_fieldset").first().clone() );
+          if ($(".login_form .enroll_fieldset").length === 0) {
+            $(".login_form").append( $(".enroll_fieldset").first().clone() );
           }
-          if ($("#register_form .enroll_fieldset").length === 0) {
-            $("#register_form").append( $(".enroll_fieldset").first().clone() );
+          if ($(".register_form .enroll_fieldset").length === 0) {
+            $(".register_form").append( $(".enroll_fieldset").first().clone() );
           }
         });
       })(this)

lms/templates/registration/password_reset_email.html

 {% load i18n %}{% load url from future %}{% autoescape off %}
-{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
+{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at edx.org.{% endblocktrans %}
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ site_name }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
+https://www.edx.org{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
 
 {% trans "Thanks for using our site!" %}
 
-{% blocktrans %}The MITx team{% endblocktrans %}
+{% blocktrans %}The edX Team{% endblocktrans %}
 
 {% endautoescape %}

lms/templates/signup_modal.html

@@ -13,7 +13,7 @@
         <hr>
       </header>
 
-      <form id="register_form" method="post" data-remote="true" action="/create_account">
+      <form id="register_form" class="register_form" method="post" data-remote="true" action="/create_account">
         <div class="notice"></div>
         <div id="register_error" class="modal-form-error" name="register_error"></div>
         <div id="register_error" name="register_error"></div>

lms/templates/static_templates/contact.html

@@ -22,7 +22,7 @@
       <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&nbsp;class.</p>
 
       <h2>General Inquiries and Feedback</h2>
-      <p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
+      <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>
@@ -31,7 +31,7 @@
       <p>Please visit our <a href="${reverse('press')}">media/press page</a> for more information. For any media or press enquiries, please email <a href="mailto:press@edx.org">press@edx.org</a>.</p>
 
       <h2>Universities</h2>
-      <p>If you are a university wishing to Collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p>
+      <p>If you are a university wishing to collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p>
 
     </div>
   </section>

lms/templates/static_templates/help.html

@@ -9,8 +9,29 @@
   <h1>Help</h1>
   <hr class="horizontal-divider">
 
-  <div class="inner-wrapper">
+  <section class="questions">
+    <article class="response">
+      <h2>I tried to sign up, but it says the username is already taken.</h2>
+      <p>If you have previously signed up for an MITx account, you already have an edX account and can log in with your existing username and password. If you don’t have an MITx account and received this error, it's possible that someone else has already signed up with that username. Please try a different, more unique username &ndash; for example, try adding a random number to the end.</p>
+    </article>
+    <article class="response">
+      <h2>How will I know that the course I have signed up for has started?</h2>
+      <p>The start date for each course is listed on the right-hand side of the Course About page.</p>
+    </article>
+    <article class="response">
+      <h2>I just signed up into edX. I have not received any form of acknowledgement that I have enrolled.</h2>
+      <p>You should receive a single activation e-mail. If you did not, it may be because:</p>
+      <ul>
+        <li>There was a typo in your e-mail address.</li>
+        <li>The activation e-mail was caught by your spam filter. Please check your spam folder.</li>
+        <li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome.</li>
+        <li>JavaScript is disabled in your browser. Please confirm it is enabled.</li>
+        <li>If you run into issues, try recreating your account. There is no need to do anything about the old account, if any. If it is not activated through the link in the e-mail, it will disappear later.</li>
+      </ul>
+    </article>
+  </section>
 
+  <section class="emails">
     <h2>Help email</h2>
 
     <ul>
@@ -19,6 +40,5 @@
       <li><p>Bug reports: <a href="mailto:bugs@edx.org">bugs@edx.org</a></p></li>
       <li><p>Suggestions: <a href="mailto:suggestions@edx.org">suggestions@edx.org</a></p></li>
     </ul>
-
-  </div>
+  </section>
 </section>

lms/templates/static_templates/jobs.html

@@ -31,42 +31,30 @@
   <hr class="horizontal-divider">
 
   <section class="jobs-wrapper">
-    <h2>We are currently looking for</h2>
-
     <section class="jobs-listing">
-      <article id="technology-team" class="job">
+      <article id="edx-fellow" class="job">
         <div class="inner-wrapper">
-          <h3>Technology Team</h3>
-          <p>We’re looking for both back-end and front-end developers. Strong backgrounds in machine learning, education, user interaction design, big data, or social network analysis are desirable, but team members do wear many hats. Best candidate would be a masterful hacker who went out and did start ups after finishing their Ph.D.</p>
-          <p>If you are interested in this position, please send an email to <a href='mailto:content-engineers@edx.org'>content-engineers@edx.org</a></p>
+          <h3>EdX Fellow</h3>
+          <p>EdX Fellows are immersed in developing innovative solutions for online teaching, learning and research. They partner with faculty and staff from edX universities in the development, implementation and evaluation of online courses. We're looking for candidates with recent masters or doctorate degrees in the social sciences, humanities, natural sciences, engineering, or education. We welcome new ways of thinking about both the promises and practices of online learning.</p>
+          <p>Ability to work in a fast-paced, highly collaborative environment is essential.</p>
+          <p>If you are interested in this position, please send an email to <a href='mailto:jobs@edx.org'>jobs@edx.org</a>.</p>
         </div>
       </article>
 
-      ## <article id="edx-fellow" class="job">
-      ##   <div class="inner-wrapper">
-      ##     <h3>edX Fellow</h3>
-      ##     <p>The edX fellows program is intended as an alternative  to the traditional academic track for candidates with a ## strong focus on teaching.  Fellows act as contact points for departments at MIT and Harvard , and help facilitate ## putting together online courses.</p>
-      ##     <p>If you're interested in this position, send an e-mail to <a href="mailto:fellow-jobs@edx.org">fellow-jobs@edx.org## </a></p>
-      ##   </div>
-      ## </article>
+      <article id="platform-developer" class="job">
+        <div class="inner-wrapper">
+          <h3>Platform Developer</h3>
+          <p>Platform Developers build the core learning platform that powers edX, writing both front-end and back-end code. They tackle a wide range of technical challenges, and so the best candidates will have a strong background in one or more of the following areas: machine learning, education, user interaction design, big data, social network analysis, and devops. Specialists are encouraged to apply, but team members often wear many hats. Our ideal candidate would have excellent coding skills, a proven history of delivering projects, and a deep research background.</p>
+          <p>If you are interested in this position, please send an email to <a href='mailto:jobs@edx.org'>jobs@edx.org</a></p>
+        </div>
+      </article>
 
       <article id="content-engineer" class="job">
         <div class="inner-wrapper">
           <h3>Content Engineer</h3>
-          <p>Content engineers help create the technology for specific courses. The tasks include:</p>
-          <ul>
-            <li>
-              <p>Development of course-specific user-facing elements, such as the circuit editor and simulator that Chris Terman and Jacob White developed for 6.002x</p>
-            </li>
-            <li>
-              <p>Simple integration of course materials into courses</p>
-            </li>
-            <li>
-              <p>Developing programs to grade rich design questions, such as the ones developed by Gerald Sussman to allow basic design problems in 6.002x.</p>
-            </li>
-          </ul>
-          <p>Knowledge of Python, XML, and/or JavaScript is desired. Strong interest and background in pedagogy and education is desired as well.</p>
-          <p>If you're interested in this position, send an e-mail to <a href="mailto:content-engineers@edx.org">content-engineers@edx.org</a></p>
+          <p>Content Engineers develop sophisticated, domain-specific tools that enable professors to deliver the best possible educational experience in their classes. Examples include circuit schematic editors, scientific simulators of every kind, and peer collaboration tools. Content Engineers are dedicated to pushing the boundaries of what can be taught and assessed online, and will work closely with edX Fellows and course staff.</p>
+          <p>Strong JavaScript skills are required. A deep interest and background in pedagogy and education is highly desired. Knowledge of GWT, Backbone.js, and Python a plus.</p>
+          <p>If you are interested in this position, please send an email to <a href='mailto:jobs@edx.org'>jobs@edx.org</a>.</p>
         </div>
       </article>
     </section>
@@ -74,12 +62,12 @@
     <section class="jobs-sidebar">
       <h2>Positions</h2>
       <nav>
-        <a href="#technology-team">Technology Team</a>
-        <a href="#edx-fellow">edX Fellow</a>
+        <a href="#edx-fellow">EdX Fellow</a>
+        <a href="#platform-developer">Platform Developer</a>
         <a href="#content-engineer">Content Engineer</a>
       </nav>
       <h2>How to Apply</h2>
-      <p>E-mail your resume, coverletter and any other materials to <a href="#">careers@edx.org</a></p>
+      <p>E-mail your resume, coverletter and any other materials to <a href="mailto:jobs@edx.org">jobs@edx.org</a></p>
       <h2>Our Location</h2>
       <p>11 Cambridge Center <br/>
       Cambridge, MA 02142</p>

lms/templates/static_templates/press.html

@@ -25,14 +25,14 @@ articles = [
           image="univworldnews_logo_178x138.jpeg",
           deck=None,
           publication="University World News",
-          publish_date="7/19/2012 Issue No:231"),
+          publish_date="July 19, 2012 Issue No:231"),
   Article(title="One Course, 150,000 Students",
           url="http://nyti.ms/LtlQ5k",
           author="Tamar Lewin",
           image="nyt_logo_178x138.jpeg",
           deck=None,
           publication="The New York Times",
-          publish_date="7/18/2012"),
+          publish_date="July 18, 2012"),
   Article(title="Lessons learned from MITx's prototype course",
           url="http://mitne.ws/Mdabcp",
           author="Larry Hardesty, MIT News Office",
@@ -46,84 +46,84 @@ articles = [
           image="gigaom_logo_178x138.jpeg",
           deck=None,
           publication="GigaOM",
-          publish_date="7/16/2012"),
+          publish_date="July 16, 2012"),
   Article(title="Anant Agarwal believes an online education from MIT and Harvard should be available to all",
           url="http://b.globe.com/P6XKlB",
           author="Jon Marcus",
           image="bostonglobe_logo_178x138.jpeg",
           deck=None,
           publication="The Boston Globe",
-          publish_date="7/15/2012"),
+          publish_date="July 15, 2012"),
   Article(title="Online Classes Cut Costs, But Do They Dilute Brands?",
           url="http://n.pr/Lt5ydM",
           author="Tovia Smith",
           image="npr_logo_178x138.jpeg",
           deck=None,
           publication="NPR",
-          publish_date="7/02/2012"),
+          publish_date="July 02, 2012"),
   Article(title="Coming Your Way: Free Virtual Courses From Top U.S. Universities",
           url="http://www.openequalfree.org/coming-your-way-free-virtual-courses-from-top-u-s-universities/13993",
           author=None,
           image="oef_logo_178x138.jpeg",
           deck=None,
           publication="Open Equal Free",
-          publish_date="6/29/2012"),
+          publish_date="June 29, 2012"),
   Article(title="Open Online Courses Are No Substitute for Classroom Learning",
           url="http://bit.ly/MMEdEX",
           author="Joshua Kim",
           image="usnews_logo_178x138.jpeg",
           deck=None,
           publication="US News",
-          publish_date="6/29/2012"),
+          publish_date="June 29, 2012"),
   Article(title="Harvard and MIT create edX to offer free video online courses to the world",
           url="http://huff.to/LBucd3",
           author="Lucy Sheriff",
           image="huffpost_logo_178x138.jpeg",
           deck=None,
           publication="The Huffington Post",
-          publish_date="6/20/2012"),
+          publish_date="June 20, 2012"),
   Article(title="Top universities put their reputations online",
           url="http://bbc.in/M5avea",
           author="Irina Khokhlova",
           image="bbc_logo_178x138.jpeg",
           deck=None,
           publication="BBC News",
-          publish_date="6/20/2012"),
+          publish_date="June 20, 2012"),
   Article(title="MIT receives $1 million to support edX partnership",
           url="http://mitne.ws/Md5Aaa",
           author=None,
           image="mit_logo_178x138.jpeg",
           deck="Institute receives award as part of Gates Foundation efforts to boost postsecondary graduation rates.",
           publication="MIT News",
-          publish_date="6/19/2012"),
+          publish_date="June 19, 2012"),
   Article(title="Column: Ivy League education? Online is the new option",
           url="http://usat.ly/J73NW7",
           author="Katrina Trinko",
           image="usa_logo_178x138.jpeg",
           deck=None,
           publication="USA Today",
-          publish_date="5/15/2012"),
+          publish_date="May 15, 2012"),
   Article(title="What is edX?",
           url="http://mitne.ws/PgYhya",
           author=None,
           image="mit_logo_178x138.jpeg",
           deck="Answering common questions about MIT and Harvard's new partnership in online education.",
           publication="MIT News",
-          publish_date="5/02/2012"),
+          publish_date="May 02, 2012"),
   Article(title="MIT and Harvard announce edX",
           url="http://mitne.ws/Md5yit",
           author=None,
           image="mit_logo_178x138.jpeg",
           deck="Joint partnership builds on MITx and Harvard distance learning; aims to benefit campus-based education and beyond.",
           publication="MIT News",
-          publish_date="5/02/2012"),
+          publish_date="May 02, 2012"),
   Article(title="MIT and Harvard launch a 'revolution in education'",
           url="http://mitne.ws/PgZQvY",
           author=None,
           image="mit_logo_178x138.jpeg",
           deck="Online edX courses will open both universities' classrooms to the world while enhancing on-campus learning.",
           publication="MIT News",
-          publish_date="5/02/2012"),
+          publish_date="May 02, 2012"),
 ]
 
 %>

lms/templates/static_templates/pressrelease.html → lms/templates/static_templates/press_releases/MIT_and_Harvard_announce_edX.html

 <%! from django.core.urlresolvers import reverse %>
-<%inherit file="../main.html" />
+<%inherit file="../../main.html" />
 
-<%namespace name='static' file='../static_content.html'/>
+<%namespace name='static' file='../../static_content.html'/>
 
 <%block name="title"><title>MIT and Harvard announce edX</title></%block>
 

lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html

+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title"><title>UC Berkeley joins edX</title></%block>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<section class="pressrelease">
+  <section class="container">
+    <h1>UC Berkeley joins edX</h1>
+    <hr class="horizontal-divider">
+
+    <article>
+      <h2>UC Berkeley joins Harvard and MIT not-for-profit online learning collaborative; edX broadens free course offerings into public health, computer science and solid-state chemistry; opens registration</h2>
+      
+      <p>EdX, the online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT) and launched in May, announced today the addition of the University of California, Berkeley to its platform.  UC Berkeley, ranked No. 1 among public universities in the United States in 2012 by US News &amp; World Report, will collaborate with edX to expand the group of participating "X Universities" &ndash; universities offering their courses on the edX platform. </p>
+
+      <p>Through edX, the "X Universities" will provide interactive education wherever there is access to the Internet and will enhance teaching and learning through research about how students learn, and how technologies can facilitate effective teaching both on-campus and online. EdX plans to add other "X Universities" from around the world to the edX platform in the coming months. </p>
+
+      <p>UC Berkeley will offer two courses on edX this Fall, and the university will also serve as the inaugural chair of the to-be-formed "X University" Consortium.</p>
+
+      <p>Robert J. Birgeneau, the Chancellor of UC Berkeley, announced:  "We are committed to excellence in online education with the dual goals of distributing higher education more broadly and enriching the quality of campus-based education. We share the vision of MIT and Harvard leadership and believe that collaborating with the not-for-profit model of edX is the best way to do this. <em>Fiat Lux</em>."</p>
+      <p>Meanwhile, edX announced two new courses each from HarvardX and <em>MITx</em> to be launched on edX this fall, along with <em>MITx</em>'s 6.002x Circuits &amp; Electronics. All of the courses will be hosted from edX's website, www.edx.org. </p>
+
+      <p>MIT launched its <em>MITx</em> online learning initiative in December 2011, with 6.002x as its prototype course, and more than 150,000 students worldwide enrolled. EdX was announced by Harvard and MIT in May, with each university committing to contribute $30 million toward the online partnership.</p>
+
+      <p>"We are very excited that UC Berkeley is joining us in this effort," said Anant Agarwal, President of edX. "EdX is about revolutionizing learning, and we have received a tremendous outpouring of excitement and interest from universities around the world. UC Berkeley is an extraordinary public institution known not only for its academic excellence but also for its innovativeness. With this collaboration, edX is now positioned to improve education more rapidly, both online and on-campus worldwide."</p>
+
+      <p>"From the outset, we have imagined edX as a platform to be shared with other educational institutions," said MIT President L. Rafael Reif. "Berkeley's decision to join the effort is great news: MIT is already seeing the benefits of its collaboration with Harvard, and we look forward to working with our remarkable colleagues at Berkeley as we explore the future of online education. Together, we are sure to learn much about how to enrich residential education even as we reach new learners far from our campuses."</p>
+
+      <p>In addition to the funding commitments by Harvard and MIT, edX has already garnered outside financial support, including two individual leadership gifts. MIT alumnus Philippe Laffont, founder and chief investment officer of Coatue Management, LLC, has made a gift to support <em>MITx</em> in honor of MIT Professor Stephen A. Ward, Laffont's thesis advisor at MIT. Harvard Alumnus Jonathan Grayer, former chairman and CEO of Kaplan, Inc. and cofounder of Weld North LLC, has made a gift in support of HarvardX. </p>
+
+      <p>Foundation support has also begun to flow in. Earlier in the summer, MIT received a grant from the Bill &amp; Melinda Gates Foundation. Grant funds will go towards developing an introduction to computer science course on the edX platform and partnering with a postsecondary institution that targets low-income young adults to offer this introductory course in a "flipped classroom" setting, where students watch course videos at home and work together in the classroom. </p>
+
+      <p>"Interest from other institutions in collaborating with edX has been enormous from the outset and we are delighted that the partnership announced today by Berkeley has come together so quickly," said Harvard President Drew Faust. "Since the beginning, our goal has been to broaden edX offerings by partnering with other universities who are equally committed to both expanding access to education and improving research about teaching and learning. Today's announcement is in an important step in that direction."</p>
+
+      <p>UC Berkeley will bring significant, new, open source technology to the edX platform. Developers from UC Berkeley  are working directly with the edX team to integrate the technology. </p>
+
+      <p>EdX will release its learning platform as open source software so that anyone around the world can adopt and improve this shared tool. Timing of the release has not yet been determined. </p>
+
+      <p>The classes to be offered on edX this fall are: </p>
+
+      <ul>
+      <li>HarvardX &ndash; "Health in Numbers: Quantitative Methods in Clinical and Public Health Research" is a course in Biostatistics and Epidemiology focused on teaching a diversity of health care practitioners and other students from around the world how to design rigorous clinical and public health studies and analyze complex health data, thereby furthering the school's mission of improving global health. The course is taught by Professors E. Francis Cook and Marcello Pagano. Dr. Cook is a Professor of Epidemiology at the Harvard School of Public Health (HSPH) and at the Harvard Medical School and he has won citations for Excellence in Teaching from the Harvard School of Public Health on four occasions. Dr. Pagano obtained a Ph.D. from Johns Hopkins University and has spent the last 35 years on the faculty at HSPH teaching biostatistics and advising students.</li>
+
+      <li>HarvardX &ndash; "Computer Science 50" (CS 50) is Harvard College's introduction to the intellectual enterprises of computer science and the art of programming for majors and non-majors alike. An entry-level course, CS50 teaches students how to think algorithmically and solve problems efficiently. Topics include abstraction, data structures, memory management and security. Languages include C, PHP and JavaScript. The course is designed for students with or without prior programming experience. As of Fall 2011, CS50 was Harvard College's third-largest course. It is taught by Harvard Senior Lecturer David J. Malan. He received his A.B., S.M. and Ph.D. in Computer Science from Harvard in 1999, 2004 and 2007, respectively.</li>
+
+      <li><em>MITx</em> &ndash; "Introduction to Computer Science and Programming" provides an understanding of computational approaches to scientific problem solving for students with little or no prior programming experience. It is based on the most popular course on MIT's OpenCourseWare platform and provides a tour of the major features of the Python programming language and object-oriented programming, algorithmic design and analysis and computational approaches to generating and understanding data, with examples drawn largely from the sciences and social sciences. The principal instructors for the course are John Guttag, W. Eric Grimson, and Chris Terman. John Guttag is the Dugald C. Jackson Professor of Computer Science and Electrical Engineering at MIT, and currently heads the Computer Science and Artificial Intelligence Laboratory's Data-driven Medical Research Group. Christopher J. Terman has taught computer science courses in the EECS department for many years; his research has been in the areas of programming languages, compilers, computer-aided design tools and educational technologies. W. Eric Grimson is the Bernard Gordon Professor of Medical Engineering and Chancellor of MIT.</li>
+
+      <li><em>MITx</em> &ndash; "Introduction to Solid State Chemistry" is a first-year college course where chemical principles are explained by examination of the properties of materials. The electronic structure and chemical bonding of materials is related to applications and engineering systems throughout the course. The on-campus version of the course has been taught for more than 40 years and is one of the largest classes at MIT. The instructor for the course is MIT Professor of Materials Science and Engineering Michael J. Cima. Cima is author or co-author of more than 200 peer-reviewed scientific publications and 45 patents.</li>
+
+      <li><em>MITx</em> &ndash; "Circuits and Electronics" is an introductory undergraduate electrical engineering course taught by visiting MIT Associate Professor Khurram K. Afridi and developed by edX president MIT Professor Anant Agarwal, MIT Professor Gerald J. Sussman, MIT Senior Lecturer Christopher J. Terman and edX Chief Scientist Piotr Mitros.</li>
+
+      <li>BerkeleyX &ndash; "Artificial Intelligence" is a course in the basic ideas and techniques underlying the design of intelligent computer systems, with a specific emphasis on the statistical and decision-theoretic modeling paradigm. By the end of this course, students will have built autonomous agents that reason in uncertain environments and will have developed machine learning algorithms that will classify handwritten digits and photographs. The on-campus version of the course is one of the most popular computer science courses at Berkeley. It will be taught by UC Berkeley Assistant Professor Pieter Abbeel and Associate Professor Dan Klein, a recent recipient of the Distinguished Teaching Award, UC Berkeley's highest teaching honor.</li>
+
+      <li>BerkeleyX &ndash; "Software as a Service" teaches the fundamentals for engineering long-lived software using highly-productive agile techniques to develop Software as a Service (SaaS) using Ruby on Rails. The topics include test-driven development, behavior-driven/user-centric design, design patterns, legacy code, refactoring and deployment. It will be taught by UC Berkeley Adjunct Associate Professor Armando Fox, who has received teaching and mentoring awards from Stanford University, the Society of Women Engineers and Tau Beta Pi Honor Society, and Professor David A. Patterson, winner of the ACM Karl Karlstrom Teaching Award and the IEEE Mulligan Medal in Education.</li>
+      </ul>
+
+      <p>For this introductory set of courses, certificates of mastery will be available at no charge for each of the courses to those learners motivated and able to demonstrate their knowledge of the course material. </p>
+
+      <h2>About edX</h2>
+
+      <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 online-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>
+
+      <h2>About 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. 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>
+
+      <h2>About MIT</h2>
+
+      <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. Seventy-eight 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>
+
+      <h2>About the University of California, Berkeley</h2>
+
+      <p>The University of California, Berkeley is the world's premier public university with a mission to excel in teaching, research and public service. This longstanding mission has led to the university's distinguished record of Nobel-level scholarship, constant innovation, a concern for the betterment of our world and consistently high rankings of its schools and departments. The campus offers superior, high value education for extraordinarily talented students from all walks of life; operational excellence and a commitment to the competitiveness and prosperity of California and the nation. </p>
+      
+      <p>The University of California was chartered in 1868 and its flagship campus in Berkeley, on San Francisco Bay, was envisioned as a "City of Learning." Today, there are more than 1,500 full-time and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units. Twenty-two Nobel Prizes have been garnered by faculty and twenty-eight Nobel prizes have been awarded to UC Berkeley alumni. There are 9 Nobel Laureates, 32 MacArthur Fellows and 4 Pulitzer Prize winners among the current faculty.</p>
+      
+      <section class="contact">
+        <p><strong>Contact: </strong>Amanda Keane</p>
+        <p>akeane@webershandwick.com</p>
+      </section>
+      
+      <section class="footer">
+        <hr class="horizontal-divider">
+        <div class="logo"></div><h3 class="date">7 - 24 - 2012</h3>
+        <div class="social-sharing">
+        <hr class="horizontal-divider">
+          <p>Share with friends and family:</p>
+          <a href="http://twitter.com/intent/tweet?text=UC+Berkeley+joins+Harvard+and+MIT+not-for-profit+online+learning+collaborative:+http://edx.org/press/uc-berkeley-joins-edx" class="share">
+            <img src="${static.url('images/social/twitter-sharing.png')}">
+          </a>
+        </a>
+        <a href="mailto:?subject=UC%20Berkeley%20Joins%20edX&body=UC%20Berkeley%20joins%20Harvard%20and%20MIT%20not-for-profit%20online%20learning%20collaborative;%20edX%20broadens%20free%20course%20offerings%20into%20public%20health…http://edx.org/press/uc-berkeley-joins-edx" class="share">
+          <img src="${static.url('images/social/email-sharing.png')}">
+        </a>
+        <div class="fb-like" data-href="http://edx.org/press/uc-berkeley-joins-edx" data-send="true" data-width="450" data-show-faces="true"></div>
+      </div>
+        
+      </section>
+    </article>
+  </section>
+</section>

lms/urls.py

@@ -64,20 +64,29 @@ urlpatterns = ('',
         {'template': 'faq.html'}, name="faq_edx"),
     url(r'^help$', 'static_template_view.views.render', 
         {'template': 'help.html'}, name="help_edx"),
-    url(r'^pressrelease$', 'static_template_view.views.render', 
-        {'template': 'pressrelease.html'}, name="pressrelease"),
+
     url(r'^tos$', 'static_template_view.views.render', 
         {'template': 'tos.html'}, name="tos"),
     url(r'^privacy$', 'static_template_view.views.render', 
         {'template': 'privacy.html'}, name="privacy_edx"),
-    url(r'^copyright$', 'static_template_view.views.render', 
-        {'template': 'copyright.html'}, name="copyright"),
+    # TODO: (bridger) The copyright has been removed until it is updated for edX
+    # url(r'^copyright$', 'static_template_view.views.render', 
+    #     {'template': 'copyright.html'}, name="copyright"),
     url(r'^honor$', 'static_template_view.views.render', 
         {'template': 'honor.html'}, name="honor"),
+        
+    #Press releases    
+    url(r'^press/mit-and-harvard-announce-edx$', 'static_template_view.views.render', 
+        {'template': 'press_releases/MIT_and_Harvard_announce_edX.html'}, name="press/mit-and-harvard-announce-edx"),
+    url(r'^press/uc-berkeley-joins-edx$', 'static_template_view.views.render', 
+        {'template': 'press_releases/UC_Berkeley_joins_edX.html'}, name="press/uc-berkeley-joins-edx"),
+    # Should this always update to point to the latest press release?
+    (r'^pressrelease$', 'django.views.generic.simple.redirect_to', {'url': '/press/uc-berkeley-joins-edx'}), 
     
     
-    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
     
+    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
+        
     # 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'),