From: Kostas Papadimitriou <kpap@grnet.gr>
Date: Tue, 9 Apr 2013 09:48:29 +0000 (+0300)
Subject: Merge branch 'feature-newstyles' into release-0.13
X-Git-Tag: 0.14rc1~6
X-Git-Url: https://code.grnet.gr/git/snf-cloudcms/commitdiff_plain/0988bfac78a5983e9dd80984390aad738807339c

Merge branch 'feature-newstyles' into release-0.13

Conflicts:
	cloudcms/templates/cms/base.html
---

0988bfac78a5983e9dd80984390aad738807339c
diff --cc cloudcms/templates/cms/base.html
index 71b346b,34961fe..c1ae4e6
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@@ -74,19 -75,15 +74,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 }}
+               <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>