From b9fee9e886498fd182a58cc1c098af7ccf72c494 Mon Sep 17 00:00:00 2001 From: Glandos Date: Wed, 1 Dec 2021 22:42:20 +0100 Subject: [PATCH] Rework flash messages (#943) --- ihatemoney/static/css/main.css | 13 ++------ ihatemoney/templates/layout.html | 31 +++++++++++++------ .../templates/sidebar_table_layout.html | 4 +++ 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ihatemoney/static/css/main.css b/ihatemoney/static/css/main.css index 9c8e2050..5964c50a 100644 --- a/ihatemoney/static/css/main.css +++ b/ihatemoney/static/css/main.css @@ -456,17 +456,8 @@ tr.payer_line .balance-name { margin-top: 10px; } -.messages { - display: flex; - justify-content: center; - position: absolute; - top: 4.5rem; - width: 100%; - pointer-events: none; -} - -.messages .alert { - pointer-events: auto; +.flash { + z-index: 1031; } .light { diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html index 356801f9..f6c8f4a2 100644 --- a/ihatemoney/templates/layout.html +++ b/ihatemoney/templates/layout.html @@ -1,4 +1,22 @@ {% import "forms.html" as forms %} + +{% macro flash_messages(classes='') %} +{% with messages = get_flashed_messages(with_categories=true) %} +{% if messages %} +
+ {% for category, message in messages %} +
+ {{ message }} + +
+ {% endfor %} +
+{% endif %} +{% endwith %} +{% endmacro %} + @@ -120,16 +138,9 @@ {% endblock %} -
- {% for category, message in get_flashed_messages(with_categories=true) %} -
- {{ message }} - -
- {% endfor %} -
+ {% if not messages_shown %} + {{ flash_messages(classes="w-100 justify-content-center") }} + {% endif %} {% block footer %}