Combine messages and notifications into the same display element

templates/base_full.html

@@ -132,21 +132,13 @@ s.parentNode.insertBefore(po, s);
     </div>
     <div class="clear"></div>
     {% endif %}
-    {% if messages %}
-    <div id="messages">
-        <div class="grid_12">
-          <ul>
-          {% for message in messages %}
-              <li{%if message.tags %} class="{{message.tags}}"{% endif %}>{{message}}</li>
-          {% endfor %}
-          </ul>
-        </div>
-    </div>
-    {% endif %}
     <div class="grid_12">
-        {% if notices %}
+        {% if notices or messages %}
         <div id="notifications-block">
           <ul>
+            {% for message in messages %}
+              <li class="message {{message.tags}}">{{message}}</li>
+            {% endfor %}
             {% for notice in notices %}
               <li class="notice-unseen-{{notice.unseen}} notice-{{notice.notice_type}}">{{notice.added}} - {{notice.message|safe}}</li>
             {% endfor %}