Merge with head

marketing.html

@@ -5,6 +5,9 @@
 
   <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
   <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
+  <!--[if lt IE 8]>
+  <link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" />
+  <![endif]-->
 
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
@@ -72,8 +75,8 @@ function postJSON(url, data, callback) {
 
     <%block name="header_text">
       <section>
-        <h1>MITx</h1>
-        <h2>An MIT Education Anywhere. For free.</h2>
+        <h1><em>MITx</em></h1>
+        <h2>MIT&rsquo;s new online learning initiative</h2>
       </section>
      </%block>
     </div>

mitx_global.html

@@ -4,21 +4,20 @@
 
 <section class="index-content">
   <section class="about">
-    <h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1>
 
     <section class="intro">
-      <p>This learning platform will enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences. It will also be host to a virtual community of learners around the world.</p>
-      <p>The first course offered by <em>MITx</em> in an experimental prototype form is 6.002x Circuits and Electronics. Watch this space for the next set of courses that will become available in Fall 2012.</p>
+      <p><em>MITx</em>  will offer a portfolio of MIT courses for free to a virtual community of learners around the world. It will also enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences.</p>
+      <p>The first <em>MITx</em> course, 6.002x (Circuits and Electronics), will be launched in an experimental prototype form. Watch this space for further upcoming courses, which will become available in Fall 2012.</p>
     </section>
 
     <section class="features">
-      <h2>It will offer a portfolio of MIT courses for free on an online learning platform that:</h2>
+      <h2><em>MIT<span>x</span></em> courses will be offered on an online learning platform that:</h2>
 
       <ul>
-        <li>organizes and presents course material to enable students to learn at their own pace</li>
-        <li>features interactivity, online laboratories and student-to-student communication</li>
-        <li>allows for the individual assessment of any student&rsquo;s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by <em>MITx</em></li>
-        <li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions.</li>
+        <li>organizes and presents course material to enable students to learn worldwide</li>
+        <li>features interactive instruction, online laboratories and student-to-student and student-to-professor communication</li>
+        <li>allows for the individual assessment of any student&rsquo;s work and allows students who demonstrate their mastery of subjects to earn certificates awarded by <em>MITx</em></li>
+        <li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions, such as universities and K-12 school systems.</li>
       </ul>
 
       <p><strong>Press &amp; links:</strong> <a href="http://www.boston.com/news/local/massachusetts/articles/2011/12/19/mit_to_launch_online_only_graded_courses_free_to_all/?page=full" target="_blank">Boston Globe</a>, <a href="http://www.nytimes.com/2011/12/19/education/mit-expands-free-online-courses-offering-certificates.html?_r=3&hpw=" target="_blank">New York Times</a>,  <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html" target="_blank">MIT Press Release</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219" target="_blank"><em>MITx</em> FAQ</a></p>
@@ -36,7 +35,7 @@
       <a href="http://6002x.mitx.mit.edu/" class="more-info">More information <span>&amp;</span> Enroll</a>
     </p>
 
-    <p>Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002 Circuits and Electronics&rdwuo; is an on-line adaption of MIT's first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
+    <p>Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT&rsquo;s first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
   </section>
 </section>
 <script>

sass/_courseware-video.scss

@@ -62,7 +62,7 @@ section.course-content {
         background: #c2c2c2;
         border: none;
         border-bottom: 1px solid #000;
-        height: 22px;
+        height: 20px;
 
         a.ui-slider-handle {
           @include border-radius(0);
@@ -71,10 +71,10 @@ section.course-content {
           border-right: 1px solid darken($mit-red, 20%);
           border-left: 1px solid darken($mit-red, 20%);
           cursor: pointer;
-          height: 22px;
+          height: 20px;
           margin: 0;
           top: 0;
-          width: 22px;
+          width: 20px;
         }
       }
 
@@ -146,6 +146,7 @@ section.course-content {
   ol.subtitles {
     float: left;
     width: flex-grid(3, 9);
+    min-height: 570px;
 
     li {
       margin-bottom: 0px;

sass/_index.scss

@@ -247,6 +247,10 @@ section.index-content {
             letter-spacing: 1px;
             color: #666;
             margin-bottom: lh();
+
+            span {
+              text-transform: none;
+            }
           }
 
           p {
@@ -354,7 +358,7 @@ section.index-content {
 
         &.requirements {
           clear: both;
-          width: auto;
+          width: 100%;
           border-top: 1px solid #E5E5E5;
           padding-top: lh();
           margin-bottom: 0;

sass/_wiki-create.scss

@@ -21,7 +21,13 @@ form#wiki_revision {
   }
 
   #submit_delete {
+    @include box-shadow(none);
+    background: none;
+    border: none;
+    color: #999;
     float: right;
+    text-decoration: underline;
+    font-weight: normal;
   }
   
   input[type="submit"] {
@@ -32,18 +38,25 @@ form#wiki_revision {
 #wiki_edit_instructions {
   float: left;
   width: flex-grid(3, 9);
+  margin-top: lh();
+  color: #666;
 
-  .markdown-example {
-    background-color: $light-gray;
-    padding-top: 5px;
-    padding-right: 2px;
-    padding-bottom: 5px;
-    padding-left: 5px;
+  &:hover {
+    color: #333;
+  }
 
-    margin-top: 5px;
-    margin-bottom: 7px;
-    margin-left: 5px;
+  .markdown-example {
+    background-color: #e3e3e3;
+    text-shadow: 0 1px 0 #fff;
+
+    padding: {
+      top: 5px;
+      right: 2px;
+      bottom: 5px;
+      left: 5px;
+    }
 
+    margin: 5px 0 7px;
     line-height: 1.0;
   }
 }

sass/marketing-ie.scss

+body {
+  margin: 0;
+  padding: 0;
+}
+
+.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
+  margin: 0;
+  overflow: hidden;
+}

simplewiki_edit.html

@@ -12,7 +12,7 @@ ${ wiki_article.title }
       <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
   </div>
   ${wiki_form}
-  <input type="submit" id="submit_edit" name="edit" value="Edit article" />
+  <input type="submit" id="submit_edit" name="edit" value="Save Changes" />
   <input type="submit" id="submit_delete" name="delete" value="Delete article" />
 </form>
 

video.html

@@ -16,7 +16,7 @@
         <li><a class="pause" onclick="pause();">Pause</a></li>
       </ul>
 
-      <div id="vidtime">0:00 / 0:00</div>
+      <div id="vidtime">0:00/0:00</div>
 
       <div class="speeds">
         Speed: <div id="video_speeds"></div>