From 66c8c7fa80e2e1494a37503e86ccf2bb3188b87c Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 19 Nov 2018 20:18:38 +0100
Subject: Manage 1<->n treatments wizard

---
 ishtar_common/templates/base.html | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'ishtar_common/templates/base.html')

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index add4f1d6c..ab2baf955 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -108,20 +108,28 @@
             <ul class="nav nav-pills flex-column" id="window-fixed-menu-list">
             </ul>
         </nav>
-        <div id="window_wrapper">
-            <div id="window" role="tablist"></div>
-        </div>
         <div id="message_list">
-        {% if MESSAGES %}{% for message, message_type in MESSAGES %}
-        <div class="alert alert-{{message_type}} alert-dismissible fade show"
-             role="alert">
-            {{message}}
-            <button type="button" class="close" data-dismiss="alert"
-                    aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        {% endfor %}{% endif %}
+            {% if messages %}
+            {% for message in messages %}
+            <div class="alert alert-{{ message.tags }} alert-dismissible fade show"
+                 role="alert">
+                {{message|safe}}
+                <button type="button" class="close" data-dismiss="alert"
+                        aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>{% endfor %}
+            {% endif %}
+            {% if MESSAGES %}{% for message, message_type in MESSAGES %}
+            <div class="alert alert-{{message_type}} alert-dismissible fade show"
+                 role="alert">
+                {{message}}
+                <button type="button" class="close" data-dismiss="alert"
+                        aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            {% endfor %}{% endif %}
         </div>
         {% if warnings %}{% for warning in warnings %}
         <div class="alert alert-warning alert-dismissible fade show" role="alert">
@@ -130,6 +138,9 @@
             </button>
         </div>
         {% endfor %}{% endif %}
+        <div id="window_wrapper">
+            <div id="window" role="tablist"></div>
+        </div>
         {% block content %}{% endblock %}
     </div>
 
-- 
cgit v1.2.3