From 741d5a375dedacfc3867b2e9845fa9c22c1b41bf Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Wed, 29 Jun 2011 14:05:28 +0200
Subject: [PATCH] Put messages.html in grid_12, above content

---
 mediagoblin/templates/mediagoblin/base.html        |  5 +----
 .../templates/mediagoblin/utils/messages.html      | 14 +++++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 58de7325..fbb52803 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -51,16 +51,13 @@
           </div>
         </div>
       {% endblock %}
-      
-      {% include "mediagoblin/utils/messages.html" %}
-
       <div class="container_12 mediagoblin_content">
         <div class="grid_12">
+          {% include "mediagoblin/utils/messages.html" %}
           {% block mediagoblin_content %}
           {% endblock mediagoblin_content %}
         </div>
       </div>
-
       {% block mediagoblin_footer %}
         <div class="mediagoblin_footer">
           <div class="container_12">
diff --git a/mediagoblin/templates/mediagoblin/utils/messages.html b/mediagoblin/templates/mediagoblin/utils/messages.html
index 52d03daa..a8d9c37e 100644
--- a/mediagoblin/templates/mediagoblin/utils/messages.html
+++ b/mediagoblin/templates/mediagoblin/utils/messages.html
@@ -19,14 +19,10 @@
 {# Display any queued messages #}
 {% set messages = fetch_messages(request) %}
 {% if messages %}
-<div class="container_12 mediagoblin_messages">
-  <div class="grid_12">
-    <ul class="mediagoblin_messages">
-      {% for msg in messages %}
-        <li class="message_{{ msg.level }}">{{ msg.text }}</li>
-      {% endfor %}
-    </ul>
-  </div>
-</div>
+  <ul class="mediagoblin_messages">
+    {% for msg in messages %}
+      <li class="message_{{ msg.level }}">{{ msg.text }}</li>
+    {% endfor %}
+  </ul>
 {% endif %}