Merge pull request #227 from MITx/mm-copy

Mm copy

lms/static/sass/_jobs.scss

 .container.jobs {
   padding: 60px 0 120px;
 
+  q {
+    display: block;
+    margin: 10px 0;
+    font-style: italic;
+    text-align: justify;
+  }
+
+  small.author {
+    text-align: right;
+    display: block;
+    color: rgb(100, 100, 100);
+  }
+
   h1 + hr {
     margin-bottom: 80px;
   }

lms/templates/contact.html

@@ -25,7 +25,7 @@
       <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>
 
       <h2>Media</h2>
-      <p>Please visit our <a href="${reverse('faq_edx')}">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>
+      <p>Please visit our <a href="${reverse('faq_edx')}">media/press page</a> for more information. 
For any media or press inquiries, 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>

lms/templates/footer.html

@@ -8,7 +8,7 @@
         <a href="${reverse('root')}" class="logo"></a>
         <a href="${reverse('courses')}">Find Courses</a>
         <a href="${reverse('about_edx')}">About</a>
-        <a href="#">Blog</a>
+        <a href="http://edxonline.tumblr.com/">Blog</a>
         <a href="${reverse('jobs')}">Jobs</a>
         <a href="${reverse('contact')}">Contact</a>
       </section>

lms/templates/navigation.html

@@ -35,7 +35,7 @@
     <ol class="guest">
       <li class="secondary">
         <a href="${reverse('about_edx')}">About</a>
-        <a href="#">Blog</a>
+        <a href="http://edxonline.tumblr.com/">Blog</a>
         <a href="${reverse('jobs')}">Jobs</a>
         <a href="#login-modal" id="login" rel="leanModal">Log In</a>
       </li>

lms/templates/static_templates/about.html

@@ -25,7 +25,7 @@
       </div>
       <article>
         <h2>About edX</h2>
-        <p>EdX is a joint partnership between The Massachusetts Institute of Technology (MIT) and Harvard University to offer online learning to millions of people around the world. EdX offers Harvard and MIT classes online for free. Through this partnership, with other partners to follow, the institutions aim to extend their collective reach to build a global community of online students</p>
+        <p>EdX is a joint partnership between the Massachusetts Institute of Technology (MIT) and Harvard University to offer online learning to millions of people around the world. EdX offers Harvard and MIT classes online for free. Through this partnership, with other partners to follow, the institutions aim to extend their collective reach to build a global community of online students</p>
         <p>MIT’s Director of the Computer Science and Artificial Intelligence Laboratory Anant Agarwal serves as the first president of edX, and Harvard’s Faculty of Arts and Sciences Dean Michael D. Smith leads faculty in developing courses. Along with offering online courses, the institutions will use edX to research how students learn and how technology can facilitate teaching—both on-campus and online.</p>
         <p>EdX is based on an open-source technological platform that provides interactive educational materials designed specifically for the web, and is available to anyone in the world with an internet connection.</p>
         <p>EdX is a Cambridge-based not-for-profit, equally owned and funded by Harvard and MIT.</p>

lms/templates/static_templates/contact.html

@@ -16,25 +16,17 @@
       <img src="${static.url('images/edx-location.png')}">
     </div>
     <div class="contacts">
-      <h2>Email Contacts</h2>
-      <ul>
-        <li><p>System-related questions: <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></p></li>
-        <li><p>Content-related questions: <a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></p></li>
-        <li><p>Bug reports: <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a></p></li>
-        <li><p>Suggestions: <a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></p></li>
-      </ul>
-
       <h2>Class Feedback</h2>
       <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 class.</p>
 
-      <h2>General Inqueries and Feedback</h2>
+      <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>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
 
-      <h2>Technical Inqueries and Feedback</h2>
+      <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>
 
       <h2>Media</h2>
-      <p>Please visit our <a href="${reverse('faq_edx')}">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>
+      <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>

lms/templates/static_templates/help.html

@@ -24,10 +24,10 @@
     <p> If you can't solve your problems with self-help, we have several e-mail addresses set up:</p>
 
     <ul>
-      <li><p>System-related questions: <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></p></li>
-      <li><p>Content-related questions: <a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></p></li>
-      <li><p>Bug reports: <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a></p></li>
-      <li><p>Suggestions: <a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></p></li>
+      <li><p>System-related questions: <a href="mailto:technical@edx.org">technical@edx.org</a></p></li>
+      <li><p>Content-related questions: <a href="mailto:content@edx.org">content@edx.org</a></p></li>
+      <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>
 
     <p>Please bear in mind that while we read them, we do not expect to have time to respond to all e-mails. For technical questions, please make sure you are using the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome/">Chrome</a>, and include browser and version in your e-mail, as well as screenshots or other pertinent details.</p>

lms/templates/static_templates/jobs.html

@@ -3,17 +3,22 @@
 <%inherit file="../main.html" />
 
 <section class="container jobs">
-  <h1>Want to change the future of education?</h1>
+  <h1>Do You Want to Change the Future of Education?</h1>
   <hr class="horizontal-divider">
 
   <section class="message">
     <div class="inner-wrapper">
       <div class="photo">
-        <img src="${static.url('images/courses/space2.jpg')}">
+        <img src="${static.url('images/jobs.jpeg')}">
       </div>
-      <h2>Our Mission is to Educate 1 billion people around the world</h2>
-      <p>“EdX represents a unique opportunity to improve education on our own campuses through online learning, while simultaneously creating a bold new educational path for millions of learners worldwide,” MIT President Susan Hockfield said.</p>
-      <p>Harvard President Drew Faust said, “edX gives Harvard and MIT an unprecedented opportunity to dramatically extend our collective reach by conducting groundbreaking research into effective education and by extending online access to quality higher education.”
+      <h2>Our mission is to transform learning.</h2>
+      <h2>Our goal is to educate 1 billion people around the world.</h2>
+
+      <q>“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.” </q>
+      <small class="author">Rafael Reif, MIT President </small>
+
+      <q>“EdX gives Harvard and MIT an unprecedented opportunity to dramatically extend our collective reach by conducting groundbreaking research into effective education and by extending online access  to quality higher education.”</q>
+      <small class="author">Drew Faust, Harvard President</small>
     </div>
   </section>
   <hr class="horizontal-divider">
@@ -25,16 +30,16 @@
       <article id="technology-team" class="job">
         <div class="inner-wrapper">
           <h3>Technology Team</h3>
-          <p>[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 and did startups after finishing their Ph.D. We should find a way to make some positions that parallel fellows, and can leverage MIT/Harvard prestige]</p>
-          <p>If you're interested in this position, send an e-mail to <a href="">content-engineer@edx.org</a></p>
+          <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>
         </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 on-line courses. </p>
-          <p>If you're interested in this position, send an e-mail to <a href="">fellow-jobs@edx.org</a></p>
+          <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>
 
@@ -54,7 +59,7 @@
             </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="">content-engineer@edx.org</a></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>
         </div>
       </article>
     </section>