scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-30 01:32:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

show flash messages again

Browse Source 
This basically restores the behaviour, that got removed in
ecdf0c25b3 during refactoring.

(cherry picked from commit 88f992de16)

# Conflicts:
#	core/admin/mailu/ui/templates/base.html
This commit is contained in:
lub
2021-02-13 13:34:44 +01:00
committed by Mergify
parent 6b5bb5fcd1
commit 0cd274491a
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/admin/mailu/ui/templates/base.html
View File

@@ -1,5 +1,10 @@
<<<<<<< HEAD
{%- import "macros.html" as macros %}
{%- import "bootstrap/utils.html" as utils %}
=======
{% import "macros.html" as macros %}
{% import "bootstrap/utils.html" as utils %}
>>>>>>> 88f992de (show flash messages again)
<!doctype html>
<html lang="{{ get_locale() }}" data-static="/static/">
<head>
@@ -64,6 +69,18 @@
</div>
</div>
</div>
<<<<<<< HEAD
=======
<h1>
{% block title %}{% endblock %}
<small>{% block subtitle %}{% endblock %}</small>
</h1>
</section>
<section class="content">
{{ utils.flashed_messages(container=False) }}
{% block content %}{% endblock %}
>>>>>>> 88f992de (show flash messages again)
</section>
<div class="content">
{{ utils.flashed_messages(container=False, default_category='success') }}