Merge branch 'develop'

1 files changed, 25 insertions, 13 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 652df14b3..e5af101d5 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -44,6 +44,7 @@
     var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deal with only your items.' %}";
     var search_pinned_msg = "{% trans 'Search pinned' %}";
     var added_message = "{% trans " items added." %}";
+    var select_only_one_msg = "{% trans "Select only one item." %}";
     var YES = "{% trans 'yes' %}";
     var NO = "{% trans 'no' %}";
     var autorefresh_message_start = "{% trans 'Autorefresh start. The form is disabled.' %}";
@@ -107,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">
@@ -129,6 +138,9 @@
             </button>
         </div>
         {% endfor %}{% endif %}
+        <div id="window_wrapper">
+            <div id="window" role="tablist"></div>
+        </div>
         {% block content %}{% endblock %}
     </div>