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 8a431de..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=Antic" 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,17 +28,17 @@
   {% endblock css %}
 
   {% block headjs %}
-      <script src="{{ MEDIA_URL }}cloudcms/js/modernizr-2.0.6.js"></script>
+      <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.cookie.js"></script>
-      <script src="{{ MEDIA_URL }}cloudcms/js/form-errors.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 %}
 
@@ -75,6 +76,23 @@
      
     <div class="container">
        <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>
+          </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>
@@ -87,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 %}
@@ -114,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">