Merge

2012-02-22 11:45:07 -05:00
parent 5f260759f0 418243971c
commit a9fbf270a2
16 changed files with 184 additions and 31 deletions
--- a/6002x-faq.html
+++ b/6002x-faq.html
@@ -26,6 +26,7 @@ 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>

+<a name="othercourses">
 <h2> I am interested in a different subject. What other courses do
 you offer? </h2>

@@ -33,6 +34,7 @@ you offer? </h2>
 range of courses in the future, at present, 6.002x is the only course
 available.</p>

+<a name="start">
 <h2>How will I know that the course has started?</h2>

 <p> The course will start on March 5. Check the website
@@ -41,17 +43,20 @@ the course website 6.002x.mitx.mit.edu on or slightly before March 5
 so you can login, begin to get familiar with the site and start the
 course.</p>

+<a name="login">
 <h2> Why is there no log-in button?</h2>

 <p> You will not be able to log into the course until either the
 starting date, or shortly before.</p>

+<a name="schedule">
 <h2> Does the class have a schedule?</h2>

 <p> The lectures are on-line videos, and may be watched at your own
 pace and schedule. The course will have fixed deadlines for homework
 assignments and exams. </p>

+<a name="enrollissues">
 <h2> I just enrolled for the course. I have not received any form
 of acknowledgement that I have enrolled.</h2>

@@ -69,11 +74,13 @@ most common issues are:
 to do anything about the old account, if any. If it is not activated
 through the link in the e-mail, it will disappear later.

+<a name="howdropcourse">
 <h2> How do I drop the course?</h2>

 <p> You do not have to do anything. You can simply stop working on the
 course at any time you choose to do so.</p>

+<a name="ifdropcourse">
 <h2>What happens if I drop the course?</h2>

 <p> For the prototype course, learners achieving grades of "A," "B,"
@@ -85,6 +92,7 @@ will be disclosed outside of MITx.  You can also choose to opt for a
 no record at any time.  However, the posts you make while enrolled in
 the class will remain visible. </p>

+<a name="whatismitx">
 <h2>
 What is <i>MITx</i>?</h2>

@@ -113,6 +121,7 @@ education. The launch of <i>MITx</i> represents a next step forward in that
 effort.
 </p>

+<a name="differentcampus">
 <h2>
 What is 6.002x, and how is it different from the on-campus version of
 6.002?
@@ -142,6 +151,7 @@ version of 6.002.
 professors Anant Agarwal and Jeffrey H. Lang for 6.002.
 </p>

+<a name="howenroll">
 <h2>
 How do I enroll in 6.002x?
 </h2>
@@ -150,6 +160,7 @@ To enroll, visit <a href="http://mitx.mit.edu">http://mitx.mit.edu</a>
 and sign up.
 </p>

+<a name="whenavailable">
 <h2>
 When will the course be available online?
 </h2>
@@ -158,6 +169,7 @@ When will the course be available online?
 6.002x will become available online on Monday, March 5.
 </p>

+<a name="timeline">
 <h2>
 Do I need to follow a set timeline in completing 6.002x?
 </h2>
@@ -169,6 +181,7 @@ final exam will be given within a specific range of days. However,
 faster-paced learners can proceed multiple weeks ahead if they choose.
 </p>

+<a name="workrequired">
 <h2>
 How much time is required to complete the course?
 </h2>
@@ -178,6 +191,7 @@ course. However, the time taken by individual students might vary
 considerably depending on background and skill.
 </p>

+<a name="instructors">
 <h2>
 Who are the instructors for 6.002x?
 </h2>
@@ -187,6 +201,7 @@ Gerald Sussman and Piotr Mitros. The team also includes several
 teaching assistants (TAs).
 </p>

+<a name="worklike">
 <h2>
 What is the work like in 6.002x?
 </h2>
@@ -208,6 +223,7 @@ videos. Lab and homework exercises will round out the week. Tutorials
 are also provided as additional reference material.
 </p>

+<a name="questionsduringcourse">
 <h2>
 What if I have a question during the course?
 </h2>
@@ -218,6 +234,7 @@ documents, FAQs, tutorials and videos on using the various components
 of the course will also be provided.
 </p>

+<a name="collaboration">
 <h2>
 Will 6.002x offer any means for collaboration among online learners?
 </h2>
@@ -226,6 +243,7 @@ Yes. 6.002x will offer modest support for collaborative work through a
 prototype wiki and discussion forum.
 </p>

+<a name="prereqs">
 <h2>
 Are there prerequisites to take the course?
 </h2>
@@ -248,6 +266,7 @@ remedial differential equations component for students with weaker
 math backgrounds.
 </p>

+<a name="cost">
 <h2>
 How much does the course cost?
 </h2>
@@ -255,9 +274,10 @@ How much does the course cost?
 All of the courses on <i>MITx</i> will be free of charge. Those who have the
 ability and motivation to demonstrate mastery of content can receive a
 credential for a modest fee. For this prototype course, the fee for a
-credential will be waived.
+credential will be waived. 
 </p>

+<a name="credential">
 <h2>
 What is a credential?
 </h2>
@@ -270,6 +290,7 @@ testing center or otherwise have your identity certified in order to
 receive this certificate.
 </p>

+<a name="whograding">
 <h2>
 Who is grading the course?
 </h2>
@@ -278,6 +299,7 @@ Who is grading the course?
 including practice exercises, homework assignments, labs and exams.
 </p>

+<a name="whatpassing">
 <h2>
 What is a passing grade?
 </h2>
@@ -288,6 +310,7 @@ affecting a student&rsquo;s grade and the grade thresholds will be
 posted on the course website when the course comes online.
 </p>

+<a name="textbook">
 <h2>
 Do I need to buy a textbook? 
 </h2>
@@ -299,23 +322,28 @@ provided electronically as part of the online course. While the
 textbook is recommended, it is not required. The electronic text is
 provided for personal use in connection with this course only. The
 copyright for the book is owned by Elsevier. The book can be purchased
-on Amazon.
+on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim/mitopencourse-20" target="_blank">Amazon</a>.
 </p>

+<a name="technicalrequirements">
 <h2>
 Do I need to have special software to access 6.002x?
 </h2>
 <p>
 No, you do not need special software to access 6.002x, as you will
 access the online interactive course through your browser. The course
-website was developed and tested primarily with Google Chrome. We
-support current versions of Mozilla Firefox as well. The video player
-is designed to work with Flash. While we provide a partial non-Flash
-fallback for the video, as well as partial support for Internet
-Explorer, other browsers and tablets, portions of the functionality
-will be unavailable.
+website was developed and tested primarily with the current version of
+Google Chrome. We support current versions of Mozilla Firefox as
+well. The video player is based on Youtube, and is designed to work
+with Flash. We provide a partial non-Flash fallback for the video, but
+this uses Google's experimental HTML5 API, and hence we cannot
+guarantee those will continue to function for the duration of the
+semester. We provide partial support for Internet Explorer, as well as
+other browsers and tablets, but portions of the functionality will be
+unavailable.
 </p>

+<a name="futurecourses">
 <h2>
 When will the next courses become available and what topics will they be on?
 </h2>
--- a/courseware.html
+++ b/courseware.html
@@ -1,6 +1,6 @@
 <%inherit file="main.html" />

-<%block name="headextra">
+<%block name="js_extra">
 <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
 <script type="text/javascript">
  $(function() {
--- a/main.html
+++ b/main.html
@@ -5,7 +5,6 @@

  <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
  <link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
-  <link href="/static/css/print.css" rel="stylesheet" type="text/css" media="print"/>

  <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>
@@ -28,11 +27,6 @@
  </script>
  <script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>

-  <script type="text/javascript">
-    $(function(){
-      $("a[rel*=leanModal]").leanModal();
-    });
-  </script>
 <%block name="headextra"/>

 </head>
@@ -117,6 +111,12 @@ $(function() {
    });
 </script>

+  <script type="text/javascript">
+    $(function(){
+      $("a[rel*=leanModal]").leanModal();
+    });
+  </script>
+
 <%block name="js_extra"/>

 </body>
--- a/marketing.html
+++ b/marketing.html
@@ -27,11 +27,6 @@
  <script src="/static/js/html5shiv.js"></script>
  <![endif]-->

-  <script type="text/javascript">
-    $(function(){
-      $("a[rel*=leanModal]").leanModal();
-    });
-  </script>

 <%block name="headextra"/>

@@ -156,7 +151,20 @@ $(document).ready(function(){
  });

 });
+
+$(function(){
+    $("a[rel*=leanModal]").leanModal();
+
+    $("a.login").click(function(){
+      $("#login_form #li_email").focus();
+      });
+
+    $("a.enroll").click(function(){
+      $("#enroll_form #ca_email").focus();
+      });
+    });
 </script>

+<%block name="js_extra"/>
 </body>
 </html>
--- a/mitx_global.html
+++ b/mitx_global.html
@@ -51,6 +51,8 @@
  <iframe id="player" type="text/html" width="560" height="390" src="http://www.youtube.com/embed/p2Q6BrNhdh8?enablejsapi=1" frameborder="0">
  </iframe>
 </div>
+
+<%block name="js_extra">
 <script>

 var player;
@@ -113,3 +115,4 @@ $(function() {
 });

 </script>
+</%block>
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -7,7 +7,7 @@
@import "jquery-ui-1.8.16.custom";

 // pages
-@import "courseware/courseware", "courseware/sidebar", "courseware/video", "courseware/sequence-nav";
+@import "courseware/courseware", "courseware/sidebar", "courseware/video", "courseware/sequence-nav", "courseware/amplifier";
@import "textbook";
@import "info";
@import "profile";
--- a/sass/base/_extends.scss
+++ b/sass/base/_extends.scss
@@ -53,6 +53,10 @@ h1.top-header {
  padding: lh();
  vertical-align: top;
  width: flex-grid(9) + flex-gutter();
+
+  @media print {
+    @include box-shadow(none);
+  }
 }

 .sidebar {
@@ -80,6 +84,10 @@ h1.top-header {
    border-bottom: 1px solid #d3d3d3;
  }

+  @media print {
+    display: none;
+  }
+
  h3 {
    border: none;
    border-bottom: 1px solid #d3d3d3;
@@ -165,6 +173,10 @@ h1.top-header {
  margin: (-$body-line-height) (-$body-line-height) $body-line-height;
  text-shadow: 0 1px 0 #fff;

+  @media print {
+    display: none;
+  }
+
  a {
    color: darken(#F6EFD4, 80%);

--- a/sass/courseware/_amplifier.scss
+++ b/sass/courseware/_amplifier.scss
@@ -0,0 +1,73 @@
+// JM MOSFET AMPLIFIER
+div#graph-container {
+  @extend .clearfix;
+
+  canvas#graph {
+    background-color: rgb(60, 60, 100);
+    width: flex-grid(4.5, 9);
+    float: left;
+    margin-right: flex-gutter(9); 
+  }
+
+  div.graph-controls {
+    width: flex-grid(4.5, 9);
+    float: left;
+
+    select#musicTypeSelect {
+      display: block;
+      margin-bottom: lh(2);
+    }
+
+    div#graph-output {
+      display: block;
+      margin-bottom: lh(2);
+    }
+
+    div#graph-listen {
+      display: block;
+      margin-bottom: lh(2);
+    }
+
+    p {
+      margin-bottom: lh(1);
+    }
+
+    div#label {
+      display: inline-block;
+    }
+
+    input#playButton {
+      display: block;
+    }
+  }
+}
+
+div#schematic-container {
+  @extend .clearfix;
+
+  canvas {
+    background-color: rgb(60, 60, 100);
+    width: flex-grid(4.5, 9);
+    float: left;
+    margin-right: flex-gutter(9); 
+  }
+
+  div.schematic-sliders {
+    width: flex-grid(4.5, 9);
+    float: left;
+
+    div.slider-label#vs {
+      margin-top: lh(2.0);
+    }
+
+    div.slider-label {
+      margin-bottom: lh(0.5);
+    }
+
+    div.slider {
+      margin-bottom: lh(1);
+    }
+  }
+}
+//End JM MOSFET AMPLIFIER
+
--- a/sass/courseware/_courseware.scss
+++ b/sass/courseware/_courseware.scss
@@ -46,6 +46,12 @@ div.course-wrapper {
          width: auto;
          border-right: 0;
        }
+
+        @media print {
+          display: block;
+          width: auto;
+          border-right: 0;
+        }
      }

      section.problem {
@@ -59,6 +65,16 @@ div.course-wrapper {
          padding: 0;
        }

+        @media print {
+          display: block;
+          width: auto;
+          padding: 0;
+
+          canvas, img {
+            page-break-inside: avoid;
+          }
+        }
+
        span {
          &.unanswered, &.ui-icon-bullet {
            @include inline-block();
--- a/sass/layout/_footer.scss
+++ b/sass/layout/_footer.scss
@@ -6,6 +6,10 @@ footer {
  margin-top: $body-line-height;
  padding: 0 $body-line-height;

+  @media print {
+    display: none;
+  }
+
  p {
    float: left;

--- a/sass/layout/_header.scss
+++ b/sass/layout/_header.scss
@@ -3,6 +3,10 @@ div.header-wrapper {
  border-bottom: 1px solid #fff;
  @include box-shadow(inset 0 -4px 6px darken($mit-red, 5%));

+  @media print {
+    display: none;
+  }
+
  header {
    @extend .clearfix;
    @extend .wrapper;
--- a/sass/layout/_layout.scss
+++ b/sass/layout/_layout.scss
@@ -19,6 +19,11 @@ html {
      margin-top: 3px;
      overflow: hidden;

+      @media print {
+        border-bottom: 0;
+        @include border-radius(none);
+      }
+
      @media screen and (min-width: 1400px) {
        @include border-radius(4px);
        margin-top: lh(.5);
--- a/sass/layout/_leanmodal.scss
+++ b/sass/layout/_leanmodal.scss
@@ -53,6 +53,7 @@ div.leanModal_box {

    ol {
      @extend .clearfix;
+      padding-top: lh();

      li {

--- a/sass/print.scss
+++ b/sass/print.scss
@@ -1,6 +1 @@
-.header-wrapper  {display:none;}
-#accordion  {display:none;}
-.ui-accordion  {display:none;
-visibility:hidden;
-width:0%;
-}
+
--- a/seq_module.js
+++ b/seq_module.js
@@ -2,27 +2,29 @@

 var ${ id }contents=["",
 %for t in items:
- ${t[1]['content']} , 
+ ${t['content']} , 
 %endfor
 ""
       ];

 var ${ id }types=["",
 %for t in items:
- "${t[1]['type']}" , 
+ "${t['type']}" , 
 %endfor
 ""
       ];

 var ${ id }init_functions=["",
 %for t in items:
-	       function(){ ${t[1]['init_js']} }, 
+	       function(){ ${t['init_js']} }, 
 %endfor
 	       ""];

+var ${ id }titles=${titles};
+
 var ${ id }destroy_functions=["",
 %for t in items:
-	       function(){ ${t[1]['destroy_js']} }, 
+	       function(){ ${t['destroy_js']} }, 
 %endfor
 	       ""];

@@ -52,6 +54,7 @@ function ${ id }goto(i) {
 function ${ id }setup_click(i) {
        $('#tt_'+i).click(function(eo) { ${ id }goto(i);});
 	$('#tt_'+i).addClass("seq_"+${ id }types[i]+"_inactive");
+	$('#tt_'+i).attr("title", ${ id }titles[i-1]);

 }

--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -71,6 +71,7 @@
 </%block>

 <%block name="bodyextra">
+
 <%include file="navigation.html" args="active_page='wiki'" />

 <section class="main-content">