From 746433218072baa65337895460cc3e4507c54ca7 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Wed, 22 Aug 2012 15:09:20 -0400
Subject: [PATCH] added fix for error styles and swapped some the button order

---
 lms/static/sass/course/wiki/_wiki.scss | 23 ++++++++++++++++++++++-
 lms/templates/wiki/create.html         |  9 +++++----
 lms/templates/wiki/edit.html           | 17 +++++++++--------
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index 6ddfe0caef..9178f7719f 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -390,7 +390,6 @@ section.wiki {
   .CodeMirror {
     background: #fafafa;
     border: 1px solid #c8c8c8;
-    @include border-radius(3px);
     @include box-shadow(0 1px 0 0 rgba(255, 255, 255, 0.6), inset 0 0 3px 0 rgba(0, 0, 0, 0.1));
   }
 
@@ -690,6 +689,28 @@ section.wiki {
     margin-top: 9px;
   }
 
+  .error {
+    font-size: 1em;
+    color: $pink;
+
+    .help-block {
+      margin-top: 10px;
+    }
+
+    input {
+      border-color: $pink;
+    }
+  }
+
+  .back {
+    float: right;
+  }
+
+
+
+
+
+
   /*-----------------
 
     Directory
diff --git a/lms/templates/wiki/create.html b/lms/templates/wiki/create.html
index 25cc197bc4..886764ba84 100644
--- a/lms/templates/wiki/create.html
+++ b/lms/templates/wiki/create.html
@@ -32,14 +32,15 @@
     <form method="POST" class="form-horizontal">
       {% wiki_form create_form %}
       <div class="form-actions">
-          <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-large">
-            <span class="icon-circle-arrow-left"></span>
-            {% trans "Go back" %}
-          </a>
           <button type="submit" name="save_changes" class="btn btn-primary btn-large">
             <span class="icon-plus"></span>
             {% trans "Create article" %}
           </button>
+
+          <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-large back">
+            <span class="icon-circle-arrow-left"></span>
+            {% trans "Go back" %}
+          </a>
       </div>  
     </form>
 
diff --git a/lms/templates/wiki/edit.html b/lms/templates/wiki/edit.html
index e2c6cb64a5..3d36cf2869 100644
--- a/lms/templates/wiki/edit.html
+++ b/lms/templates/wiki/edit.html
@@ -9,14 +9,14 @@
 <form method="POST" class="form-horizontal" id="article_edit_form" enctype="multipart/form-data">
   {% include "wiki/includes/editor.html" %}
   <div class="form-actions">
-      <button type="submit" name="preview" value="1" class="btn btn-large" onclick="$('#previewModal').modal('show'); this.form.target = 'previewWindow'; this.form.action = '{% url 'wiki:preview' path=urlpath.path article_id=article.id %}';">
-        <span class="icon-eye-open"></span>
-        {% trans "Preview" %}
-      </button>
       <button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'">
         <span class="icon-ok"></span>
         {% trans "Save changes" %}
       </button>
+      <button type="submit" name="preview" value="1" class="btn btn-large" onclick="$('#previewModal').modal('show'); this.form.target = 'previewWindow'; this.form.action = '{% url 'wiki:preview' path=urlpath.path article_id=article.id %}';">
+        <span class="icon-eye-open"></span>
+        {% trans "Preview" %}
+      </button>
       
       <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="pull-right btn btn-danger">
         <span class="icon-trash"></span>
@@ -29,14 +29,15 @@
       <iframe name="previewWindow" frameborder="0"></iframe>
     </div>
     <div class="modal-footer">
-      <a href="#" class="btn btn-large" data-dismiss="modal">
-        <span class="icon-circle-arrow-left"></span>
-        {% trans "Back to editor" %}
-      </a>
       <button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'">
         <span class="icon-ok"></span>
         {% trans "Save changes" %}
       </button>
+
+      <a href="#" class="btn btn-large" data-dismiss="modal">
+        <span class="icon-circle-arrow-left"></span>
+        {% trans "Back to editor" %}
+      </a>
     </div>
   </div>     
 </form>