X-Git-Url: https://code.grnet.gr/git/snf-cloudcms/blobdiff_plain/ff30ee3a6bc7387d159c088a3b7d4194f23ade83..66b454b7f5a15db8e82e777cfd34f350a55a8c8d:/cloudcms/templates/cms/base.html

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index 7f1fe76..212ec3a 100644
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -28,7 +28,6 @@
   {% 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>
@@ -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>
@@ -101,7 +111,7 @@
               {% 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>
@@ -111,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>
@@ -126,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">