Merged with default

--HG--
branch : kf-links

book_toc.html

@@ -45,8 +45,8 @@
 <li><a href="javascript:goto_page(104)"> 2.3.4.3  Current Dividers   80 </a>
 <li><a href="javascript:goto_page(108)"> 2.3.4.4  Resistors in Parallel   82 </a>
 <li><a href="javascript:goto_page(108)"> 2.3.5  A More Complex Circuit   84 </a>
-</ul> <li><a href="javascript:goto_page(131)"> 2.4  Intuitive Method of Circuit Analysis   107 </a>
-<li><a href="javascript:goto_page(132)"> 2.5  More Examples   108 </a>
+</ul> <li><a href="javascript:goto_page(113)"> 2.4  Intuitive Method of Circuit Analysis   89 </a>
+<li><a href="javascript:goto_page(119)"> 2.5  More Examples   95 </a>
 <li><a href="javascript:goto_page(122)"> 2.6  Dependent Sources and the Control Concept   98 </a>
 <ul> <li><a href="javascript:goto_page(126)"> 2.6.1  Circuits with Dependent Sources   102 </a>
 </ul> <li><a href="javascript:goto_page(131)"> 2.7  A Formulation Suitable for a Computer Solution *   107 </a>

feedback_email.txt

@@ -1,4 +1,6 @@
 Feedback from: ${ user }
+E-mail: ${ email }
+Browser: ${ browser }
 url: ${ url }
 time: ${ time }
 Subject: ${ subject }

gradebook.html

@@ -0,0 +1,15 @@
+<table>
+% for s in students:
+<h1><a href=/profile/${s['id']}>${s['username']}</a></h1>
+% for c in s['grade_info']['grade_summary']:
+<h2>${c['category']} </h2>
+<p>
+% if 'subscores' in c:
+  % for ss in c['subscores']:
+    <br>${ss['summary']}
+  % endfor
+% endif
+</p>
+% endfor
+% endfor
+</table>

main.html

@@ -87,7 +87,7 @@
         <dt>Functions:</dt>
         <dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
         <dt>Constants</dt>
-        <dd>e</dd>
+        <dd>e, pi</dd>
 
        <!-- Students won't know what parallel means at this time.  Complex numbers aren't well tested in the courseware, so we would prefer to not expose them.  If you read the comments in the source, feel free to use them. If you run into a bug, please let us know. But we can't officially support them right now.
 

sass/discussion/_question-view.scss

@@ -83,6 +83,8 @@ div.question-header {
 
           &.question-delete {
             color: $mit-red;
+            text-decoration: none;
+            cursor: pointer;
           }
         }
 

sass/discussion/_questions.scss

@@ -198,6 +198,22 @@ ul.question-list, div#question-list {
             }
 
             &.answers {
+              &.accepted {
+
+                @include linear-gradient(#fff, lighten( #c4dfbe, 12% ));
+                border-color: #c4dfbe;
+
+                span, div {
+                  color: darken(#c4dfbe, 35%);
+                }
+              }
+              &.no-answers {
+
+
+                span, div {
+                  color: lighten($mit-red, 20%);
+                }
+              }
             }
 
             &.votes {

staticbook.html

@@ -5,6 +5,12 @@
 var page=${ page };
 
 $(document).ready(function(){
+   if(!page) {
+     cookie_page = $.cookie("book_page");
+     if(cookie_page) {
+       goto_page(cookie_page);
+     }
+   }
    $("#booknav").treeview({collapsed:true, unique:true/*, cookieId: "treeview-book-nav", persist: "cookie"*/});
 });
 
@@ -19,6 +25,7 @@ function goto_page(n) {
     prefix="00";
   }
   $("#bookpage").attr("src","${ settings.BOOK_URL }p"+prefix+n+".png");
+  $.cookie("book_page", n, {'expires':3650, 'path':'/'});
 };
 
 function prev_page() {