Merge pull request #254 from MITx/uc_berkeley_press

UC berkeley press

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);

lms/templates/feed.rss

@@ -11,7 +11,7 @@
     <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; 
       &lt;p&gt;edX broadens course offerings&lt;/p&gt;</content>

lms/templates/index.html

@@ -121,7 +121,7 @@
         </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>,

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/urls.py

@@ -64,8 +64,7 @@ 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', 
@@ -74,10 +73,19 @@ urlpatterns = ('',
         {'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'),