From 78073347ae879731bec963b57cd605b2c25275e7 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Mon, 21 Aug 2017 18:42:40 +0200
Subject: [PATCH] Swapped announcements and flashed messages
---
templates/base.html | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index d6813a7..ae8284d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -128,11 +128,6 @@
{% else %}
<div class="col-xs-12 col-md-offset-{{ page_border }} col-md-{{ 12-(2*page_border) }}">
{% endif %}
- {% block alerts %}
- {% for msg in get_flashed_messages(category_filter=["message"]) %}
- <div class="hidden-print alert alert-danger" role="alert">{{ msg|safe }}</div>
- {% endfor %}
- {% endblock %}
{% for msg in get_announcements(min_announcement_level) if (not request.cookies['alert-info-'+msg.id|string]) %}
<div class="hidden-print alert alert-{{levels.get(msg.level, ('info', ''))[0]}}" role="alert">
<a href="#" class="close" data-dismiss="alert" aria-label="close" onclick="Cookies.set('alert-info-{{msg.id}}', '1');">×</a>
@@ -141,6 +136,11 @@
{% endfor %}
{% block content %}
{% endblock %}
+ {% block alerts %}
+ {% for msg in get_flashed_messages(category_filter=["message"]) %}
+ <div class="hidden-print alert alert-danger" role="alert">{{ msg|safe }}</div>
+ {% endfor %}
+ {% endblock %}
</div>
</div>
</div>
--
GitLab