Merge branch 'kf-multicourse-design' into release/1.0

lms/static/sass/multicourse/_about_pages.scss

@@ -146,16 +146,6 @@
     }
   }
 
-  .help {
-    section.emails {
-      border: 1px solid rgb(220,220,220);
-      @include box-sizing(border-box);
-      float: left;
-      margin-left: flex-gutter();
-      padding: 20px;
-      width: flex-grid(3);
-    }
-  }
 
   .faq {
     @include clearfix;

lms/static/sass/multicourse/_help.scss

@@ -4,12 +4,16 @@
     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);

lms/static/sass/multicourse/_press_release.scss

@@ -60,5 +60,34 @@
        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/static_templates/help.html

@@ -14,6 +14,10 @@
       <h2>What are "X Universities"?</h2>
       <p>Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities" as soon as possible. Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities. </p>
     </article>
+    <article class="response">
+      <h2>What are "X Universities"?</h2>
+      <p>Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities" as soon as possible. Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities. </p>
+    </article>
   </section>
 
   <section class="emails">

lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html

@@ -4,6 +4,14 @@
 <%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">
@@ -89,6 +97,19 @@
       <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>