Merge branch 'feature-newstyles' into develop

[snf-cloudcms] / cloudcms / templates / cms / base.html

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index 7f1fe76..a947c70 100644 (file)
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -79,11 +79,20 @@
           {% if APP.message_type != 'NM' %}
           <div class="top-msg active {{ APP.message_type }}">
             <div class="msg">
-                {{ APP.custom_message }}
+                {{ APP.custom_message|safe }}
               <a href="#" title="close" class="close">X</a>
             </div>
           </div>
           {% endif %}
+                 {% if messages %}
+                 <ul class="messages">
+                         {% for message in messages %}
+                         <li{% if message.tags %}
+                             class="{{ message.tags }}"{% endif %}>
+                             {{ message }}</li>
+                         {% endfor %}
+                 </ul>
+                 {% endif %}
                <div class="mainlogo">
                        {% if APP.logo %}
                                <h1>
@@ -126,16 +135,6 @@
                </div>
            </div>    
     </div>
-    {% if messages %}
-    <ul class="messages">
-        {% for message in messages %}
-        <li{% if message.tags %}
-            class="{{ message.tags }}"{% endif %}>
-            {{ message }}</li>
-        {% endfor %}
-    </ul>
-    {% endif %}
-    
     
     <div class="footer">
         <div class="wrapper">