merge

2012-03-11 17:45:56 -04:00
parent e8656c2d9e 547bf5d52e
commit 4f4f3a75b5
3 changed files with 370 additions and 9 deletions
--- a/contrib/xbook.html
+++ b/contrib/xbook.html
@@ -0,0 +1,261 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright (c) 2012 Jeff Kent, https://jeffkent.net/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<html>
+<head>
+<title>6.002x Textbook for Kindle</title>
+<script type="text/javascript" src="https://mitxstatic.s3.amazonaws.com/js/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="/static/js/jquery.cookie.js"></script>
+<script type="text/javascript">
+var exhibit = Object();
+exhibit.width = 960;
+exhibit.height = 1080;
+exhibit.ratio = exhibit.width / exhibit.height;
+exhibit.current = 1;
+exhibit.first = 1;
+exhibit.last = 1008;
+exhibit.url = "https://mitxstatic.s3.amazonaws.com/book_images/p{0}.png";
+exhibit.format = Array();
+exhibit.format[0] = {width: 550,
+                     height: 975,
+                     left_odd: -117,
+                     left_even: -295,
+                     top: -55,
+                     ratio: 550/975};
+exhibit.format[1] = {width: 775,
+                     height: 975,
+                     left_odd: -117,
+                     left_even: -70,
+                     top: -55,
+                     ratio: 775/975};
+exhibit.format[2] = {width: 960,
+                     height: 1080,
+                     left_odd: 0,
+                     left_even: 0,
+                     top: 0,
+                     ratio: 960/1080};
+
+var format_mode = 0;
+
+function zeropad(num, size){
+  var s = num+"";
+  while (s.length < size)
+    s = "0" + s;
+  return s;
+}
+
+function load(n){
+  var pg = 0;
+  if (exhibit.current <= 1)
+    pg = exhibit.current + n;
+  else if (exhibit.current < exhibit.last)
+    pg = exhibit.current - 1 + n;
+  else
+    pg = exhibit.last - 2 + n;
+
+  var url = exhibit.url.replace("{0}", zeropad(pg, 3));
+  var div = $("#exhibit" + n);
+  var img = $("#exhibit" + n + " img");
+  div.css({width:exhibit.format[format_mode].width + "px",
+           height:exhibit.format[format_mode].height + "px"});
+  img.css({position:"relative",
+           width:exhibit.width + "px",
+           height:exhibit.height + "px",
+           top:exhibit.format[format_mode].top + "px"});
+  if (pg % 2)
+    img.css({left:exhibit.format[format_mode].left_odd + "px"});
+  else
+    img.css({left:exhibit.format[format_mode].left_even + "px"});
+  img.attr("src", url);
+}
+
+function load_all(){
+  if (exhibit.current <= 1) {
+    load(0);
+    load(1);
+    load(2);
+  } else {
+    load(1);
+    load(2);
+    load(0);
+  }
+}
+
+function shift_up(){
+  $("#exhibit0").html("");
+  $("#exhibit1 img").appendTo("#exhibit0");
+  $("#exhibit1").html("");
+  $("#exhibit2 img").appendTo("#exhibit1");
+  $(window).scrollTop($(window).scrollTop() - exhibit.format[format_mode].height - 15);
+  $("#exhibit2").html("<img>");
+  load(2);
+}
+
+function shift_down(){
+  $("#exhibit2").html("");
+  $("#exhibit1 img").appendTo("#exhibit2");
+  $("#exhibit1").html("");
+  $("#exhibit0 img").appendTo("#exhibit1");
+  $(window).scrollTop($(window).scrollTop() + exhibit.format[format_mode].height + 15);
+  $("#exhibit0").html("<img>");
+  load(0);
+}
+
+function update_status(){
+  $("#status").html("&nbsp; " + exhibit.current + "/" + exhibit.last);
+}
+
+function goto_page(pg, offset){
+  offset = typeof offset !== 'undefined' ? offset : 0;
+
+  exhibit.current = pg;
+  load_all();
+  if (exhibit.current <= 1)
+    $(document).scrollTop(offset);
+  else if (exhibit.current < exhibit.last)
+    $(document).scrollTop((exhibit.format[format_mode].height + 15) + offset);
+  else
+    $(document).scrollTop((exhibit.format[format_mode].height + 15) * 2 + offset);
+
+  $.cookie('exhibit.current', exhibit.current, {expires: 7});
+  $.cookie('exhibit.offset', 0, {expires: 7});
+}
+
+function get_offset(){
+  var offset;
+
+  if (exhibit.current <= 1)
+    offset = $(document).scrollTop();
+  else if (exhibit.current < exhibit.last)
+    offset = $(document).scrollTop() - (exhibit.format[format_mode].height + 15);
+  else
+    offset = $(document).scrollTop() - (exhibit.format[format_mode].height + 15) * 2;
+
+  return offset;
+}
+
+$(function(){
+  $("#container").width(exhibit.format[format_mode].width);
+  setTimeout(function(){
+    var current = parseInt($.cookie("exhibit.current"),10);
+    var offset = parseInt($.cookie("exhibit.offset"),10);
+    current = (isNaN(current) || current < 1 || current > exhibit.last) ? 3 : current;
+    offset = isNaN(offset) ? 0 : offset;
+
+    goto_page(current, offset);
+    update_status();
+  },1);
+});
+
+$(window).keydown(function(e){
+  if (e.keyCode == 67) {        /* [c]ontents */
+    goto_page(9);
+  } else if (e.keyCode == 70) { /* [f]ormat */
+    if (format_mode < 2)
+      format_mode += 1;
+    else
+      format_mode = 0;
+    $("#container").width(exhibit.format[format_mode].width);
+    load_all();
+  } else if (e.keyCode == 71) { /* [g]oto */
+    var pg = prompt("Goto page: ");
+    if (pg !== null)
+      if (pg > 0 && pg <= exhibit.last)
+        goto_page(parseInt(pg,10));
+  } else if (e.keyCode == 73) { /* [i]ndex */
+    goto_page(997);
+  }
+});
+
+$(window).scroll(function(){
+  setTimeout(function(){
+    if (exhibit.current <= 1) {
+      if ($(window).scrollTop() + $(window).height()/2 >= (exhibit.format[format_mode].height + 15))
+        exhibit.current += 1;
+    } else if (exhibit.current <= exhibit.last - 1) {
+      if ($(window).scrollTop() + $(window).height()/2 < (exhibit.format[format_mode].height + 15)) {
+        exhibit.current -= 1;
+        if (exhibit.current != 1)
+	  shift_down();
+      } else if ($(window).scrollTop() + $(window).height()/2 >= (exhibit.format[format_mode].height + 15) * 2) {
+        exhibit.current += 1;
+        if (exhibit.current != exhibit.last)
+	  shift_up();
+      }
+    } else if (exhibit.current >= exhibit.last) {
+      if ($(window).scrollTop() + $(window).height()/2 < (exhibit.format[format_mode].height + 15) * 2)
+        exhibit.current -= 1;
+    }
+    $.cookie('exhibit.current', exhibit.current, {expires: 7});
+    $.cookie('exhibit.offset', get_offset(), {expires: 7});
+    update_status();
+  },1);
+});
+</script>
+<style type="text/css">
+body {
+  background-color: #333;
+  margin: 15px 0;
+}
+#status {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background-color: black;
+  color: white;
+  width: 100%;
+  z-index: 100;
+}
+#help {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  color: white;
+  z-index:100;
+}
+#container {
+  overflow: hidden;
+  margin: 0 auto;
+}
+#exhibit0, #exhibit1, #exhibit2 {
+  overflow:hidden;
+}
+.spacer {
+  height: 15px;
+}
+</style>
+</head>
+<body>
+<div id="container">
+<div id="exhibit0"><img /></div>
+<div class="spacer"></div>
+<div id="exhibit1"><img /></div>
+<div class="spacer"></div>
+<div id="exhibit2"><img /></div>
+</div>
+<div id="status">&nbsp;</div>
+<div id="help">[g]oto [f]ormat [c]ontents [i]ndex &nbsp;</div>
+<div>&nbsp;<div>
+</body>
+</html>
--- a/css/application.css
+++ b/css/application.css
@@ -2540,6 +2540,38 @@ div.course-wrapper section.course-content ol.vert-mod > li:last-child {
 div.course-wrapper section.course-content section.tutorials ul {
  list-style: disc outside none;
  margin-left: 22.652px; }
+div.course-wrapper section.course-content div.staff_info {
+  white-space: pre-wrap;
+  border-top: 1px solid #ccc;
+  padding-top: 22.652px;
+  margin-top: 22.652px;
+  line-height: 22.652px;
+  font-family: Consolas, "Lucida Console", Monaco, "Courier New", Courier, monospace; }
+div.course-wrapper section.course-content div.ui-slider {
+  border: 1px solid #aaa;
+  background: #ddd;
+  -webkit-box-shadow: inset 0 1px 0 #eeeeee;
+  -moz-box-shadow: inset 0 1px 0 #eeeeee;
+  -ms-box-shadow: inset 0 1px 0 #eeeeee;
+  -o-box-shadow: inset 0 1px 0 #eeeeee;
+  box-shadow: inset 0 1px 0 #eeeeee;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -ms-border-radius: 0;
+  -o-border-radius: 0;
+  border-radius: 0; }
+div.course-wrapper section.course-content div.ui-slider a.ui-slider-handle {
+  -webkit-box-shadow: inset 0 1px 0 #bf4040;
+  -moz-box-shadow: inset 0 1px 0 #bf4040;
+  -ms-box-shadow: inset 0 1px 0 #bf4040;
+  -o-box-shadow: inset 0 1px 0 #bf4040;
+  box-shadow: inset 0 1px 0 #bf4040;
+  background: #993333 url(/static/images/slider-bars.png) center center no-repeat;
+  border: 1px solid #4d1919;
+  cursor: pointer; }
+div.course-wrapper section.course-content div.ui-slider a.ui-slider-handle:hover, div.course-wrapper section.course-content div.ui-slider a.ui-slider-handle:focus {
+  background-color: #bf4040;
+  outline: none; }
 div.course-wrapper.closed section.course-index {
  width: 3.077%; }
 div.course-wrapper.closed section.course-index header#open_close_accordion {
@@ -2663,14 +2695,14 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
  -o-box-shadow: inset 0 1px 0 #bf4040;
  box-shadow: inset 0 1px 0 #bf4040;
  background: #993333 url(/static/images/slider-handle.png) center center no-repeat;
-  border: 0;
  border: 1px solid #4d1919;
  cursor: pointer;
  height: 20px;
  margin-left: -10px;
  top: -4px;
  width: 20px; }
-section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider a.ui-slider-handle:focus {
+section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider a.ui-slider-handle:focus, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider a.ui-slider-handle:hover {
+  background-color: #bf4040;
  outline: none; }
 section.course-content div.video-subtitles div.video-wrapper section.video-controls ul.vcr {
  float: left;
@@ -3022,15 +3054,15 @@ div#graph-container div.graph-controls {
  float: left; }
 div#graph-container div.graph-controls select#musicTypeSelect {
  display: block;
-  margin-bottom: 45.304px; }
+  margin-bottom: 22.652px; }
 div#graph-container div.graph-controls div#graph-output {
  display: block;
-  margin-bottom: 45.304px; }
+  margin-bottom: 22.652px; }
 div#graph-container div.graph-controls div#graph-listen {
  display: block;
-  margin-bottom: 45.304px; }
-div#graph-container div.graph-controls p {
  margin-bottom: 22.652px; }
+div#graph-container div.graph-controls p {
+  margin-bottom: 11.326px; }
 div#graph-container div.graph-controls div#label {
  display: inline-block; }
 div#graph-container div.graph-controls input#playButton {
@@ -3270,7 +3302,8 @@ div.profile-wrapper section.user-info ul li {
  -o-box-shadow: 0 1px 0 #eeeeee;
  box-shadow: 0 1px 0 #eeeeee;
  padding: 7px 22.652px;
-  border-bottom: 1px solid #d3d3d3; }
+  border-bottom: 1px solid #d3d3d3;
+  position: relative; }
 div.profile-wrapper section.user-info ul li div#location_sub, div.profile-wrapper section.user-info ul li div#language_sub {
  font-weight: bold;
  display: -moz-inline-box;
@@ -3280,12 +3313,29 @@ div.profile-wrapper section.user-info ul li div#location_sub, div.profile-wrappe
  zoom: 1;
  *display: inline;
  *vertical-align: auto; }
-div.profile-wrapper section.user-info ul li div#location_sub input, div.profile-wrapper section.user-info ul li div#language_sub input {
-  margin: 11.326px 0; }
+div.profile-wrapper section.user-info ul li div#location_sub form, div.profile-wrapper section.user-info ul li div#language_sub form {
+  width: 100%; }
+div.profile-wrapper section.user-info ul li div#location_sub input[type="text"], div.profile-wrapper section.user-info ul li div#language_sub input[type="text"] {
+  margin: 11.326px 0;
+  width: 100%;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  -o-box-sizing: border-box;
+  box-sizing: border-box; }
 div.profile-wrapper section.user-info ul li div#location_sub:empty, div.profile-wrapper section.user-info ul li div#language_sub:empty {
  padding: 0; }
 div.profile-wrapper section.user-info ul li div#description {
  font-size: 12px; }
+div.profile-wrapper section.user-info ul li a#change_language, div.profile-wrapper section.user-info ul li a#change_location {
+  position: absolute;
+  top: 9px;
+  right: 11.326px;
+  text-transform: uppercase;
+  font-size: 12px;
+  color: #999; }
+div.profile-wrapper section.user-info ul li a#change_language:hover, div.profile-wrapper section.user-info ul li a#change_location:hover {
+  color: #555; }
 div.profile-wrapper section.user-info div#change_password_pop {
  padding: 7px 22.652px;
  color: #4D4D4D; }
@@ -5471,6 +5521,17 @@ div.question-header div.question-container div.comments-container div.comments-c
  display: block; }
 div.question-header div.question-container div.comments-container div.comments-content .block:first-child, div.answer-block div.question-container div.comments-container div.comments-content .block:first-child, div.paginator div.question-container div.comments-container div.comments-content .block:first-child, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content .block:first-child, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content .block:first-child, div.answer-block div.answer-container div.comments-container div.comments-content .block:first-child, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content .block:first-child, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content .block:first-child, div.question-header div.paginator div.answer-container div.comments-container div.comments-content .block:first-child, div.paginator div.question-header div.answer-container div.comments-container div.comments-content .block:first-child, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content .block:first-child, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content .block:first-child, div.paginator div.answer-container div.comments-container div.comments-content .block:first-child {
  border-top: 0; }
+div.question-header div.question-container div.comments-container div.comments-content .block.official, div.answer-block div.question-container div.comments-container div.comments-content .block.official, div.paginator div.question-container div.comments-container div.comments-content .block.official, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content .block.official, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content .block.official, div.answer-block div.answer-container div.comments-container div.comments-content .block.official, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content .block.official, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content .block.official, div.question-header div.paginator div.answer-container div.comments-container div.comments-content .block.official, div.paginator div.question-header div.answer-container div.comments-container div.comments-content .block.official, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content .block.official, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content .block.official, div.paginator div.answer-container div.comments-container div.comments-content .block.official {
+  padding-top: 10px; }
+div.question-header div.question-container div.comments-container div.comments-content .block.official span.official-comment, div.answer-block div.question-container div.comments-container div.comments-content .block.official span.official-comment, div.paginator div.question-container div.comments-container div.comments-content .block.official span.official-comment, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.answer-block div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.question-header div.paginator div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.paginator div.question-header div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content .block.official span.official-comment, div.paginator div.answer-container div.comments-container div.comments-content .block.official span.official-comment {
+  background: #993333;
+  color: #fff;
+  display: block;
+  font-size: 12px;
+  margin: 0 0 10px -5%;
+  padding: 2px 5px 2px 5%;
+  text-align: left;
+  width: 100px; }
 div.question-header div.question-container div.comments-container div.comments-content form.post-comments, div.answer-block div.question-container div.comments-container div.comments-content form.post-comments, div.paginator div.question-container div.comments-container div.comments-content form.post-comments, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content form.post-comments, div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content form.post-comments, div.question-header div.paginator div.answer-container div.comments-container div.comments-content form.post-comments, div.paginator div.question-header div.answer-container div.comments-container div.comments-content form.post-comments, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content form.post-comments, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments, div.paginator div.answer-container div.comments-container div.comments-content form.post-comments {
  padding: 15px; }
 div.question-header div.question-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.question-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.question-container div.comments-container div.comments-content form.post-comments button:last-child, div.question-header div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.question-header div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.question-header div.paginator div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.question-header div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.answer-block div.paginator div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.answer-block div.answer-container div.comments-container div.comments-content form.post-comments button:last-child, div.paginator div.answer-container div.comments-container div.comments-content form.post-comments button:last-child {
@@ -5619,6 +5680,14 @@ div.answer-block, div.paginator {
  float: left;
  padding-top: 20px;
  width: 100%; }
+div.answer-block div.official-stamp, div.paginator div.official-stamp {
+  background: #993333;
+  color: #fff;
+  font-size: 12px;
+  margin-top: 10px;
+  padding: 2px 5px;
+  text-align: center;
+  margin-left: -1px; }
 div.answer-block img.answer-img-accept, div.paginator img.answer-img-accept {
  margin: 10px 0px 10px 16px; }
 div.answer-block div.answered-by-owner p, div.paginator div.answered-by-owner p {
@@ -5777,6 +5846,37 @@ form.question-form input[type="text"] {
 form.question-form input[type="checkbox"] {
  margin-top: 10px; }

+div#question-list {
+  background-color: rgba(255, 255, 255, 0.95);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  -o-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-top: -15px;
+  max-width: 505px;
+  min-width: 300px;
+  overflow: hidden;
+  padding-left: 5px;
+  position: absolute;
+  width: 35%;
+  z-index: 9999; }
+div#question-list h2 {
+  text-transform: none;
+  padding: 8px 0;
+  border-bottom: 1px solid #eee;
+  margin: 0; }
+div#question-list h2 span {
+  background: #eee;
+  color: #555;
+  padding: 2px 5px;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
+  margin-right: 5px; }
+
 #wmd-button-bar {
  border: 1px solid #ddd;
  height: 36px;
--- a/images/slider-bars.png
+++ b/images/slider-bars.png