Swapped announcements and flashed messages

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');">&times;</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>