Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Video AG Infrastruktur
website
Commits
78073347
Commit
78073347
authored
Aug 21, 2017
by
Julian Rother
Browse files
Swapped announcements and flashed messages
parent
a04fee6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
templates/base.html
View file @
78073347
...
...
@@ -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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment