Merged in static default

--HG--
branch : static-close_sidebar

css/marketing.css

@@ -129,7 +129,7 @@ input, select {
   font-weight: 800;
   font-style: italic; }
 
-.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
+.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, footer, section.index-content {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
@@ -165,7 +165,7 @@ input, select {
     .subpage > div dl dd, section.copyright > div dl dd, section.tos > div dl dd, section.privacy-policy > div dl dd, section.honor-code > div dl dd {
       margin-bottom: 12.944px; }
 
-.clearfix:after, .subpage:after, section.copyright:after, section.tos:after, section.privacy-policy:after, section.honor-code:after, header.announcement div section:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, footer:after, div.leanModal_box#enroll ol:after {
+.clearfix:after, .subpage:after, section.copyright:after, section.tos:after, section.privacy-policy:after, section.honor-code:after, header.announcement div section:after, footer:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, div.leanModal_box#enroll ol:after {
   content: ".";
   display: block;
   height: 0;
@@ -392,12 +392,73 @@ header.announcement {
         line-height: 25.888px;
         float: left; }
 
+footer {
+  padding-top: 0; }
+  footer div.footer-wrapper {
+    border-top: 1px solid #e5e5e5;
+    padding: 25.888px 0;
+    background: url("/static/images/marketing/mit-logo.png") right center no-repeat; }
+    footer div.footer-wrapper a {
+      color: #888;
+      text-decoration: none;
+      -webkit-transition-property: all;
+      -moz-transition-property: all;
+      -ms-transition-property: all;
+      -o-transition-property: all;
+      transition-property: all;
+      -webkit-transition-duration: 0.15s;
+      -moz-transition-duration: 0.15s;
+      -ms-transition-duration: 0.15s;
+      -o-transition-duration: 0.15s;
+      transition-duration: 0.15s;
+      -webkit-transition-timing-function: ease-out;
+      -moz-transition-timing-function: ease-out;
+      -ms-transition-timing-function: ease-out;
+      -o-transition-timing-function: ease-out;
+      transition-timing-function: ease-out;
+      -webkit-transition-delay: 0;
+      -moz-transition-delay: 0;
+      -ms-transition-delay: 0;
+      -o-transition-delay: 0;
+      transition-delay: 0; }
+      footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus {
+        color: #666; }
+    footer div.footer-wrapper p {
+      display: -moz-inline-box;
+      -moz-box-orient: vertical;
+      display: inline-block;
+      vertical-align: baseline;
+      zoom: 1;
+      *display: inline;
+      *vertical-align: auto;
+      margin-right: 25.888px; }
+    footer div.footer-wrapper ul {
+      display: -moz-inline-box;
+      -moz-box-orient: vertical;
+      display: inline-block;
+      vertical-align: baseline;
+      zoom: 1;
+      *display: inline;
+      *vertical-align: auto; }
+      footer div.footer-wrapper ul li {
+        display: -moz-inline-box;
+        -moz-box-orient: vertical;
+        display: inline-block;
+        vertical-align: baseline;
+        zoom: 1;
+        *display: inline;
+        *vertical-align: auto; }
+        footer div.footer-wrapper ul li:after {
+          content: ' |';
+          display: inline;
+          color: #ccc; }
+        footer div.footer-wrapper ul li:last-child:after {
+          content: none; }
+
 section.index-content section {
   float: left; }
   section.index-content section h1 {
-    font-size: 24px;
-    font-weight: 800;
-    font-family: "Open Sans";
+    font-size: 800 24px "Open Sans";
     margin-bottom: 25.888px; }
   section.index-content section p {
     line-height: 25.888px;
@@ -559,69 +620,6 @@ section.index-content section {
           text-align: center;
           font: 800 18px "Open Sans", Helvetica, Arial, sans-serif; }
 
-footer {
-  padding-top: 0; }
-  footer div.footer-wrapper {
-    border-top: 1px solid #e5e5e5;
-    padding: 25.888px 0;
-    background: url("/static/images/marketing/mit-logo.png") right center no-repeat; }
-    footer div.footer-wrapper a {
-      color: #888;
-      text-decoration: none;
-      -webkit-transition-property: all;
-      -moz-transition-property: all;
-      -ms-transition-property: all;
-      -o-transition-property: all;
-      transition-property: all;
-      -webkit-transition-duration: 0.15s;
-      -moz-transition-duration: 0.15s;
-      -ms-transition-duration: 0.15s;
-      -o-transition-duration: 0.15s;
-      transition-duration: 0.15s;
-      -webkit-transition-timing-function: ease-out;
-      -moz-transition-timing-function: ease-out;
-      -ms-transition-timing-function: ease-out;
-      -o-transition-timing-function: ease-out;
-      transition-timing-function: ease-out;
-      -webkit-transition-delay: 0;
-      -moz-transition-delay: 0;
-      -ms-transition-delay: 0;
-      -o-transition-delay: 0;
-      transition-delay: 0; }
-      footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus {
-        color: #666; }
-    footer div.footer-wrapper p {
-      display: -moz-inline-box;
-      -moz-box-orient: vertical;
-      display: inline-block;
-      vertical-align: baseline;
-      zoom: 1;
-      *display: inline;
-      *vertical-align: auto;
-      margin-right: 25.888px; }
-    footer div.footer-wrapper ul {
-      display: -moz-inline-box;
-      -moz-box-orient: vertical;
-      display: inline-block;
-      vertical-align: baseline;
-      zoom: 1;
-      *display: inline;
-      *vertical-align: auto; }
-      footer div.footer-wrapper ul li {
-        display: -moz-inline-box;
-        -moz-box-orient: vertical;
-        display: inline-block;
-        vertical-align: baseline;
-        zoom: 1;
-        *display: inline;
-        *vertical-align: auto; }
-        footer div.footer-wrapper ul li:after {
-          content: ' |';
-          display: inline;
-          color: #ccc; }
-        footer div.footer-wrapper ul li:last-child:after {
-          content: none; }
-
 #lean_overlay {
   position: fixed;
   z-index: 100;
@@ -846,11 +844,12 @@ div#calculator_div {
         color: #333; }
     div#calculator_div form input#calculator_output {
       border: 0;
-      background: 0;
+      background: none;
       padding: 9.061px;
-      width: 60px;
       font-size: 24px;
-      font-weight: bold; }
+      width: 378px;
+      font-weight: bold;
+      margin-top: 4px; }
   div#calculator_div dl dt {
     float: left;
     clear: both;

css/print.css

-.header-wrapper  {display:none;}
-#accordion  {display:none;}
-.ui-accordion  {display:none;
-visibility:hidden;
-width:0%;
-}
+.header-wrapper {
+  display: none; }
+
+#accordion {
+  display: none; }
+
+.ui-accordion {
+  display: none;
+  visibility: hidden;
+  width: 0%; }

js/cktsim.js

+../../data/js/cktsim.js
\ No newline at end of file

js/jquery.leanModal.js

@@ -6,8 +6,13 @@
  
             var defaults = {
                 top: 100,
-                overlay: 0.5
+                overlay: 0.5,
+                closeButton:'.modal_close'
             }
+            
+            var overlay = $("<div id='lean_overlay'></div>");
+            
+            $("body").append(overlay);
                  
             options =  $.extend(defaults, options);
  
@@ -17,17 +22,20 @@
                
                 $(this).click(function(e) {
               
-          	  	var overlay = $("<div id='lean_overlay'></div>");
-              
               	var modal_id = $(this).attr("href");
 
         $(".leanModal_box").css({ 'display' : 'none' });
 
 				$("body").append(overlay);
-                
+        $(".leanModal_box").append("<a class=\"modal_close\" href=\"#\">&#10006;</a>");
+
 				$("#lean_overlay").click(function() { 
                      close_modal(modal_id);                    
                 });
+                
+                $(o.closeButton).click(function() { 
+                     close_modal(modal_id);                    
+                });
                          	
               	var modal_height = $(modal_id).outerHeight();
         	  	var modal_width = $(modal_id).outerWidth();

js/jquery.leanModal.min.js

-(function(a){a.fn.extend({leanModal:function(b){function d(b){a("#lean_overlay").fadeOut(200);a(b).css({display:"none"})}var c={top:100,overlay:.5};b=a.extend(c,b);return this.each(function(){var c=b;a(this).click(function(b){var e=a("<div id='lean_overlay'></div>");var f=a(this).attr("href");a(".leanModal_box").css({display:"none"});a("body").append(e);a("#lean_overlay").click(function(){d(f)});var g=a(f).outerHeight();var h=a(f).outerWidth();a("#lean_overlay").css({display:"block",opacity:0});a("#lean_overlay").fadeTo(200,c.overlay);a(f).css({display:"block",position:"fixed",opacity:0,"z-index":11e3,left:50+"%","margin-left":-(h/2)+"px",top:c.top+"px"});var i=a(f).offset().top+"px";a(f).css({position:"absolute",top:i});a(f).fadeTo(200,1);b.preventDefault()})})}})})(jQuery)
+(function(a){a.fn.extend({leanModal:function(b){function e(b){a("#lean_overlay").fadeOut(200);a(b).css({display:"none"})}var c={top:100,overlay:.5,closeButton:".modal_close"};var d=a("<div id='lean_overlay'></div>");a("body").append(d);b=a.extend(c,b);return this.each(function(){var c=b;a(this).click(function(b){var f=a(this).attr("href");a(".leanModal_box").css({display:"none"});a("body").append(d);a(".leanModal_box").append('<a class="modal_close" href="#">&#10006;</a>');a("#lean_overlay").click(function(){e(f)});a(c.closeButton).click(function(){e(f)});var g=a(f).outerHeight();var h=a(f).outerWidth();a("#lean_overlay").css({display:"block",opacity:0});a("#lean_overlay").fadeTo(200,c.overlay);a(f).css({display:"block",position:"fixed",opacity:0,"z-index":11e3,left:50+"%","margin-left":-(h/2)+"px",top:c.top+"px"});var i=a(f).offset().top+"px";a(f).css({position:"absolute",top:i});a(f).fadeTo(200,1);b.preventDefault()})})}})})(jQuery)

js/schematic.js

+../../data/js/schematic.js
\ No newline at end of file

js/video_player.js

@@ -196,7 +196,7 @@ function onYouTubePlayerAPIReady() {
       'onStateChange': onPlayerStateChange
     }
   });
-  updateytplayerInfoInterval = setInterval(updateytplayerInfo, 500);
+  updateytplayerInfoInterval = setInterval(updateHTML5ytplayerInfo, 200);
   ajax_videoInterval = setInterval(ajax_video, 5000);
 }
 
@@ -300,15 +300,32 @@ function onPlayerError(errorCode) {
     //    alert("An error occured: " + errorCode);
 }
 
-function updateytplayerInfo() {
-    if(ytplayer.getPlayerState()!=3) {
-	$("#slider").slider("option","max",ytplayer.getDuration());
-	$("#slider").slider("option","value",ytplayer.getCurrentTime());
+// Currently duplicated to check for if video control changed by clicking the video for HTML5
+// Hacky b/c of lack of control over YT player
+function updateHTML5ytplayerInfo() {
+    var player_state = getPlayerState();
+    if(player_state != 3) {
+      $("#slider").slider("option","max",ytplayer.getDuration());
+      $("#slider").slider("option","value",ytplayer.getCurrentTime());
     }
-    if (getPlayerState() == 1){
-	update_captions(getCurrentTime());
+    if (player_state == 1){
+      update_captions(getCurrentTime());
     }
+    if (player_state == 1 && $("#video_control").hasClass("play"))
+      $("#video_control").removeClass().addClass("pause");
+    else if (player_state == 2 && $("#video_control").hasClass("pause"))
+      $("#video_control").removeClass().addClass("play");
+}
 
+function updateytplayerInfo() {
+    var player_state = getPlayerState();
+    if(player_state != 3) {
+      $("#slider").slider("option","max",ytplayer.getDuration());
+      $("#slider").slider("option","value",ytplayer.getCurrentTime());
+    }
+    if (player_state == 1){
+      update_captions(getCurrentTime());
+    }
        // updateHTML("videoduration", getDuration());
     //    updateHTML("videotime", getCurrentTime());
     //    updateHTML("startbytes", getStartBytes());
@@ -432,4 +449,4 @@ function clearVideo() {
     if (ytplayer) {
 	ytplayer.clearVideo();
     }
-}
+}
\ No newline at end of file