From: Kostas Papadimitriou <kpap@grnet.gr>
Date: Wed, 3 Jul 2013 07:52:44 +0000 (+0300)
Subject: Merge branch 'hotfix-0.14.1' into develop
X-Git-Tag: 0.15rc1~24^2
X-Git-Url: https://code.grnet.gr/git/snf-cloudcms/commitdiff_plain/11b7656042e3ca307f6d9fcd83ac1f9780d8419b?hp=4c0d8061d9bc2f21c7ba9d5982ac7b9a55d39a2d

Merge branch 'hotfix-0.14.1' into develop

Conflicts:
	version
---

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index a947c70..3b3a142 100644
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -85,11 +85,13 @@
           </div>
           {% endif %}
 		  {% if messages %}
-		  <ul class="messages">
 			  {% for message in messages %}
-			  <li{% if message.tags %}
-			      class="{{ message.tags }}"{% endif %}>
-			      {{ message }}</li>
+              <div class="top-msg active {{ message.tags }}">
+                <div class="msg">
+                  {{ message }}
+              <a href="#" title="close" class="close">X</a>
+                </div>
+              </div>
 			  {% endfor %}
 		  </ul>
 		  {% endif %}
diff --git a/version b/version
index ce2f120..e81d965 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.14next
\ No newline at end of file
+0.14next