globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Improved flash messages display on the homepage

Browse source
This commit is contained in:
Éloi Rivard 2022-12-28 00:45:34 +01:00
parent f89d45a3e7
commit b0534896b5
4 changed files with 90 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
canaille/templates/flask.j2
View file

@ -1,7 +1,7 @@
{% macro messages() %} {% macro messages() %}
{% with messages = get_flashed_messages(with_categories=true) %} {% with messages = get_flashed_messages(with_categories=true) %}
{% for category, message in messages %} {% for category, message in messages %}
<div class="ui attached message {{ category }}"> <div class="ui message {{ category }}">
{{ message }} {{ message }}
</div> </div>
{% endfor %} {% endfor %}

9
canaille/templates/login.html
View file

@ -1,7 +1,10 @@
{% extends theme('base.html') %} {% extends theme('base.html') %}
{% import 'flask.j2' as flask %}
{% import 'fomanticui.html' as sui %} {% import 'fomanticui.html' as sui %}
{% block content %} {% block container %}
<div class="ui container">
<div class="content">
<div class="ui clearing segment"> <div class="ui clearing segment">
{% if logo_url %} {% if logo_url %}
<a href="{{ url_for('account.index') }}"> <a href="{{ url_for('account.index') }}">
@ -18,6 +21,8 @@
<div class="sub header">{% trans %}Log-in and manage your authorizations.{% endtrans %}</div> <div class="sub header">{% trans %}Log-in and manage your authorizations.{% endtrans %}</div>
</h2> </h2>
{{ flask.messages() }}
<form method="POST" <form method="POST"
id="{{ form.id or form.__class__.__name__|lower }}" id="{{ form.id or form.__class__.__name__|lower }}"
action="{{ request.url }}" action="{{ request.url }}"
@ -42,4 +47,6 @@
</div> </div>
</form> </form>
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

9
canaille/templates/password.html
View file

@ -1,7 +1,10 @@
{% extends theme('base.html') %} {% extends theme('base.html') %}
{% import 'flask.j2' as flask %}
{% import 'fomanticui.html' as sui %} {% import 'fomanticui.html' as sui %}
{% block content %} {% block container %}
<div class="ui container">
<div class="content">
<div class="ui clearing segment"> <div class="ui clearing segment">
{% if logo_url %} {% if logo_url %}
<a href="{{ url_for('account.index') }}"> <a href="{{ url_for('account.index') }}">
@ -18,6 +21,8 @@
<div class="sub header">{% trans %}Please enter your password for this account.{% endtrans %}</div> <div class="sub header">{% trans %}Please enter your password for this account.{% endtrans %}</div>
</h2> </h2>
{{ flask.messages() }}
<form method="POST" <form method="POST"
id="{{ form.id or form.__class__.__name__|lower }}" id="{{ form.id or form.__class__.__name__|lower }}"
action="{{ request.url }}" action="{{ request.url }}"
@ -39,4 +44,6 @@
</div> </div>
</form> </form>
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

2
canaille/themes/default/base.html
View file

@ -93,12 +93,14 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block container %}
<div class="ui container"> <div class="ui container">
<div class="content"> <div class="content">
{{ flask.messages() }} {{ flask.messages() }}
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
</div> </div>
{% endblock %}
<footer> <footer>
<a href="{{ url_for('account.about') }}">{{ _("About canaille") }}</a> <a href="{{ url_for('account.about') }}">{{ _("About canaille") }}</a>