From b5167fe8162d7e62caa804ec6fb62f9f2de094a3 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Wed, 25 Jan 2012 20:22:54 -0500
Subject: [PATCH] Added instructions to wiki edit and create pages.

---
 sass/_wiki-create.scss       | 33 +++++++++++++++++++++++++++++++--
 sass/_wiki.scss              | 25 -------------------------
 simplewiki_create.html       |  3 +++
 simplewiki_edit.html         | 29 +++--------------------------
 simplewiki_instructions.html | 22 ++++++++++++++++++++++
 5 files changed, 59 insertions(+), 53 deletions(-)
 create mode 100644 simplewiki_instructions.html

diff --git a/sass/_wiki-create.scss b/sass/_wiki-create.scss
index 5ca3ec9f0f..78bc8434da 100644
--- a/sass/_wiki-create.scss
+++ b/sass/_wiki-create.scss
@@ -1,22 +1,51 @@
 form#wiki_revision {
+  float: left;
+  width: flex-grid(7, 9);
+  margin-right: flex-gutter(9);
+	
+	
   label {
     display: block;
     margin-bottom: 7px ;
   }
 
+
   textarea {
     @include box-sizing(border-box);
     margin-bottom: 20px;
-    min-height: 300px;
+    min-height: 450px;
     width: 100%;
   }
 
   input[type="text"] {
+    display: block;
     width: 50%;
   }
 
+  #submit_delete {
+    float: right;
+  }
+  
   input[type="submit"] {
-    display: block;
     margin-top: 20px;
   }
 }
+
+#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;
+  }
+}
diff --git a/sass/_wiki.scss b/sass/_wiki.scss
index 5263a8494c..b26fe2c6ad 100644
--- a/sass/_wiki.scss
+++ b/sass/_wiki.scss
@@ -78,31 +78,6 @@ 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_create.html b/simplewiki_create.html
index 6e250dc527..3d820310f6 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -16,4 +16,7 @@ Create article
 
   <input type="submit" value="Create article" /></td>
 </form>
+
+<%include file="simplewiki_instructions.html"/>
+
 </%block>
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index be4f7a04eb..fc5f63d970 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -11,34 +11,11 @@ ${ wiki_article.title }
   <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" />
+  <input type="submit" id="submit_edit" name="edit" value="Edit article" />
+  <input type="submit" id="submit_delete" 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>
+<%include file="simplewiki_instructions.html"/>
 
 </%block>
diff --git a/simplewiki_instructions.html b/simplewiki_instructions.html
new file mode 100644
index 0000000000..9f52f4e370
--- /dev/null
+++ b/simplewiki_instructions.html
@@ -0,0 +1,22 @@
+<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>