From aea197d8c337007b03b711498ea4c69ceb133b47 Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Wed, 31 Mar 2010 18:06:06 -0400
Subject: [PATCH] move moderation form into own div

---
 markupwiki/templates/markupwiki/article.html | 28 +++++++++++---------
 markupwiki/views.py                          |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/markupwiki/templates/markupwiki/article.html b/markupwiki/templates/markupwiki/article.html
index a1308af..ce42193 100644
--- a/markupwiki/templates/markupwiki/article.html
+++ b/markupwiki/templates/markupwiki/article.html
@@ -20,22 +20,24 @@
     {% if article %}
         <a href="{% url article_history article.title %}">view history</a>
     {% endif %}
-
-    {% if article and form %}
-    <form method="POST" action="{% url update_article_status article.title %}">
-        <ul>
-        <li>{{form.status.label_tag}}  {{ form.status }}</li>
-        <li>
-        <button class="updateBtn" type="submit">
-            <span>Update</span>
-        </button>
-        </li>
-        </ul>
-    </form>
-    {% endif %}
 {% endblock %}
 </div>
 
+{% if article and mod_form %}
+<div class="article_moderation">
+<form method="POST" action="{% url update_article_status article.title %}">
+    <ul>
+    <li>{{mod_form.status.label_tag}}  {{ mod_form.status }}</li>
+    <li>
+    <button class="updateBtn" type="submit">
+        <span>Update</span>
+    </button>
+    </li>
+    </ul>
+</form>
+</div>
+{% endif %}
+
 <div class="article_body">
 {% block article_body %}
 {% if article.is_deleted %}
diff --git a/markupwiki/views.py b/markupwiki/views.py
index daf47eb..f03dff8 100644
--- a/markupwiki/views.py
+++ b/markupwiki/views.py
@@ -52,7 +52,7 @@ def view_article(request, title, n=None):
     context = {'article':article, 'version': version}
 
     if request.user.is_staff:
-        context['form'] = StaffModerationForm(instance=article)
+        context['mod_form'] = StaffModerationForm(instance=article)
 
     return render_to_response('markupwiki/article.html', context,
                               context_instance=RequestContext(request))