Merge

2012-02-22 14:59:14 -05:00
parent 5c9b67df8b a9fbf270a2
commit b26205502e
16 changed files with 143 additions and 19 deletions
--- 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/discussion/_modals.scss
+++ b/sass/discussion/_modals.scss
@@ -10,6 +10,7 @@
  padding-bottom: 10px;
  position: absolute;
  text-align: center;
+  z-index: 1;

  h3 {
    background: $mit-red;
--- a/sass/discussion/_question-view.scss
+++ b/sass/discussion/_question-view.scss
@@ -181,6 +181,7 @@ div.question-header {
          aside.comment-controls {
            background: none;
            border: none;
+            @include box-shadow(none);
            display: inline-block;
            margin-top: -8px;
            padding:0 2% 0 0;
--- 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/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">