Merge branch 'feature-newstyles' into release-0.13

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

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index 34961fe..c1ae4e6 100644 (file)
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -28,7 +28,6 @@
   {% endblock css %}
 
   {% block headjs %}
-     
       <script src="{{ MEDIA_URL }}cloudcms/js/jquery-1.7.1.min.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/underscore.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/jquery.infieldlabel.js"></script>
@@ -84,6 +83,15 @@
             </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>
@@ -123,16 +131,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">