From c17ca29a290db09a46360c4ccbc3f4e93089d398 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Wed, 25 Jan 2012 19:26:54 -0500
Subject: [PATCH] Added editing instructions on the wiki edit page.

---
 .DS_Store            | Bin 6148 -> 12292 bytes
 sass/.DS_Store       | Bin 6148 -> 6148 bytes
 sass/_wiki.scss      |  27 ++++++++++++++++++++++++++-
 simplewiki_edit.html |  30 +++++++++++++++++++++++++++---
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 5a0cb2b53d4d5186eaa5877d80e607dba3b6c8d0..a630216fad2b616b683bda11c2b2e6803e0fb4f3 100644
GIT binary patch
literal 12292
zcmeHMTWl0n7(U;&(3vtLQ=qg+!KIDTz=Ca4?ijYqmP>`u(3TdcF0(sRI&r$w?98@k
zsZ=yEG1l7?i7{THKA?#{pb{@n#!G?^UWf_AC($<}Ci0-Z=zr$SmeSfMi6MGUa?XFw
ze>s<LzPbFnj4`B&Rx@L@j4_2Om&O8W{-$s{ud_-l(##_Xif1gt2AIQKW;1`5w^T?3
zBmxoviGV~vB5*4pK<{i`lsVq}!YW&dfJESbi2#2-#Hn(bjO2un;iH3^Fa;o4PU^5w
zpYnh(CLYOTBqxLnLupQtJs=82lwv@HlReJeNhTvXA*2Xr5aA5b%7`))gsW3rJalJB
z3MpHOfJ9(60z7xGq?|oZnY%YVe|Np(T{&-PI116{@*DEfX{#9I7`w3jiOJBroU(tD
zs-GS8hqJDiCGA_;Vb}44rlxNZD=VKjzd}(e6|KM5$y?rN$}8qA|7h2sH`?V`cGfK1
z7xn`)DEcY05L!CTV2~_fzuWU%>i0+9y^a+OW{ldgvDTKBM7+6m<9H%Iwz;`E5#O+7
z%lNpeDys3gQeD4(`<`y|<oLs<Cc=#}L{AgOk2k%Xroq%PTz{lf93%E-=@^$w$51O5
zX!>pKyLQ)Tdo#wO5yu`qFdR5u-alj)e3BVsp-%_foAdIW1)JM5Mpe#qb4Aw->^9f!
zavrk%-kj$ahw?u6&J{e@?eu(yPjk30uulZsXO^k&i0>7Gonc_cFp9o?(55+^5j#yY
z`+W{A$pa0j%GrgrcQiDvYuU6ddC{m^v{<XwYI;W;-^sdm&nU<5u<7UQyyfJNAE9fI
z51awVE~r&VsNH#U$iBGjc8aRgSKb(<8t*9m7A?2mvv`CR`ssCgy`miD`ke)vTA|kN
z)K{y9sdW3aD>303Euk8|+Wi0#L4@9|H7kat_PA!&c7>`{+o%}#s=XruQK78Xwkm2L
zQFMql>kHjI`VPhTT)CewywCK51H*Qn)?QrIwk%br>(`HXn0vHYmTf6YL+QddBpXF{
zN~1O;n<A^iR<IV9W_|1!E3h#($<DAh*g5ttdyk!GAG0smMRu9}z^<}i*stsw`yDY<
z!ax-kV+mGa4b~!o&1gdkX|$sQUFgOk^r9a&1~3Q*9!}svjNv36!z7-<(>Q~d@d{qW
zYdD9G@EN|s*Z2nC;Ya+8t72!d5{ElV=MWOVk(|!q=vIuqJ_m>Q?Cn^p?Yo6Jd}$$P
z?vm=IHMOhmTHCZ?>yGxR>p$a?Pp4kUHbJM5W+fVhw4TY`<#j7oYI+Z`(LOQrz9=!@
zsNi>nLX=xxSKpxP2Irg@u5P4ZjP40BOsvy2ql_4@hR)3`nr_S^atrImO`2wu6Z?gA
z+jg?fC!Uivxx6j4Qq#l^rq*SV=YmFEQ`9Mz{sZ1#Al6<X&R%1Gus=}&4a-oEMyw~M
zCW)!-*oEEb#6jX}53w}^6FFGK*gS?&fR6y<IE6=W8js>h;_Nec7SG{%ynq++60!Fz
z-o|;nj}P!6KEbEN;V*Fs-{Z;*_U@m--k)w9%hAn8piE3z%k%&Cxqtt^`3uV#B?1zG
zTLuA?r@PWA+D_?9V&=|xt{ta(j4ChOZ$ij0gc|O`^<g?ra_SF5>c=BnGLjQQl7-5@
z{zHHz-~ZRYTjl#dB%y310ulj<fJ8tdAQ6xVNCYGT5&?;TL_i`S5s(P{2NC!StDq!<

delta 192
zcmZokXfcprU|?W$DortDU=RQ@Ie-{MGjUEV6q~50$jH1gU^gQp^JE@@bjG!lO9Ya=
z#Hy<ebQDZ#brh<NOwE8yLsMgm+FDLd4o-n59HL5kHXb2~Rn;}MbwG1~fRPbGGw?!b
z7}c<`@EOZub`B0fW{8jgH;{G(S-!FGJM(0I8Ap)o7=Zd&Kr|D?d0?^4@jP>w0sFBY
AZU6uP

diff --git a/sass/.DS_Store b/sass/.DS_Store
index 293c0b03ea6fbb441f00a77a754e4c2e45cfc19c..108b7e7ea066ae42c27720e922c2616a0145f20e 100644
GIT binary patch
delta 53
zcmZoMXfc@J&&V_}VE1GL5thmPjHkre8Il<C8A=(7z;s?padJ*letyp8hm7KEo7p-3
G@&f>+Mi3SN

delta 30
mcmZoMXfc@J&&W72U^gS<WFE$|o4+s$vrTM}-ptPNmmdI{hYAn?

diff --git a/sass/_wiki.scss b/sass/_wiki.scss
index d05f466048..5263a8494c 100644
--- a/sass/_wiki.scss
+++ b/sass/_wiki.scss
@@ -77,7 +77,32 @@ div.wiki-wrapper {
 
   section.wiki-body {
     @extend .content;
-
+    
+    form#wiki_revision {
+      float: left;
+      width: flex-grid(7, 9);
+      margin-right: flex-gutter(9);
+    }
+  
+    #wiki_edit_instructions {
+      float: left;
+      width: flex-grid(2, 9);
+      
+      .markdown-example {
+        background-color: $light-gray;
+        padding-top: 5px;
+        padding-right: 2px;
+        padding-bottom: 5px;
+        padding-left: 5px;
+        
+        margin-top: 5px;
+        margin-bottom: 7px;
+        margin-left: 5px;
+        
+        line-height: 1.0;
+      }
+    }
+    
     header {
       @extend .topbar;
 
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index fbb4b143a3..be4f7a04eb 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -8,13 +8,37 @@ ${ wiki_article.title }
 
 <%block name="wiki_body">
 <form method="POST" id="wiki_revision">
-	<div style="display:none">
-	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-	</div>
+  <div style="display:none">
+      <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
+  </div>
 
   ${wiki_form}
 
   <input type="submit" name="edit" value="Edit article" />
   <input type="submit" name="delete" value="Delete article" />
 </form>
+
+<div id="wiki_edit_instructions">
+  This wiki uses <strong>Markdown</strong> for styling. There are several <a href="http://daringfireball.net/projects/markdown/basics">useful</a> <a href="http://greg.vario.us/doc/markdown.txt">guides</a> <a href="http://www.lowendtalk.com/discussion/6/miniature-markdown-guide">online</a>.
+  <br>
+  <br>MITx Additions:
+  <p class="markdown-example">circuit:basic</p>
+  <p class="markdown-example"><span>$</span>LaTeX Math Expression<span>$</span></p>
+  To create a new wiki article, create a link to it. Clicking the link gives you the creation page.  
+  <p class="markdown-example">[Article](/wiki/view/Article/Child/)</p>
+  Other useful examples:<br>
+  <p class="markdown-example">[Link](http://google.com)</p>
+  <p class="markdown-example">Huge Header
+  <br>====</p>
+  <p class="markdown-example">Smaller Header
+  <br>-------</p>
+  <p class="markdown-example">*emphasis* or _emphasis_</p>
+  <p class="markdown-example">**strong** or __strong__</p>
+  <p class="markdown-example">- Unordered List
+  <br>&nbsp&nbsp- Sub Item 1
+  <br>&nbsp&nbsp- Sub Item 2</p>
+  <p class="markdown-example">1. Ordered
+  <br>2. List</p>
+</div>
+
 </%block>