Merged with default

--HG--
branch : kf-highlight-speed

6002x-faq.html

@@ -26,13 +26,30 @@ someone else already signed up with that username. Try a different,
 more unique username. For example, try adding a random number to the
 end.</p>
 
+<h2> I forgot my password </h2> 
+
+<p> The log-in form will have a link to reset your password once the
+course opens. </p>
+
+<h2> The videos stall out </h2>
+
+<p> You should confirm your internet connection is fast enough to stream
+videos, and that Youtube is not blocked by your internet
+provider. Since the videos are hosted by YouTube, we have no control
+over most technical problems with video playback (aside from those
+related specifically to our player). </p>
+
+<p> You should also confirm you have a current version of Flash installed.
+While our player supports YouTube's HTML5 API (which allows playback without
+Flash), this support is experimental.</p>
+
 <a name="othercourses" ></a>
 <h2> I am interested in a different subject. What other courses do
 you offer? </h2>
 
 <p> 6.002x is the pilot course for MITx. While we plan to offer a
 range of courses in the future, at present, 6.002x is the only course
-available.</p>
+available. Specific future offerings will be announced later. </p>
 
 <a name="start" ></a>
 <h2>How will I know that the course has started?</h2>
@@ -44,10 +61,13 @@ so you can login, begin to get familiar with the site and start the
 course.</p>
 
 <a name="login" ></a>
-<h2> Why is there no log-in button?</h2>
+<h2> I can't log in</h2>
 
 <p> You will not be able to log into the course until either the
-starting date, or shortly before.</p>
+starting date, or shortly before. If you have problems logging in once
+the course has started, please verify that you are using the latest
+version of either Firefox or Google Chrome, and have JavaScript and
+cookies enabled. </p>
 
 <a name="schedule" ></a>
 <h2> Does the class have a schedule?</h2>
@@ -64,7 +84,8 @@ of acknowledgement that I have enrolled.</h2>
 most common issues are:
 <ul>
 <li> Typo in e-mail address
-<li> Old browser. We recommend trying a modern version of Firefox or Chrome
+<li> Old browser. We recommend downloading the current version of
+Firefox or Chrome. The course requires a modern browser. 
 <li> JavaScript disabled
 <li> Activation e-mail in spam folder. Check spam folder.
 <li> Non-unique username. Try adding a random string at the end.
@@ -284,10 +305,11 @@ What is a credential?
 <p>
 Any learner who successfully completes 6.002x will receive an
 electronic certificate indicating a grade. This certificate will
-indicate that you earned it from <i>MITx</i>&rsquo;s pilot course. In this
-prototype version, <i>MITx</i> will not require that you be tested in a
-testing center or otherwise have your identity certified in order to
-receive this certificate.
+indicate that you earned it from <i>MITx</i>&rsquo;s pilot course. In
+this prototype version, <i>MITx</i> will not require that you be
+tested in a testing center or otherwise have your identity certified
+in order to receive this certificate. MITx certificates are not
+planned to count towards MIT course credit.
 </p>
 
 <a name="whograding" ></a>

emails/welcome_body.txt

+MITx's prototype offering, 6.002x, is now open. To log in, visit
+
+ https://6002x.mitx.mit.edu
+
+where you will find a login button at the top right-hand corner of the
+window.
+
+Please make sure you're using the latest version of Google Chrome or
+Firefox. If you've forgotten your password, the log-in form has a
+place to reset it.
+
+Once you log in, we recommend that you start the course by reviewing
+the "System Usage Sequence" in the Overview section, and the "6.002x
+At-a-Glance (Calendar)" handout under the Course Info tab. After you
+familiarize yourself with the various features of the MITx platform,
+you can jump right into the coursework by working on "Administrivia
+and Circuit Elements", the first Lecture Sequence in Week 1.
+
+Thanks for joining us for the ride!
+
+The 6.002x team
+
+(Please note that this e-mail address does not receive e-mails --
+if you need assistance, please use the help section of the web
+site)

emails/welcome_subject.txt

+Welcome to 6.002x!

help.html

@@ -9,7 +9,14 @@
     <h2>Self-help</h2>
 
     <ul>
-      <li>Ask on the <a href="/discussion">discussion forums</a></li>
+      <li>Read
+      the <a href="http://mitx.mit.edu/6002x-faq.html">FAQ</a>
+      carefully</li>
+      <li>Check the <a href="/info">course updates</a> -- we will
+      announce major errors and issues there </li>
+      <li>Check whether the issues has been asked on
+      the <a href="/discussion">discussion forums</a>, and if not,
+      ask</li>
       <li>Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]</li>
       <li>Check the <a href="/info">course handouts.</a></li>
     </ul>
@@ -31,7 +38,12 @@
         <dd><a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></dd>
       </dl>
 
-      <p> Please bear in mind that while we read them, we do not expect to
-        have time to respond to all e-mails.</p>
+      <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>
     </section>
 </section>

info.html

@@ -5,10 +5,10 @@
 <section class="main-content">
   <div class="info-wrapper">
     <section class="updates">
-      <%include file="info_files/updates.html" />
+      <%include file="updates.html" />
     </section>
     <section class="handouts">
-      <%include file="info_files/handouts.html" />
+      <%include file="handouts.html" />
     </section>
   </div>
 </section>

info_files

-../data/info/
\ No newline at end of file

marketing.html

@@ -134,7 +134,7 @@ $(document).ready(function(){
       submit_data,
       function(json) {
         if(json.success) {
-          location.href="/courseware";
+          location.href="/info";
         } else if($('#login_error').length == 0) {
         $('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>');
         } else {

mitx_help.html

@@ -11,7 +11,7 @@
       reach us at:</p>
       <dl>
         <dt>System-related questions</dt>
-        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
+        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a>  -- For technical questions, please make sure you are using a current 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. </dd>
         <dt>Content-related questions</dt>
         <dd><a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></dd>
         <dt>Bug reports</dt>

sass/discussion/_forms.scss

@@ -86,8 +86,21 @@ form.answer-form {
       font-size: 14px;
     }
 
+    blockquote {
+      margin-left: 2.5%;
+      padding-left: 1.5%;
+      border-left: 1px dashed #ddd;
+      color: $mit-red;;
+    }
+
+    ul, ol, pre {
+      margin-left: 3%;
+      margin-bottom: 20px;
+    }
+
+
     pre {
-      background-color: #E7F1F8;
+      background-color: #eee;
     }
 
     blockquote {

sass/discussion/_question-view.scss

@@ -101,8 +101,20 @@ div.question-header {
         margin-right: flex-gutter(8);
         width: flex-grid(6.2,8);
 
+      blockquote {
+        margin-left: 2.5%;
+        padding-left: 1.5%;
+        border-left: 1px dashed #ddd;
+        color: $mit-red;;
+      }
+
+      ul, ol, pre {
+        margin-left: 6%;
+        margin-bottom: 20px;
+      }
     }
 
+
       div.post-update-container {
         display: inline-block;
         float: left;

sass/discussion/_questions.scss

@@ -136,6 +136,7 @@ ul.question-list, div#question-list {
         h2 {
           font-size: 16px;
           font-weight: bold;
+          letter-spacing: 0;
           margin: 0px 0 15px 0;
           text-transform: none;
         }
@@ -144,6 +145,7 @@ ul.question-list, div#question-list {
           color: #777;
         }
 
+
         div.user-info {
           display: inline-block;
           vertical-align: top;

simplewiki_create.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Create Article - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Create Article - MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
 <h1>Create article</h1>

simplewiki_edit.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
 <h1>${ wiki_article.title }</h1>

simplewiki_error.html

@@ -6,7 +6,7 @@
     from django.core.urlresolvers import reverse
 %>
 
-<%block name="title"><title>Oops... - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Oops... - MITx 6.002x Wiki</title></%block>
 
 
 <%block name="wiki_page_title">

simplewiki_history.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse

simplewiki_searchresults.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Search Results - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Search Results - MITx 6.002x Wiki</title></%block>
 
 <%!
 from django.core.urlresolvers import reverse

simplewiki_view.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
   <h1>${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}</h1>

video_init.js

@@ -5,7 +5,7 @@ var atts = { id: "myytplayer" };
 // If the user doesn't have flash, use the HTML5 Video instead. YouTube's
 // iFrame API which supports HTML5 is still developmental so it is not default
 if (swfobject.hasFlashPlayerVersion("10.1")){
-  swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
+  swfobject.embedSWF(document.location.protocol +  "//www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
         "ytapiplayer", "640", "385", "8", null, null, params, atts);
 } else {
 
@@ -14,7 +14,7 @@ if (swfobject.hasFlashPlayerVersion("10.1")){
   $("#html5_player").show();
 
   var tag = document.createElement('script');
-  tag.src = "http://www.youtube.com/player_api";
+  tag.src = document.location.protocol +  "//www.youtube.com/player_api";
   var firstScriptTag = document.getElementsByTagName('script')[0];
   firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
   // Make sure the callback is called once API ready, YT seems to be buggy