ui: Additional Pithos versioninfo.xml client type

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

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index 34961fe..212ec3a 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>
@@ -79,11 +78,22 @@
           {% 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 %}
+                         {% for message in messages %}
+              <div class="top-msg active {{ message.tags }}">
+                <div class="msg">
+                  {{ message }}
+              <a href="#" title="close" class="close">X</a>
+                </div>
+              </div>
+                         {% endfor %}
+                 </ul>
+                 {% endif %}
                <div class="mainlogo">
                        {% if APP.logo %}
                                <h1>
@@ -96,9 +106,12 @@
                        {% endif %}
                    </div>
                <div class="navigation">
+              {% if feincms_page.featured and APP.accounts_url %}
+                  <a class="prompt" href="{{ APP.accounts_url }}">create an account now ></a>
+              {% endif %}
                    <ul>
                        {% block page.nav %}
-                           {% feincms_navigation of feincms_page as sublevel level=2,depth=1 %}
+                           {% feincms_nav feincms_page level=2 depth=1 as sublevel %}
                            {% for p in sublevel %}
                            <li class="{% if p|is_equal_or_parent_of:feincms_page %}active{% endif %}">
                            <a href="{{ p.get_absolute_url }}">{{ p.title }}</a></li>
@@ -108,7 +121,7 @@
                    <ul>
                        {% block page.subnav %}
                            {% if feincms_page.override_url != "/" %}
-                           {% feincms_navigation of feincms_page as sublevel level=3,depth=1 %}
+                           {% feincms_nav feincms_page level=3 depth=1 as sublevel %}
                            {% for p in sublevel %}
                            <li class="{% if p|is_equal_or_parent_of:feincms_page or p.url == request.path %}active{% endif %}">
                            <a href="{{ p.get_absolute_url }}">{{ p.title }}</a></li>
@@ -123,16 +136,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">