From 18ec7ca8e893c2ac81cdea74f327e31f0f797b19 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 23 Jul 2012 19:17:22 -0400
Subject: [PATCH 1/2] Added social links to the footer of the press release

---
 lms/static/sass/multicourse/_about_pages.scss | 10 -------
 .../sass/multicourse/_press_release.scss      | 29 +++++++++++++++++++
 .../press_releases/UC_Berkeley_joins_edX.html | 21 ++++++++++++++
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss
index 8e7c1994af..a72a77c89f 100644
--- a/lms/static/sass/multicourse/_about_pages.scss
+++ b/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;
diff --git a/lms/static/sass/multicourse/_press_release.scss b/lms/static/sass/multicourse/_press_release.scss
index cdbd9e2ee8..7b3dd36e31 100644
--- a/lms/static/sass/multicourse/_press_release.scss
+++ b/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;
+      }
+    }
   }
 }
diff --git a/lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html b/lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html
index 66e056e6aa..70aff34c8f 100644
--- a/lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html
+++ b/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>

From 3008c177303879a0ad48f1817329798fbf313452 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 23 Jul 2012 19:19:50 -0400
Subject: [PATCH 2/2] Added bottom margin for articles in help

---
 lms/static/sass/multicourse/_help.scss   | 10 +++++++---
 lms/templates/static_templates/help.html |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lms/static/sass/multicourse/_help.scss b/lms/static/sass/multicourse/_help.scss
index 9fed09907d..ca1011951e 100644
--- a/lms/static/sass/multicourse/_help.scss
+++ b/lms/static/sass/multicourse/_help.scss
@@ -4,10 +4,14 @@
     width: flex-grid(9);
     margin-right: flex-gutter();
 
-    h2 {
-      border-bottom: 1px solid rgb(220,220,220);
+    article {
       margin-bottom: 40px;
-      padding-bottom: 20px;
+
+      h2 {
+        border-bottom: 1px solid rgb(220,220,220);
+        margin-bottom: 40px;
+        padding-bottom: 20px;
+      }
     }
   }
 
diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html
index f7e69634ba..6f01fd8040 100644
--- a/lms/templates/static_templates/help.html
+++ b/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">