From 61a713f2c2e4dfa3844aec720ffae9a5c6e9cc6d Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 9 Jan 2012 16:56:22 -0500
Subject: [PATCH] Changed some style for the courseware, fixed the footer links
 and fixed the modal window

---
 .../_courseware.scssc                         | Bin 17454 -> 17633 bytes
 accordion_init.js                             |   7 +-
 index.html                                    |   7 +-
 login.html                                    |   2 +-
 main.html                                     | 106 ++++++++++--------
 profile.html                                  |   6 +-
 sass/_courseware.scss                         |   3 +
 simplewiki_base.html                          |   2 +-
 8 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc
index 2a52d2c23408ba9f2f235b8e0bc6237569be94b4..30646bd06619ff59667263b5574ff781b7a539ce 100644
GIT binary patch
delta 3021
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
Cc<)RA

delta 2817
zcmZvcZA_C_6vsK87F${<^bN{Wp1uKXp`}nLlE>*oc@s+Ad>I<MvLRCK3@AoT6gOP9
zMI175C$dC?4i`5?olZ2yxD3rc?9(#+v=57JCesi5q{)`eY|h<#+uDbAUv7Rk_niMZ
z_kYjxJU9ejj=`kC>Fcj;^v4=EE%gUB$2Rp1#QaS@vZ)>L`D+^k4ZfwZ*nn?yfB#p@
z6-yu&?=I;913DF<VuPR)VM@@(GXTdGg5D^2M{)#tB!`?Eg;LQ><M1a%6ihgy(_*)>
zwAe%iE|7x^z)@uoO3_lX(qa~LowgjgplByyWFx}2X^=;9vDC<6dtPH<nV^j42%KO}
z)-1zcia4Cj>oD`%1zVnAj28&@h`iG#FDGj21PAMk$9$C$c(mqg6@0QwGX_;*u(2*b
zQx$VITJ;gBnhEkq9<I>a@Tp1%cFb41$=am0lQpWYG25A3wcsI{2~HbgN1ve*@2D-{
zz$fY!D93q20RPok@vOQ4PvkGd$Ld_XpZ_YjXd5oo?zku3zkP^xu8q4$M>0DQ;Y`A9
z1p^Luh86DQ#au#QT@r2hdqD`iIBeG8I*p$9QpKfIF`KB%qlOhwlWJ1oOR9L$S=bGJ
z=G0iBk@r)TwNxdW<PjAfQ8cRSC38{#!iEN7gB>p|F++e<aii0!!rMh<&`4e}h@C~$
z6cdKD7HFblVHTugK{lf75G|V^ysK^DmnC}?(wFw9(S&~8AOuP0HKrg<pQh=Vgum$m
z(1KQd30VbwE41PPJxA7Qy@RYTFS3#~sy5d=5?paIB5t}=#pOh*m6cDteuC4l-%76C
z1#Rr*+sSp;LkAj-?YPgN!9im!eq$)Wx8+UHg;sx;xm$WwvJqvEX|D;wRmIH^rVrrB
z>+9bY-!qW>RKhgy9~ziV@`xOd<~yjJid9LQ!e}lDnO93|k&P(R%7{dQ@Pm@@;x#lL
zC;b-uvqUIdn=xr?@yKEaZZTQ$dA$fd*xXQQ>Y*}qR3?*9S=yplpKPE9drCuP8>J19
zjVSA+nMuOC4hLTL%h{krFqaELlnq~$)0m<(Izpo}iPmZ8P1cE~hhSqGSEsQ%jX`|Q
z4MU84B`#Bp%I~D|nS@u(LG>2NSZ^UNbir0!RTe6YXE+qcyxcB$3rn0F7V_1`Z9+Nu
zB{i{Eqd!SHCEEBl`a{BSSuPIoVHjk0{DIe)25A##X%m@*Px+8}Na`Nhh_V|rHbK~D
z>4NQe!Lk~5B)>5?43j3yaM<dEop{{ZW!@!KARAG3pDH8>!Pd5TcX9wKaM)&1>`A)1
z3y<60guVE;?G1h}P5X<cWfT3EOt@FVKI}Ex@u9t%A4w|gP1`<{#zFKsA~3=XIOWiD
zBUHQiC87;kh<6-)Mf)@ShW+Ft3gNgzsi#Tr(0m`uPas|_UkRi1!DMg%gB2a{F7`Sr
zachMY|0vgBw5$N1RJaW9CEFwlFMgt=FJEOZ9Aw>{t~6K=QuWuF`v0IjqQD1rD`1Q~
zek&XzWjf(QJnMXoKP+_}$WD}vGL-}(=jwJ$EQldHQ8vM1Qkbx|6Fy=W-s;k-X4v^8
z4V^)exPFv<o)_IN_!xh5cK{+^73PmEP$oN3cAI4;5XY;UVTydp#rUvF!%fli@7Z}4
zVqtZ=_mh-UQxd0+NqADi6Zk>(dYHz0)i!RLD*wuqvk*%?&2SQ<o(i(Q@2Mi|WsjGv
zKYL2Z`k-8=JejIHjYjVVn86)hJ2yi$)r;uUXCYqlwkl7jvS#p^HwtGkQsd;#&@2bb
z%0fI<(*~b2`@TSr?-l;s0{h5Llr^)|1mX!_Gt3hEoZKuu3$wE<L~CtF=zQkzo=<f*
zEAi}{gwII$u!IldT<r$9!X}fiE8?!u(gUn?7Gk)r4dxK*I^inbt80O4bb|Qn3+_dB
zqHK%_BoN2RXJzr{;yrgW+(5oQ2sc@|-SryoCXN1-MQ0(-)UQ!~ox0dfd{*BA^UR-l
rnstq3Wg+!v`K?TUZlz@AC3n9r;VWs5p)z2B{c}};oiO)Zqe=ZA7{0}^

diff --git a/accordion_init.js b/accordion_init.js
index 91a99d0b7f..6a2ec4dd8a 100644
--- a/accordion_init.js
+++ b/accordion_init.js
@@ -1,7 +1,10 @@
-$("#accordion").accordion({active:${ active_chapter }});
+$("#accordion").accordion({
+  active:${ active_chapter },
+  autoHeight: false
+});
 
 $('.ui-accordion').bind('accordionchange', function(event, ui) {
    var event_data = {'newheader':ui.newHeader.text(),
 		     'oldheader':ui.oldHeader.text()};
    log_event('accordion', event_data);
-});
\ No newline at end of file
+});
diff --git a/index.html b/index.html
index 6e354074b7..b653bb46e6 100644
--- a/index.html
+++ b/index.html
@@ -2,9 +2,6 @@
 <script> 
 $(function() {
 /* Set up FancyBox pop-ups */
-	$("a#inline").fancybox({
-		'hideOnContentClick': false
-	});
 
     // TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
 
@@ -107,8 +104,8 @@ $(function() {
 
           <center>
             <table>
-              <tr><td align=right><big><a id="inline" href="#enroll">Enroll &gt;&gt;</a><br><br><br>
-                    <a id="inline" href="#login">Log In &gt;&gt;</a></big></td><td><div style="width:50px; float:center;"></div></td><td>
+              <tr><td align=right><big><a class="modal" href="#enroll">Enroll &gt;&gt;</a><br><br><br>
+                    <a class="modal" href="#login">Log In &gt;&gt;</a></big></td><td><div style="width:50px; float:center;"></div></td><td>
                   <div style="width:300px; float:center;">
                     Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris
                     Terman, "6.002 Circuits and Electronics" is an an on-line adaption of
diff --git a/login.html b/login.html
index 5aa402eb6f..643eec371c 100644
--- a/login.html
+++ b/login.html
@@ -11,6 +11,6 @@
 </form>
 </td></tr></table>
 <div align=center>
-<div id="lost_password"><a  id="inline" href="#pwd_reset">Lost password?</a></div>
+<div id="lost_password"><a class="modal" href="#pwd_reset">Lost password?</a></div>
 </div>
 </div>
diff --git a/main.html b/main.html
index bf14f4e10a..3e512ca215 100644
--- a/main.html
+++ b/main.html
@@ -28,13 +28,12 @@
 <script>
 $(function() {
 // Set up FancyBox pop-ups
-	$("a#inline").fancybox({
+	$("a.modal").fancybox({
 		'hideOnContentClick': false
 	});
 });
 </script>
 
-
 <%block name="headextra"/>
 
 </head>
@@ -45,57 +44,68 @@ $(function() {
   <%block name="bodyextra"/>
 
   <footer>
-    <p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a> Please give us <a id="inline"
-        href="#feedback_div">feedback</a>. Try our <a id="inline"
-        href="#calculator_div">calculator</a>.
-
-      <!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
-    </p>
-
-<div style="display:none"><div id="feedback_div">Found a bug? Got an
-idea for improving our system? Let us know. 
-<br> Subject: <br><input id="feedback_subject" size=40>
-<br> Feedback: <br><textarea id="feedback_message" cols="40" rows="5">
-</textarea>
-<br> <input id="feedback_button" type="button" value="Submit">
-
-<script>$(function() {
-  $("#feedback_button").click(function(){
-  postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"),
-                              "url":document.URL,
-                              "message":$("#feedback_message").attr("value")},
-      function(data){
-         $("#feedback_subject").attr("value","");
-         $("#feedback_message").attr("value","");
-         $("#feedback_div").html("Feedback submitted. Thank you");
-      });
-  });
-});</script>
-
-</div></div>
-
-<div style="display:none"><div id="calculator_div">
-<input id="calculator_input" > <input id="calculator_button" type=button value="=&gt;">
-<input id="calculator_output" readonly>
-<script>$(function() {
-  $("#calculator_button").click(function(){
-    $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
-      function(data){
-         $("#calculator_output").attr("value",data.result);
-      });
-  });
-});</script>
-<br>
-Supported operations: ^ * / + - || ()
-<br>
-Supported suffixes: %kMGTcmunp
-
-</div></div>
+    <!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
+    <p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
 
     <ul>
+      <li><a href="#feedback_div" class="modal">Feedback</a></li>
+      <li><a href="#calculator_div" class="modal">Calculator</a></li>
       <li><a href="/s/help.html">Help</a></li>
       <li><a href="/logout">Log out</a></li>
     </ul>
   </footer>
+
+  <div style="display:none">
+    <div id="feedback_div">
+      Found a bug? Got an idea for improving our system? Let us know. 
+
+      <form>
+        <ol>
+          <li><label>Subject:</label> <input id="feedback_subject" size=40></li>
+          <li><label>Feedback: </label><textarea id="feedback_message" cols="40" rows="5"></textarea></li>
+          <li><input id="feedback_button" type="button" value="Submit"></li>
+        </ol>
+      </form>
+
+    </div>
+  </div>
+
+  <div style="display:none">
+    <div id="calculator_div">
+      <input id="calculator_input" > 
+      <input id="calculator_button" type=button value="=&gt;">
+      <input id="calculator_output" readonly>
+
+      <p>Supported operations: ^ * / + - || ()</p>
+      <p>Supported suffixes: %kMGTcmunp</p>
+    </div>
+  </div>
+
+<script>
+  // Feedback form
+$(function() {
+    $("#feedback_button").click(function(){
+      postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"),
+        "url":document.URL,
+        "message":$("#feedback_message").attr("value")},
+        function(data){
+        $("#feedback_subject").attr("value","");
+        $("#feedback_message").attr("value","");
+        $("#feedback_div").html("Feedback submitted. Thank you");
+        });
+      });
+    });
+
+// Calculator
+$(function() {
+    $("#calculator_button").click(function(){
+      $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
+        function(data){
+        $("#calculator_output").attr("value",data.result);
+        });
+      });
+    });
+</script>
+
 </body>
 </html>
diff --git a/profile.html b/profile.html
index eeff106431..3466a261b7 100644
--- a/profile.html
+++ b/profile.html
@@ -45,9 +45,8 @@ $(function() {
            }
         });
 
-
         $('#change_password').click(function(){
-          $('#inline').trigger('click');
+          $('.modal').trigger('click');
             log_event("profile", {"type":"password_show"});
         });
 
@@ -75,10 +74,9 @@ $(function() {
         <li>E-mail: ${email}</li>
         <li>Location: ${location}</li>
         <li>Language: ${language}</li>
-        <li>Password: ********</li>
       </ul>
 
-      <!-- <div><a href="#change_password_pop">Reset password</a></div> -->
+      <!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
       <!-- hidden trigger for password -->
 
       <div id="change_password_pop">
diff --git a/sass/_courseware.scss b/sass/_courseware.scss
index c9db9e46ff..59635bcda2 100644
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -14,6 +14,9 @@ div.course-wrapper {
     width: grid-width(3);
 
     h3 {
+      overflow: hidden;
+      margin: 0;
+
       &:last-child {
         @include box-shadow(none);
       }
diff --git a/simplewiki_base.html b/simplewiki_base.html
index 819f8b9555..467a2e9332 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -136,4 +136,4 @@ update_schematics();});
 	<%block name="wiki_body"/>
 </section>
 
-</%block>
\ No newline at end of file
+</%block>