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 (file)
--- 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 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.14next\r
\ No newline at end of file
+0.14next