Bump version to 0.14next

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

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index e657d47..a947c70 100644 (file)
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -15,7 +15,8 @@
   {% endblock favicons %}
 
   {% block css %}
-      <link href='https://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin' rel='stylesheet' type='text/css'>
+      
+      <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&subset=latin,greek-ext,greek' rel='stylesheet' type='text/css'>
       <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/global.css">
       <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/print.css" media="print">
       <!--[if lte IE 7]>
@@ -27,14 +28,17 @@
   {% endblock css %}
 
   {% block headjs %}
+      <script src="https://www.youtube.com/iframe_api"></script>
       <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>
       <script src="{{ MEDIA_URL }}cloudcms/js/jquery.colorbox.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/jquery.dropkick-1.0.0.js"></script>
+      <script src="{{ MEDIA_URL }}cloudcms/js/jquery.tablesorter.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/common.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/forms.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/os.js"></script>
+      <script src="{{ MEDIA_URL }}cloudcms/js/jquery-ui-1.8.21.custom.min.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/resources_list.js"></script> 
   {% endblock headjs %}
 
@@ -71,19 +75,24 @@
     {% block page.mainbody %}
      
     <div class="container">
-        <div class="wrapper">
-
-            {% if messages %}
-            <div class="top-msg active info">
-                {% for message in messages %}
-                <div class="msg {% if message.tags %}{{ message.tags }}{% endif %}">
-                    {{ message }}
-                </div>
-                {% endfor %}
-                <a href="#" title="close" class="close">X</a>
+       <div class="wrapper">
+          {% if APP.message_type != 'NM' %}
+          <div class="top-msg active {{ APP.message_type }}">
+            <div class="msg">
+                {{ APP.custom_message|safe }}
+              <a href="#" title="close" class="close">X</a>
             </div>
-            {% endif %}
-    
+          </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>
@@ -96,6 +105,9 @@
                        {% 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 %}