Merge pull request #305 from MITx/feature/dormsbee/press_copy_updates

Hotfix changes

lms/static/sass/multicourse/_course_about.scss

@@ -27,14 +27,17 @@
       max-width: 1200px;
       min-width: 760px;
       position: relative;
-      width: 100%;
       z-index: 2;
 
-
+      > div.table {
+        display: table;
+        width: 100%;
+      }
       .intro {
         @include box-sizing(border-box);
         @include clearfix;
-        float: left;
+        display: table-cell;
+        vertical-align: middle;
         padding: 20px 20px;
         position: relative;
         width: flex-grid(8) + flex-gutter();
@@ -130,9 +133,7 @@
       .media {
         background: transparent;
         @include box-sizing(border-box);
-        display: block;
-        float: right;
-        height: 180px;
+        display: table-cell;
         padding: 20px;
         position: relative;
         width: flex-grid(4);

lms/templates/index.html

@@ -126,7 +126,10 @@
           <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 target="_blank" href="http://spectrum.ieee.org/at-work/education/review-mitxs-online-circuit-design-and-analysis-course">IEEE Spectrum</a>,
+          <a target="_blank" href="http://harvardmagazine.com/2012/07/harvard-extended">Harvard Magazine</a>,
+          <a target="_blank" href="http://www.nytimes.com/2012/07/24/education/berkeley-to-offer-free-online-classes-on-edx.html?_r=1">Bloomberg</a>
+          ## <a target="_blank" href="http://chronicle.com/blogs/wiredcampus/uc-berkeley-joins-edx-effort-to-offer-free-open-courses/37969">The Chronicle of Higher Education</a>
 
           <a href="${reverse('press')}" class="read-more">Read More &rarr;</a>
         </section>

lms/templates/portal/course_about.html

@@ -51,6 +51,7 @@
 <section class="course-info">
   <header class="course-profile">
     <div class="intro-inner-wrapper">
+      <div class="table">
       <section class="intro">
         <hgroup>
           <h1>${course.number}: ${get_course_about_section(course, "title")}<a href="${reverse('university_profile', args=[course.org])}">${get_course_about_section(course, "university")}</a></h1>
@@ -84,6 +85,7 @@
       </div>
       % endif
     </div>
+      </div>
   </header>
 
   <section class="container">
@@ -107,7 +109,7 @@
         <header>
           <div class="social-sharing">
             <div class="sharing-message">Share with friends and family!</div>
-            <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">
+            <a href="http://twitter.com/intent/tweet?text=I+just+registered+for+${course.number}+${get_course_about_section(course, 'title')}+through+@edxonline:+http://www.edx.org${reverse('about_course', args=[course.id])}" class="share">
               <img src="${static.url('images/social/twitter-sharing.png')}">
             </a>
             <a href="http://www.facebook.com/EdxOnline" class="share"> <img src="${static.url('images/social/facebook-sharing.png')}">

lms/templates/press.json

@@ -1,4 +1,76 @@
 [
+    {
+        "title": "Berkeley to Join the Free Online Learning Partnership EdX",
+        "url": "http://www.nytimes.com/2012/07/24/education/berkeley-to-offer-free-online-classes-on-edx.html?_r=1",
+        "author": "Tamar Lewin",
+        "image": "nyt_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "The New York Times",
+        "publish_date": "July 24, 2012"
+    },
+    {
+        "title": "UC Berkeley to join Harvard and MIT in online course offerings",
+        "url": "http://bostonglobe.com/metro/2012/07/23/university-california-berkeley-join-edx-joint-harvard-mit-venture-offer-online-courses/mKl47LI5BdBX0MMO2RHHwI/story.html",
+        "author": "Melissa M. Werthmann",
+        "image": "bostonglobe_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "The Boston Globe",
+        "publish_date": "July 24, 2012"
+    },
+    {
+        "title": "UC Berkeley to offer free online classes through edX",
+        "url": "http://www.latimes.com/news/local/la-me-0725-berkeley-online-20120725,0,519697.story",
+        "author": "Larry Gordon",
+        "image": "latimes_logo_178x138.jpeg",
+        "deck": "EdX, founded by Harvard and MIT, will host two not-for-credit UC Berkeley courses this fall.",
+        "publication": "Los Angeles Times",
+        "publish_date": "July 2012"
+    },
+    {
+        "title": "Berkeley Joins 'EdX' Effort to Offer Free Open Courses",
+        "url": "http://chronicle.com/blogs/wiredcampus/uc-berkeley-joins-edx-effort-to-offer-free-open-courses/37969",
+        "author": "Jeffrey R. Young",
+        "image": "chroniclehighered_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "The Chronicle of Higher Education",
+        "publish_date": "July 24, 2012"
+    },
+    {
+        "title": "Berkeley Joins Harvard, MIT Offering Free Online Classes",
+        "url": "http://www.bloomberg.com/news/2012-07-24/berkeley-joins-harvard-mit-offering-free-online-classes.html",
+        "author": "Jeanna Smialek",
+        "image": "bloomberg_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "Bloomberg",
+        "publish_date": "July 24, 2012"
+    },
+    {
+        "title": "Free online courses divide UC professors",
+        "url": "http://www.mercurynews.com/education/ci_21144592",
+        "author": "Matt Krupnick",
+        "image": "mercurynews_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "Mercury News",
+        "publish_date": "July 24, 2012"
+    },
+    {
+        "title": "UC Berkeley joins edX",
+        "url": "http://news.harvard.edu/gazette/story/2012/07/uc-berkeley-joins-edx/",
+        "author": "",
+        "image": "harvardgazette_logo_178x138.jpeg",
+        "deck": "UC Berkeley joins Harvard and MIT in not-for-profit online learning collaborative",
+        "publication": "Harvard Gazette",
+        "publish_date": "July 24, 2012"
+    },
+    {
+        "title": "Harvard, Extended",
+        "url": "http://harvardmagazine.com/2012/07/harvard-extended",
+        "author": "John Harvard's Journal",
+        "image": "harvardmagazine_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "The Harvard Crimson",
+        "publish_date": "July-August 2012"
+    },
     {
         "title": "Review: MITx's Online Circuit Design and Analysis Course",
         "url": "http://spectrum.ieee.org/at-work/education/review-mitxs-online-circuit-design-and-analysis-course",
@@ -116,6 +188,33 @@
         "publication": "USA Today",
         "publish_date": "May 15, 2012"
     },
+    {
+        "title": "Harvard and MIT Launch Virtual Learning Initiative EdX",
+        "url": "http://www.thecrimson.com/article/2012/5/2/mit-edx-virtual-online/",
+        "author": "Hana N. Rouse and Justin C. Worland",
+        "image": "harvardcrimson_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "The Harvard Crimson",
+        "publish_date": "May 4, 2012"
+    },
+    {
+        "title": "Educating Harvard, MIT - and the world",
+        "url": "http://news.harvard.edu/gazette/story/2012/05/edx_press_conference/",
+        "author": "",
+        "image": "harvardgazette_logo_178x138.jpeg",
+        "deck": "EdX platform will enhance classroom experience, build on distance learning initiatives, leaders say",
+        "publication": "Harvard Gazette",
+        "publish_date": "May 2, 2012"
+    },
+    {
+        "title": "Remarks by Drew Gilpin Faust at announcement of edX",
+        "url": "http://www.harvard.edu/president/remarks-by-drew-gilpin-faust-announcement-edx",
+        "author": "",
+        "image": "harvarduniv_logo_178x138.jpeg",
+        "deck": "",
+        "publication": "Harvard University",
+        "publish_date": "May 2, 2012"
+    },
     {
         "title": "What is edX?",
         "url": "http://mitne.ws/PgYhya",

lms/templates/static_templates/about.html

@@ -27,7 +27,7 @@
       </div>
       <article>
         <h2>About <span class="edx">edX</span></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 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>
+        <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 with online courses that reflect their disciplinary breadth.  Along with offering online courses, the institutions will use edX to research how students learn and how technology can transform learning&ndash;both on-campus and worldwide. Anant Agarwal, former Director of MIT's Computer Science and Artificial Intelligence Laboratory, serves as the first president of edX. EdX's goals combine the desire to reach out to students of all ages, means, and nations, and to deliver these teachings from a faculty who reflect the diversity of its audience. EdX is based in Cambridge, Massachusetts and is governed by MIT and Harvard.</p>
       </article>
       <hr class="fade-right-hr-divider">
     </section>

lms/templates/static_templates/faq.html

@@ -48,8 +48,8 @@
             <p>EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.</p>
         </article>
         <article class="response">
-            <h3>Will certificates be awarded? </h3>
-            <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX.  For the courses in Fall 2012, those certificates will be free.  There is a plan to charge a modest fee for certificates in the future</p>
+            <h3>Will certificates be awarded?</h3>
+            <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX.  For the courses in Fall 2012, those certificates will be free.  There is a plan to charge a modest fee for certificates in the future.</p>
         </article>
         <article class="response">
             <h3>What will the scope of the online courses be? How many? Which faculty?</h3>

lms/templates/static_templates/jobs.html

@@ -17,7 +17,7 @@
       <h2>Our mission is to transform learning.</h2>
 
       <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>
+        <p>&ldquo;EdX represents a unique opportunity to improve education on our campuses through 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>
 

lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html

@@ -100,7 +100,7 @@
         <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">
+          <a href="http://twitter.com/intent/tweet?text=UC+Berkeley+joins+Harvard+and+MIT+not-for-profit+online+learning+collaborative:+http://www.edx.org/press/uc-berkeley-joins-edx" class="share">
             <img src="${static.url('images/social/twitter-sharing.png')}">
           </a>
         </a>