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 1/5] 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>

From 680e3da1dc6aa0238e1af85366bfe98e3ab06ceb Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Tue, 10 Jan 2012 14:13:06 -0500
Subject: [PATCH 2/5] Getting simplewiki search to work.

---
 simplewiki_base.html              | 32 ++++++++++++++++++++++++++-----
 simplewiki_error.html             |  4 ++++
 simplewiki_history.html           |  4 ++++
 simplewiki_searchresults.html     |  8 ++++++--
 simplewiki_updateprogressbar.html |  2 +-
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/simplewiki_base.html b/simplewiki_base.html
index 467a2e9332..c695bf405a 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -72,8 +72,35 @@ update_schematics();});
 	<hr />
 
 	<%block name="wiki_panel">
+    <%
+        if (wiki_article is not UNDEFINED):
+        	baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
+        else:
+        	baseURL = reverse("wiki_view", args=[""])
+    %>
 
 	<div id="wiki_panel">
+    	<div class="wiki_box">
+    	    <div class="wiki_box_header">
+    	            <div class="wiki_box_corner"></div>
+    	            <div class="wiki_box_bar"></div>
+    	    </div>
+    	    <div class="wiki_box_contents">
+    	            <div class="wiki_box_title">Search</div>
+    	        <form method="POST" action='${reverse("wiki_search_articles", args=[""])}'>
+    	            <div style="display:none">
+                	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
+                	</div>
+    	            <input type="text" name="value" id="wiki_search_input" style="width: 72%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
+    	            <input type="submit" id="wiki_search_input_submit" value=Go! style="width: 20%" />
+    	        </form>
+    	    </div>
+    	    <div class="wiki_box_footer">
+    	            <div class="wiki_box_corner"></div>
+    	            <div class="wiki_box_bar"></div>
+    	    </div>
+    	</div>
+    	
 	    <div class="wiki_box">
 	    	<div class="wiki_box_header">
 	    		<div class="wiki_box_corner"></div>
@@ -84,11 +111,6 @@ update_schematics();});
 	    	<div style="border: 2px outset #CCC; width: 250px; padding: 10px; background-color: #FFF; position: absolute; right: 100px; top: -80px; display: none; color: #000;" id="wiki_create_form">
 				<%
 					theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'"
-					if (wiki_article is not UNDEFINED):
-						baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
-					else:
-						baseURL = reverse("wiki_view", args=[""])
-					
 				%>
 	    		<form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
 	    			<h2>Create article</h2>
diff --git a/simplewiki_error.html b/simplewiki_error.html
index faf1b0dbd8..f251f8d411 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -2,6 +2,10 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%!
+    from django.core.urlresolvers import reverse
+%>
+
 <%block name="wiki_page_title">
 Oops...
 </%block>
diff --git a/simplewiki_history.html b/simplewiki_history.html
index 6dbe487e64..936459354b 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -2,6 +2,10 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%!
+    from django.core.urlresolvers import reverse
+%>
+
 <%block name="wiki_page_title">
 ${ wiki_article.title }
 </%block>
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index 17832b00be..a96a7a1a97 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -2,6 +2,10 @@
 
 <%inherit file="simplewiki_base.html"/>
 
+<%!
+    from django.core.urlresolvers import reverse
+%>
+
 <%block name="wiki_page_title">
 %if wiki_search_query:
 	Search results for ${wiki_search_query | h}
@@ -12,7 +16,7 @@
 
 <%block name="wiki_body">
 	%for article in wiki_search_results:
-		%if article.get_url:
+		%if article is not UNDEFINED:
 			<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/>
 		%else:
 			<a href="${reverse("wiki_view", args=[''])}">/</a><br/>
@@ -20,6 +24,6 @@
 	%endfor
 	
 	%if not wiki_search_results: 
-		No articles were found!
+		No articles matching <b>${wiki_search_query if wiki_search_query is not UNDEFINED else ""} </b>!
 	%endif
 </%block>
diff --git a/simplewiki_updateprogressbar.html b/simplewiki_updateprogressbar.html
index 279eaa5ef3..a7739d6bf1 100644
--- a/simplewiki_updateprogressbar.html
+++ b/simplewiki_updateprogressbar.html
@@ -1,5 +1,5 @@
 ##This file is based on the template from the SimpleWiki source which carries the GPL license
-
+##This file has been converted to Mako, but not tested. It is because uploads are disabled for the wiki. If they are reenabled, this may contain bugs.
 <%!
     from django.template.defaultfilters import filesizeformat
 %>

From fc81719a874ee212cfb5f672313d11b7d33ffee3 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Tue, 10 Jan 2012 21:48:42 -0500
Subject: [PATCH 3/5] Refactor for new capa question/answer framework

---
 problem.js          |  2 +-
 schematicinput.html | 13 +++++++++++++
 textinput.html      | 13 +++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 schematicinput.html
 create mode 100644 textinput.html

diff --git a/problem.js b/problem.js
index f7d864ad09..6f90fdc8a1 100644
--- a/problem.js
+++ b/problem.js
@@ -36,7 +36,7 @@ function ${ id }_load() {
   $('#show_${ id }').click(function() {
     postJSON('/modx/problem/${ id }/problem_show', {}, function(data) {
       for (var key in data) {
-      $("#answer_${ id }_"+key).text(data[key]);
+      $("#answer_"+key).text(data[key]);
     }
   });
 
diff --git a/schematicinput.html b/schematicinput.html
new file mode 100644
index 0000000000..4181cc6efe
--- /dev/null
+++ b/schematicinput.html
@@ -0,0 +1,13 @@
+<span>
+<input type="hidden" class="schematic" height="${height}" width="${width}" name="input_${id}" id="input_${id}" value="${value}" />
+<span id="answer_${id}"></span>
+% if state == 'unsubmitted':
+  <span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>
+% elif state == 'correct': 
+  <span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span>
+% elif state == 'incorrect':
+  <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
+% elif state == 'incomplete':
+  <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
+% endif
+</span>
diff --git a/textinput.html b/textinput.html
new file mode 100644
index 0000000000..fbe9090df8
--- /dev/null
+++ b/textinput.html
@@ -0,0 +1,13 @@
+<span>
+<input type="text" name="input_${id}" id="input_${id}" value="${value}" />
+<span id="answer_${id}"></span>
+% if state == 'unsubmitted':
+  <span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>
+% elif state == 'correct': 
+  <span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span>
+% elif state == 'incorrect':
+  <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
+% elif state == 'incomplete':
+  <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
+% endif
+</span>

From c99d1035d058b45b12a02009cd2d8faf08dce621 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Tue, 10 Jan 2012 22:42:14 -0500
Subject: [PATCH 4/5] Saving schematics works

---
 problem.js          | 2 ++
 schematicinput.html | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/problem.js b/problem.js
index 6f90fdc8a1..e5bc56e3ab 100644
--- a/problem.js
+++ b/problem.js
@@ -5,6 +5,7 @@ function ${ id }_load() {
   update_schematics();
 
   $('#check_${ id }').click(function() {
+  $("input.schematic").each(function(index,element){ element.schematic.update_value(); });
     var submit_data={};
     $.each($("[id^=input_${ id }_]"), function(index,value){
       submit_data[value.id]=value.value;
@@ -44,6 +45,7 @@ function ${ id }_load() {
 });
 
 $('#save_${ id }').click(function() {
+  $("input.schematic").each(function(index,element){ element.schematic.update_value(); });
   var submit_data={};
   $.each($("[id^=input_${ id }_]"), function(index,value){
     submit_data[value.id]=value.value;});
diff --git a/schematicinput.html b/schematicinput.html
index 4181cc6efe..06f27db1c1 100644
--- a/schematicinput.html
+++ b/schematicinput.html
@@ -1,5 +1,11 @@
 <span>
-<input type="hidden" class="schematic" height="${height}" width="${width}" name="input_${id}" id="input_${id}" value="${value}" />
+<input type="hidden" class="schematic" height="${height}" width="${width}" name="input_${id}" id="input_${id}" value="" />
+<div id="hidden_${id}" style="display:none">
+${value}
+</div>
+<script>
+$("#input_${id}").attr("value",$("#hidden_${id}").text())
+</script>
 <span id="answer_${id}"></span>
 % if state == 'unsubmitted':
   <span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>

From 741d17418953a4888a4d073f1a3bf97bb6ae7592 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Wed, 11 Jan 2012 11:33:18 -0500
Subject: [PATCH 5/5] Added structure and style for most of the wiki

--HG--
branch : kf-wiki
---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../_base-extends.scssc                       | Bin 5451 -> 13341 bytes
 .../_courseware.scssc                         | Bin 17633 -> 15004 bytes
 .../_textbook.scssc                           | Bin 7465 -> 4407 bytes
 .../_wiki-create.scssc                        | Bin 0 -> 2253 bytes
 .../_wiki.scssc                               | Bin 0 -> 12860 bytes
 .../application.scssc                         | Bin 1090 -> 1192 bytes
 accordion_init.js                             |   2 +-
 sass/_base-extends.scss                       |  80 ++++++
 sass/_courseware.scss                         |  42 +--
 sass/_textbook.scss                           |  25 +-
 sass/_wiki-create.scss                        |  22 ++
 sass/_wiki.scss                               | 134 ++++++++++
 sass/application.scss                         |   1 +
 simplewiki_base.html                          | 244 ++++++++++--------
 simplewiki_create.html                        |  18 +-
 simplewiki_edit.html                          |  11 +-
 simplewiki_view.html                          |  10 +-
 18 files changed, 399 insertions(+), 190 deletions(-)
 create mode 100644 .sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki-create.scssc
 create mode 100644 .sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki.scssc
 create mode 100644 sass/_wiki-create.scss
 create mode 100644 sass/_wiki.scss

diff --git a/.DS_Store b/.DS_Store
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..b0551ee9ccc90232ae598906242733809bc4e574 100644
GIT binary patch
delta 278
zcmZoMXfc=|#>B`mF;Q%yo}wrt0|NsP3os;=7Z)Vu<R=07YbGWxpKKt)QqRIr%#aAg
z#mJIL1v#0;B?bo97@3$^SlQS)IJh`?V!|`?Qu524@=Nnlilc)w^2>uWQ&N)>i(<j-
zlEjkIVyDC+uuMQ=Nd`~`%nr%V&jGSypsK?&Q%W-81w^Z>4RjPtoN9Fxs*MaxEOZns
zOw4L)IXO8v1)gw-D(TsHgd|p0RoB!4T?+(^AYXt0FNA`V^&1n-*+5>|%+0~g0rd68
a#P7_L`9&02nSg2(CL4+fZ}t$`!wdjnj7Sau

delta 70
zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2yDK{XvVhr0b>>8W_AvK4xj>{$am(+{342+
UKzW7)kiy9(Jj$D6L{=~Z06T*Zn*aa+

diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc
index 146798809611a5cdd4c72edfea61f5a6acfeaba1..4d23c8bb78dc10384dccf7295f94d10d04bb39ea 100644
GIT binary patch
literal 13341
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

delta 94
zcmbQ6aawDFm_}-%sey&DnW=@DQIcUwvZ-NWQj&$Kg}I5bS+ZeLQmSRDxnYvAq2WY3
ybw-YjX$J%atoR&CQgaJ(5=&A&m6+I=H=ojCW9DbG<_xhG%4D;a53!bUkOcq_3mHxT

diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc
index 30646bd06619ff59667263b5574ff781b7a539ce..2c36fe2704e9994cd452ec55fc4df38dba821955 100644
GIT binary patch
delta 3937
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
biK&TNmy7+JMO^Jv{aX`exH2`TmX7mpvry6`

literal 17633
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

diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc
index bf2de32d121a32f2fb2c235262ef60a53b750d3f..399ae4170b41389b52c524ab51255fbfee3ff56b 100644
GIT binary patch
delta 1253
zcmZ8hU2D@|6mB|~E=@_>ZB4qaUAydqsrzWU4P9Q4s5t4E2s$PhWcDL=(JrY;hEqZR
zfhgw}Oc3!(#0x>37xUVSffst^g@S*;8*kL}w%OY4>V3}FlXKqlym_U*lb?zc<$QTg
zsTAhtXBXz?D+Ob=aH=q0FqBhyrCeDk%^601R+-Juy*cwK$Z)V5Rgw|ctQzH#!xC<V
zuzG;>nPD=hWgyr!5;Gr|R*go~uvT(vF6<l|N@Ea{cvaBu829hlPSt%F@GE(^9nQd;
z?h&{nMBzvGAbb<Vc!Y$_07;XKpA~^(&r(Vt{Y5!|<cr9LhIV=Xgx463c81Z=ZeX~1
zLV~+E9iu%`kJ_uPm)y0=x>>I}hPC4R1v0)5IWi6(6G?c^onsQP7w?BZ9A8Kv<y|B=
ze6o7PCc`|57v*T#-kNd`Zh**i_`cRxMKW?QvxqYfF{5x(7-Ys^PZ)|zN9L8_OL&P%
zLY6-Z#n5Dztg~Qu4L%msgl27S7*5HvowZHN^jtllN?O&h><!cE^kSm}c;U8V)-X^n
z%Ire(=4d;#6%5nCX-Wh6tZKm~qZ}PWsNI{YZF-*3+VEJ@vqn85zN<A-lb+UMFDlol
zZ@QEewqt$F0Q?OtF)6qfS-z0&Tnic+^AhuX!0I8JWI2-4L)hUo?XW2Gp4~XCuMDh4
zm&UW5OlWA#dt~y#0TcX+=9nB6Om4Wd01b`#j0HYm^&YUoDR>eaht)_FKE)PsCv@3E
zaXvXpv%h2Z5deIz47cJre$1E6C~D<dTxFFICQo2}HaS6Se^c`?z}oYZ$NjpAw%mr>
zFx!UdrU<VyGtHi+L_RfxbU~g$;-d(zh?g??&S}xmf@zxDLhwP%oK~f)CD&Ees};v=
zc&fT=x*kU)y~idecp{lBIjOTnIn>yqFPKa=-?l=g;GZ}aZY^CwmB6$lrBN2~GCpO)
zS*zG}yQLLB2O7sjMxjbLtN7#Q+k?%tVWJILAEF>VW1~?oc}7tVehtEoq{fUb&#<bw
hY5&hdV0&Qk?d5?W6V>)ZEzQ8s)GoY8KVn;N`9Bh_IN<;Q

literal 7465
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

diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki-create.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki-create.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..a7f4fd7275aefbe9982a16f9b05fb0e8696049c2
GIT binary patch
literal 2253
zcmbuA(Qn%}5Qo#DP$b2Un>eVGt}O&-16m9%6er$X65X^89pHxzL!CEc2x#jP6Olws
zq8ocb{`Vaz%C;OM-LMx+BJYm8?{{}TeS7luq~pE%kTIUjy$>Me{I%Qdbs;?Iv2m~K
zhkm!y`QGpOtaH|TcQ)>Zop*5RpFyu1x{qx^js`5x2|3RI2>B$0{9T0LlHFiD;Zc}D
zGPKr>rV%Kk8gYXR--lMe-MSQ6e0;;N`9%hwdCo;*5$oeQnn*Uv`4-s^QkLZqUMQDb
zkaltI03sMmkrDEXh+{T@zow9k!6x+}hIj;7uFik4Zd}?~w66A#@9pzAji9u$(P~?e
z=j&D<BZwi94&E|hu};KMiCEM*Ck?%pr)&&98bmw+ZXuUT9)Ys%x3|#lS3z3qVf&#?
z_Y{@=DiDlHo7|!YLG#|z8aje**Ql-h+=z`JQn#Qk-=aH$)>I0Xpu0uFv|+xVIK@dT
z9{WB9-=+uVe#J-d&Ejb(6cyF~$V93IEn?L|o~IF;YYIETXBJIi;V~FzJe7nDWX6*#
zo3`+_qezUewKb|ePk}Ueh*<e0hYWQTsl;-~Z?{x3WG_hZxQl$ANH!yO0yoqeZsF~0
z`gQP~pigUtUCgp8p1c_eDTP*qwgf%YC)z)xGfn4+K2u(r(sTO4L~`^RLcpS%u>7K|
z<n!W$l5$<bOtK8ve*s-}(yVK%tnnlG39~7lN>%c#sE?w<e&aKqDA+r6uitKr#OzJZ
z|3;LCA119To*p_1E$(L_WC)>}Z<E)t60c!?gZqkXfw2DX5jq|JL5924P>mR+m;k?;
zNKI=Yg?s8h9H>zZ<lgX5PO34S6W{+<FKyQIi3*{azFd>A#glX@hpOn_x0RgjKXsgk
zx@KF@Mb~I|?V*)yE|e7H<$72DEV1NAQ>m0wP3ovqjW3EJQpgw%vVPlouUA{jXs5W9
zUTAWRA6#N0)u*NOF3WxsAG`Y?o&$rYN!Rflt>Ve2qnQ6sK&>Sp+TOr{9#_+^x6P>r
z0Qv`yZjr$HiyBG`2CD;T+4RdXLpPVnVYSj4W`IbM7J8J^<4dJ~WO%j=PrR;WUQuTW
z_|L*5j{mQIe02X`&%1R!Pmgc?=6PnA5>HP_io2dy8EwSFY38YoI~RY-p=8_xo{Xbu
z2;Op1yjl*0*Bj%h);1f9t|gvs)M8opAn{b&EzVsnm7<f(4U93?;6~fBtiGHs3PHT`
NZg=jTYl@<T`wyGqL52VT

literal 0
HcmV?d00001

diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..d900b930452c3b53887196ed9e4109b5824e20eb
GIT binary patch
literal 12860
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
IAh4YF{}fHT1^@s6

literal 0
HcmV?d00001

diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc
index 271c713c9fd32abf4574a2534be35a536db2ecf9..07c7fa661c2e3520d62fd0a5b4ecb5cf93c49f4a 100644
GIT binary patch
delta 187
zcmX@av4V4gn1;Ebp|NqAak6Qeu|=YBl7T^rQIff-fkkp^qGgJinT1iBp=p|hWy(Z5
zbw;s`X*Nub>|E9yo=O7cnc11T$wjG&C8=!IoFUe1(G1pH2G-n}Le@MET=~`zWt<>o
zX!4WiFc~n4Og_t`z$iNT9g_mL7)XaTm!}ew_GC%syD|=$xdr(}B??MNb|~pUxRXCK
G`vU-Okuc-{

delta 92
zcmZ3%d5B|zn1+G5d76n)qJg=Ag;9#JL2_!csbylCp@DHyig}uWS(0&*Ns6I`iSa}`
wbw-hmX*NugUovSi3QrbcR$vsFY|5;_Eo#l<z-7(lsl>!HIf41^<QNto0C=t!U;qFB

diff --git a/accordion_init.js b/accordion_init.js
index 6a2ec4dd8a..138ac15608 100644
--- a/accordion_init.js
+++ b/accordion_init.js
@@ -1,5 +1,5 @@
 $("#accordion").accordion({
-  active:${ active_chapter },
+  active: ${ active_chapter },
   autoHeight: false
 });
 
diff --git a/sass/_base-extends.scss b/sass/_base-extends.scss
index 2809e6d9b8..3fef87cf44 100644
--- a/sass/_base-extends.scss
+++ b/sass/_base-extends.scss
@@ -30,3 +30,83 @@
     border: 1px solid darken(#888, 20%);
   }
 }
+
+.content {
+  @include box-sizing(border-box);
+  display: table-cell;
+  padding: $body-line-height;
+  vertical-align: top;
+  width: grid-width(9);
+}
+
+.sidebar {
+  @include box-shadow( inset -1px 0 0 #f6f6f6);
+  background: #e3e3e3;
+  border-right: 1px solid #d3d3d3;
+  display: table-cell;
+  font-family: $body-font-family;
+  text-shadow: 0 1px 0 #f1f1f1;
+  vertical-align: top;
+  width: grid-width(3);
+  position: relative;
+
+  h3 {
+    @include box-shadow(0 1px 0 #eee);
+    background: none;
+    border: none;
+    border-bottom: 1px solid #d3d3d3;
+    color: #000;
+    font-weight: normal;
+    margin: 0;
+    overflow: hidden;
+
+    a {
+      @include transition();
+      color: lighten($text-color, 10%);
+      display: block;
+      font-size: $body-font-size;
+      padding: 7px 7px 7px 30px;
+      text-decoration: none;
+
+      &:hover {
+        @include box-shadow(0 1px 0 #fff);
+        background: #efefef;
+      }
+    }
+
+    span.ui-icon {
+      background-image: url(images/ui-icons_454545_256x240.png);
+    }
+
+    &.active {
+      @include box-shadow(none);
+      background: none;
+      border: 0;
+      border-bottom: 1px solid #bbb;
+      color: #000;
+      font-weight: bold;
+
+      a {
+        color: #000;
+      }
+    }
+  }
+}
+
+.topbar {
+  background: #F6EFD4;
+  border-bottom: 1px solid darken(#F6EFD4, 10%);
+  margin: (-$body-line-height) (-$body-line-height) $body-line-height;
+  font-size: 12px;
+  text-shadow: 0 1px 0 #fff;
+  @extend .clearfix;
+
+  a {
+    text-transform: uppercase;
+    color: darken(#F6EFD4, 80%);
+
+    &:hover {
+      color: darken(#F6EFD4, 60%);
+    }
+  }
+}
diff --git a/sass/_courseware.scss b/sass/_courseware.scss
index 59635bcda2..5fb72c54d3 100644
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -3,15 +3,7 @@ div.course-wrapper {
   width: 100%;
 
   div#accordion {
-    @include box-shadow( inset -1px 0 0 #f6f6f6);
-    background: #e3e3e3;
-    border-right: 1px solid #d3d3d3;
-    display: table-cell;
-    font-family: $body-font-family;
-    overflow: hidden;
-    text-shadow: 0 1px 0 #f1f1f1;
-    vertical-align: top;
-    width: grid-width(3);
+    @extend .sidebar;
 
     h3 {
       overflow: hidden;
@@ -29,34 +21,13 @@ div.course-wrapper {
           color: lighten($text-color, 10%);
         }
 
-        &.ui-state-default {
-          @include box-shadow(0 1px 0 #eee);
-          background: none;
-          border: none;
-          border-bottom: 1px solid #d3d3d3;
-          font-weight: normal;
-
-          span.ui-icon {
-            background-image: url(images/ui-icons_454545_256x240.png);
-          }
-        }
-
         &.ui-state-hover {
           border: none;
           border-bottom: 1px solid #d3d3d3;
         }
 
         &.ui-state-active {
-          @include box-shadow(none);
-          background: none;
-          border: 0;
-          border-bottom: 1px solid #bbb;
-          color: #000;
-          font-weight: bold;
-
-          a {
-            color: #000;
-          }
+          @extend .active;
         }
       }
     }
@@ -127,6 +98,7 @@ div.course-wrapper {
       margin-bottom: $body-line-height;
 
       li {
+        border: none;
         cursor: pointer;
         display: table-cell;
         min-width: 30px;
@@ -138,7 +110,7 @@ div.course-wrapper {
     div.video-wrapper {
       float: left;
       width: 640px;
-      min-height: 500px;
+      min-height: 620px;
 
       section {
         ul {
@@ -148,6 +120,8 @@ div.course-wrapper {
             margin-top: 5px;
             display: inline-block;
             cursor: pointer;
+            border: 0;
+            padding: 0;
 
             div {
               &:empty {
@@ -186,9 +160,13 @@ div.course-wrapper {
       li {
         margin-bottom: 8px;
         cursor: pointer;
+        border: 0;
+        padding: 0;
+        color: #666;
 
         &.current {
           background-color: #f3f3f3;
+          color: #333;
         }
 
         &:hover {
diff --git a/sass/_textbook.scss b/sass/_textbook.scss
index f4f6f514c7..16e97c00ff 100644
--- a/sass/_textbook.scss
+++ b/sass/_textbook.scss
@@ -2,17 +2,9 @@ div.book-wrapper {
   display: table;
 
   ul#booknav {
-    @include box-shadow( inset -1px 0 0 #f6f6f6);
+    @extend .sidebar;
     @include box-sizing(border-box);
-    background: #e3e3e3;
-    border-right: 1px solid #d3d3d3;
-    font-family: $body-font-family;
     padding: $body-line-height;
-    text-shadow: 0 1px 0 #f6f6f6;
-    vertical-align: top;
-    width: grid-width(3);
-    min-width: 240px;
-    display: table-cell;
 
     li {
       ul {
@@ -29,9 +21,7 @@ div.book-wrapper {
     display: table-cell;
 
     nav {
-      background: #F6EFD4;
-      border-bottom: 1px solid darken(#F6EFD4, 10%);
-      margin: (-$body-line-height) (-$body-line-height) $body-line-height;
+      @extend .topbar;
 
       ul {
         @extend .clearfix;
@@ -45,17 +35,6 @@ div.book-wrapper {
           &.next {
             float: right;
           }
-
-          a {
-            font-size: 12px;
-            text-transform: uppercase;
-            color: darken(#F6EFD4, 80%);
-            text-shadow: 0 1px 0 #fff;
-
-            &:hover {
-              color: darken(#F6EFD4, 60%);
-            }
-          }
         }
       }
     }
diff --git a/sass/_wiki-create.scss b/sass/_wiki-create.scss
new file mode 100644
index 0000000000..5ca3ec9f0f
--- /dev/null
+++ b/sass/_wiki-create.scss
@@ -0,0 +1,22 @@
+form#wiki_revision {
+  label {
+    display: block;
+    margin-bottom: 7px ;
+  }
+
+  textarea {
+    @include box-sizing(border-box);
+    margin-bottom: 20px;
+    min-height: 300px;
+    width: 100%;
+  }
+
+  input[type="text"] {
+    width: 50%;
+  }
+
+  input[type="submit"] {
+    display: block;
+    margin-top: 20px;
+  }
+}
diff --git a/sass/_wiki.scss b/sass/_wiki.scss
new file mode 100644
index 0000000000..095dd0bd9e
--- /dev/null
+++ b/sass/_wiki.scss
@@ -0,0 +1,134 @@
+div.wiki-wrapper {
+  display: table;
+  width: 100%;
+
+  div#wiki_panel {
+    @extend .sidebar;
+    overflow: auto;
+
+    input[type="button"] {
+      @extend h3;
+      color: lighten($text-color, 10%);
+      @include transition();
+      font-size: $body-font-size;
+      margin: 0  !important;
+      padding: 7px 7px 7px 30px;
+      text-align: left;
+      width: 100%;
+
+      &:hover {
+        @include box-shadow(0 1px 0 #fff);
+        background: #efefef;
+      }
+    }
+
+    ul {
+      li {
+        &.create-article {
+          position: relative;
+
+          h3 {
+            position: relative;
+
+            &:before {
+              background: blue  url(images/ui-icons_454545_256x240.png) -32px -16px no-repeat;
+              display: block;
+              position: absolute;
+              top: 0;
+              right: 0;
+              width: 16px;
+              height: 16px;
+            }
+
+            &:hover {
+              &:before {
+                background-image: url(images/ui-icons_454545_256x240.png) -64px -16px no-repeat;
+              }
+            }
+          }
+        }
+      }
+    }
+    div#wiki_create_form {
+      @extend .clearfix;
+      padding: 15px;
+      background: #d6d6d6;
+      border-bottom: 1px solid #bbb;
+
+      input[type="text"] {
+        margin-bottom: 6px;
+        display: block;
+        width: 100%;
+        @include box-sizing(border-box);
+      }
+
+      ul {
+        li {
+          float: left;
+
+          &#cancel {
+            float: right;
+            margin-top: 10px;
+          }
+        }
+      }
+    }
+  }
+
+  section.wiki-body {
+    @extend .content;
+
+    header {
+      @extend .topbar;
+
+      p {
+        float: left;
+        padding: 15px;
+        margin-bottom: 0;
+        color: darken(#F6EFD4, 55%);
+        line-height: 1em;
+      }
+
+      ul {
+        float: right;
+
+        li {
+          float: left;
+
+          input[type="button"] {
+            @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
+            @include border-radius(0);
+            @include transition();
+            background: darken(#F6EFD4, 5%);
+            border: 0;
+            border-left: 1px solid darken(#f6efd4, 20%);
+            color: darken(#F6EFD4, 80%);
+            text-shadow: none;
+            font-weight: normal;
+            font-size: 12px;
+            text-transform: uppercase;
+            letter-spacing: 1px;
+            padding: 15px;
+            margin: 0;
+
+            &:hover {
+              background: none;
+            }
+          }
+        }
+      }
+    }
+
+    h1.wiki-title {
+      font-weight: bold;
+      padding-bottom: 10px;
+      margin-bottom: 20px;
+      border-bottom: 1px solid #ccc;
+    }
+
+    p {
+      line-height: 1.6em;
+    }
+
+  }
+}
diff --git a/sass/application.scss b/sass/application.scss
index e5169b13a5..f758769c41 100644
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -10,6 +10,7 @@
 @import "courseware";
 @import "textbook";
 @import "profile";
+@import "wiki-create", "wiki";
 
 // left over
 @import "theme";
diff --git a/simplewiki_base.html b/simplewiki_base.html
index 467a2e9332..954d7a7d2f 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -5,135 +5,155 @@
 <%block name="title"><title>${"wiki_title"}</title></%block>
 
 <%block name="headextra">
-<link rel="stylesheet" media="screen,print" href="/static/simplewiki/css/base.css" />
-<link rel="stylesheet" media="print" href="/static/simplewiki/css/base_print.css" />
-<link rel="stylesheet" href="/static/simplewiki/css/autosuggest_inquisitor.css" />
-<link rel="stylesheet" href="/static/css/local.css" type="text/css" media="all" />
-<script type="text/javascript" src="/static/simplewiki/js/bsn.AutoSuggest_c_2.0.js"></script>
+  <!-- <link rel="stylesheet" media="screen,print" href="/static/simplewiki/css/base.css" /> -->
+  <!-- <link rel="stylesheet" media="print" href="/static/simplewiki/css/base_print.css" /> -->
+  <!-- <link rel="stylesheet" href="/static/simplewiki/css/autosuggest_inquisitor.css" /> -->
+  <!-- <link rel="stylesheet" href="/static/css/local.css" type="text/css" media="all" /> -->
+  <script type="text/javascript" src="/static/simplewiki/js/bsn.AutoSuggest_c_2.0.js"></script>
 
-<%!
-    from django.core.urlresolvers import reverse
-%>
+  <%!
+      from django.core.urlresolvers import reverse
+  %>
 
-<script type="text/javascript">
-	function set_related_article_id(s) {
-		document.getElementById('wiki_related_input_id').value = s.id;
-		document.getElementById('wiki_related_input_submit').disabled=false;
-	}
-	%if wiki_article is not UNDEFINED:
-	var x = window.onload;
-	window.onload = function(){
-			var options = {
-			script: "${reverse("search_related", args=[wiki_article.get_url()] )}/?self=${wiki_article.pk}&",
-			json: true,
-			varname: "query",
-			maxresults: 35,
-			callback: set_related_article_id,
-			noresults: "Nothing found!"
-		};
-		var as = new AutoSuggest('wiki_related_input', options);
-		if (typeof x == 'function')
-			x();
-	}
-	%endif
-</script>
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({
-    tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
-              displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
+  <script type="text/javascript">
+    function set_related_article_id(s) {
+      document.getElementById('wiki_related_input_id').value = s.id;
+      document.getElementById('wiki_related_input_submit').disabled=false;
+    }
+    %if wiki_article is not UNDEFINED:
+    var x = window.onload;
+    window.onload = function(){
+        var options = {
+        script: "${reverse("search_related", args=[wiki_article.get_url()] )}/?self=${wiki_article.pk}&",
+        json: true,
+        varname: "query",
+        maxresults: 35,
+        callback: set_related_article_id,
+        noresults: "Nothing found!"
+      };
+      var as = new AutoSuggest('wiki_related_input', options);
+      if (typeof x == 'function')
+        x();
+    }
+    %endif
+  </script>
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+      tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
+                displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
+    });
+  </script> <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> 
+  <script>
+  $(function(){
+  $.ajaxSetup ({
+      // Disable caching of AJAX responses
+      cache: false
   });
-</script> <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> 
-<script>
-$(function(){
-$.ajaxSetup ({
-    // Disable caching of AJAX responses
-    cache: false
-});
 
-$(".div_wiki_circuit").each(function(d,e) {
-   id = $(this).attr("id");
-   name = id.substring(17);
-   //alert(name);
-   $("#"+id).load("/edit_circuit/"+name);
-   f=this;
-});
+  $(".div_wiki_circuit").each(function(d,e) {
+     id = $(this).attr("id");
+     name = id.substring(17);
+     //alert(name);
+     $("#"+id).load("/edit_circuit/"+name);
+     f=this;
+  });
+
+  $("#wiki_create_form").hide();
+
+  $("#create-article").click(function() {
+      $("#wiki_create_form").slideToggle();
+      $(this).parent().toggleClass("active");
+  });
+
+  update_schematics();});
+  </script>
 
-update_schematics();});
-</script>
-<%block name="wiki_head"/>
-</%block>
 
 <%block name="bodyextra">
+  <%block name="wiki_head"/>
+</%block>
 
 <%include file="navigation.html" />
 
 <section class="main-content">
-	<h1><%block name="wiki_page_title"/></h1>
-	<hr />
+  <div class="wiki-wrapper">
+      <%block name="wiki_panel">
 
-	<%block name="wiki_panel">
+    <div id="wiki_panel">
 
-	<div id="wiki_panel">
-	    <div class="wiki_box">
-	    	<div class="wiki_box_header">
-	    		<div class="wiki_box_corner"></div>
-	    		<div class="wiki_box_bar"></div>
-	    	</div>
-	    	<div class="wiki_box_contents" style="position: relative;">
 
-	    	<div style="border: 2px outset #CCC; width: 250px; padding: 10px; background-color: #FFF; position: absolute; right: 100px; top: -80px; display: none; color: #000;" id="wiki_create_form">
-				<%
-					theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'"
-					if (wiki_article is not UNDEFINED):
-						baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
-					else:
-						baseURL = reverse("wiki_view", args=[""])
-					
-				%>
-	    		<form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
-	    			<h2>Create article</h2>
-	    			<p>
-	    			    <label for="id_wiki_article_name">Title of article</label>
-	    			    <input type="text" name="wiki_article_name" id="id_wiki_article_name" /><br/>
-	    			    <label for="id_wiki_article_is_child">Create as a child of current article</label>
-	    			    <input type="checkbox" name="wiki_article_is_child" id="id_wiki_artcile_is_child" disabled="true" ${ 'checked="checked"' if wiki_article is not UNDEFINED else ""}>
-	    			</p>
-	    			<p>
-	    				<input type="button" class="button" value="Cancel" style="display: inline-block; margin-right: 2px;" onclick="document.getElementById('wiki_create_form').style.display='none';" />
-	    				<input type="submit" class="button" value="Next &gt;" style="display: inline-block; margin-right: 2px; font-weight: bold;" />
-	    			</p>
-	    		</form>
-	    	</div>
-	    	<p>
-    	
-		    %if wiki_article is not UNDEFINED:
-	    	    <input type="button" onclick="javascript:location.href='${reverse("wiki_view", args=[wiki_article.get_url()])}'" value="View" style="width: 100%;" class="button"  /><br />
-	    	    <input type="button" onclick="javascript:location.href='${reverse("wiki_edit", args=[wiki_article.get_url()])}'" value="Edit" style="width: 100%;" class="button" ${'disabled="true"' if not wiki_write else ""}/><br />
-	    	    <input type="button" onclick="javascript:location.href='${reverse("wiki_history", args=[wiki_article.get_url(),1])}'" value="History" style="width: 100%;" class="button" />
-	    	%endif
-	    	<input type="button" onclick="document.getElementById('wiki_create_form').style.display='block';" value="Create article" style="width: 100%; margin-bottom: 2px;" class="button" />
-	    	<input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=["wiki_articleget_url"])}'" value="Random article" style="width: 100%; margin-bottom: 2px;" class="button" />
-	    	</p>
-			%if wiki_article is not UNDEFINED:
-				%if wiki_article.locked:
-				<p><strong>This article has been locked</strong></p>
-				%endif
-				<p>
-	    	        <i>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</i>
-	    	    </p>
-			%endif
-	    	</div>
-	    	<div class="wiki_box_footer">
-	    		<div class="wiki_box_corner"></div>
-	    		<div class="wiki_box_bar"></div>
-	    	</div>
-	    </div>
+      <ul class="action">
+        <li>
+          <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=["wiki_articleget_url"])}'" value="Random article" class="button" />
+        </li>
 
-	</div>
+        <li class="create-article">
+          <h3>
+            <a href="#" id="create-article"/>Create Article</a>
+          </h3>
 
-	</%block>
+          <div id="wiki_create_form">
+            <%
+              theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'"
+              if (wiki_article is not UNDEFINED):
+                baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
+              else:
+                baseURL = reverse("wiki_view", args=[""])
+            %>
 
-	<%block name="wiki_body"/>
+            <form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
+
+              <div>
+                <label for="id_wiki_article_name">Title of article</label>
+                <input type="text" name="wiki_article_name" id="id_wiki_article_name" /><br/>
+                <!-- <label for="id_wiki_article_is_child">Create as a child of current article</label> -->
+                <!-- <input type="checkbox" name="wiki_article_is_child" id="id_wiki_artcile_is_child" disabled="true" ${ 'checked="checked"' if wiki_article is not UNDEFINED else ""}> -->
+              </div>
+
+              <ul>
+
+                <li>
+                  <input type="submit" class="button" value="Create" style="display: inline-block; margin-right: 2px; font-weight: bold;" />
+                </li>
+
+              </ul>
+            </form>
+          </div>
+        </li>
+      </ul>
+
+    </div>
+    </%block>
+
+    <section class="wiki-body">
+      <header>
+        %if wiki_article is not UNDEFINED:
+          %if wiki_article.locked:
+            <p><strong>This article has been locked</strong></p>
+          %endif
+            <p>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</p>
+          %endif
+
+        %if wiki_article is not UNDEFINED:
+        <ul>
+          <li>
+            <input type="button" onclick="javascript:location.href='${reverse("wiki_view", args=[wiki_article.get_url()])}'" value="View" />
+          </li>
+          <li>
+            <input type="button" onclick="javascript:location.href='${reverse("wiki_edit", args=[wiki_article.get_url()])}'" value="Edit" ${'disabled="true"' if not wiki_write else ""}/>
+          </li>
+          <li>
+            <input type="button" onclick="javascript:location.href='${reverse("wiki_history", args=[wiki_article.get_url(),1])}'" value="History" class="button" />
+          </li>
+        </ul>
+        %endif
+      </header>
+
+      <h1 class="wiki-title"><%block name="wiki_page_title"/></h1>
+
+      <%block name="wiki_body"/>
+    </section>
+  </div>
 </section>
 
 </%block>
diff --git a/simplewiki_create.html b/simplewiki_create.html
index 04efce56f8..6e250dc527 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -5,17 +5,15 @@
 <%block name="wiki_page_title">
 Create article
 </%block>
+
 <%block name="wiki_body">
 <form method="POST" id="wiki_revision">
-	<div style="display:none">
-	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-	</div>
-	<table id="wiki_revision_table">
-	${ wiki_form }
-	<tr>
-		<td colspan="2" align="right">
-			<input type="submit" value="Create article" /></td>
-	</tr>
-	</table>
+  <div style="display:none">
+    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
+  </div>
+
+  ${ wiki_form }
+
+  <input type="submit" value="Create article" /></td>
 </form>
 </%block>
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index e6a662bd10..fc35c48b30 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -11,12 +11,9 @@ ${ wiki_article.title }
 	<div style="display:none">
 	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
 	</div>
-	<table id="wiki_revision_table">
-	${wiki_form}
-	<tr>
-		<td colspan="2" align="right">
-			<input type="submit" value="Edit article" /></td>
-	</tr>
-	</table>
+
+  ${wiki_form}
+
+  <input type="submit" value="Edit article" /></td>
 </form>
 </%block>
diff --git a/simplewiki_view.html b/simplewiki_view.html
index d655531173..31511e5d92 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -3,11 +3,11 @@
 <%inherit file="simplewiki_base.html"/>
 
 <%block name="wiki_page_title">
-${ wiki_article.title }
+  ${ wiki_article.title }
 </%block>
-<%block name="wiki_body">
 
-<div id="wiki_article">
-	${ wiki_article.current_revision.contents_parsed| n}
-</div>
+<%block name="wiki_body">
+  <div id="wiki_article">
+    ${ wiki_article.current_revision.contents_parsed| n}
+  </div>
 </%block>