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

Move flask.messages() to base.html to avoid forgotten pages and message displayed on the wrong page

Browse source
This commit is contained in:
Camille Daniel 2021-07-29 11:50:13 +02:00
parent 9780fc9eed
commit afb9cce267
17 changed files with 3 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
canaille/templates/about.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="ui clearing segment"> <div class="ui clearing segment">
@ -8,7 +7,6 @@
<img class="ui tiny centered image" src="/static/img/canaille-head.png" alt="{{ website_name }}"> <img class="ui tiny centered image" src="/static/img/canaille-head.png" alt="{{ website_name }}">
</a> </a>
{{ flask.messages() }}
<h2 class="ui center aligned header"> <h2 class="ui center aligned header">
<div class="content"> <div class="content">
{{ _("About canaille") }} {{ _("About canaille") }}

3
canaille/templates/admin/authorization_view.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="loginform"> <div class="loginform">
@ -8,8 +7,6 @@
{% trans %}View a authorization{% endtrans %} {% trans %}View a authorization{% endtrans %}
</h3> </h3>
{{ flask.messages() }}
<div class="ui attached clearing segment"> <div class="ui attached clearing segment">
<ul> <ul>
{% for attr in authorization.may %} {% for attr in authorization.may %}

3
canaille/templates/admin/client_add.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="loginform"> <div class="loginform">
@ -8,8 +7,6 @@
{% trans %}Add a client{% endtrans %} {% trans %}Add a client{% endtrans %}
</h3> </h3>
{{ flask.messages() }}
<div class="ui attached clearing segment"> <div class="ui attached clearing segment">
{{ sui.render_form(form, _("Confirm")) }} {{ sui.render_form(form, _("Confirm")) }}
</div> </div>

3
canaille/templates/admin/client_edit.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block script %} {% block script %}
<script src="/static/js/admin/client_edit.js"></script> <script src="/static/js/admin/client_edit.js"></script>
@ -26,8 +25,6 @@
{% trans %}Edit a client{% endtrans %} {% trans %}Edit a client{% endtrans %}
</h3> </h3>
{{ flask.messages() }}
<div class="ui attached clearing segment"> <div class="ui attached clearing segment">
<div class="ui form"> <div class="ui form">
<form id="readonly"> <form id="readonly">

3
canaille/templates/admin/client_list.html
View file

@ -1,5 +1,4 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'flask.j2' as flask %}
{% block style %} {% block style %}
<link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet"> <link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet">
@ -14,8 +13,6 @@
{% block content %} {% block content %}
{{ flask.messages() }}
<div class="ui segment"> <div class="ui segment">
<a class="ui primary button" href="{{ url_for('admin_clients.add') }}">{% trans %}Add client{% endtrans %}</a> <a class="ui primary button" href="{{ url_for('admin_clients.add') }}">{% trans %}Add client{% endtrans %}</a>
</div> </div>

3
canaille/templates/admin/token_view.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="loginform"> <div class="loginform">
@ -8,8 +7,6 @@
{% trans %}View a token{% endtrans %} {% trans %}View a token{% endtrans %}
</h3> </h3>
{{ flask.messages() }}
<div class="ui attached clearing segment"> <div class="ui attached clearing segment">
<ul> <ul>
{% for attr in token.may %} {% for attr in token.may %}

3
canaille/templates/base.html
View file

@ -1,3 +1,5 @@
{% import 'flask.j2' as flask %}
<!doctype html> <!doctype html>
<html lang="fr"> <html lang="fr">
<head> <head>
@ -87,6 +89,7 @@
<div class="ui container"> <div class="ui container">
<div class="content"> <div class="content">
{{ flask.messages() }}
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
</div> </div>

3
canaille/templates/consent_list.html
View file

@ -1,5 +1,4 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'flask.j2' as flask %}
{% block style %} {% block style %}
<link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet"> <link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet">
@ -23,8 +22,6 @@
</div> </div>
</h2> </h2>
{{ flask.messages() }}
{% if consents %} {% if consents %}
<div class="ui centered cards"> <div class="ui centered cards">
{% for consent in consents %} {% for consent in consents %}

3
canaille/templates/firstlogin.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="loginform"> <div class="loginform">
@ -13,8 +12,6 @@
</div> </div>
</h3> </h3>
{{ flask.messages() }}
<div class="ui attached message"> <div class="ui attached message">
{% trans %} {% trans %}
It seems this is the first time you are logging here. In order to finalize your It seems this is the first time you are logging here. In order to finalize your

3
canaille/templates/forgotten-password.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="loginform"> <div class="loginform">
@ -13,8 +12,6 @@
</div> </div>
</h3> </h3>
{{ flask.messages() }}
<div class="ui attached message"> <div class="ui attached message">
{% trans %} {% trans %}
After this form is sent, if the email address or the login you provided After this form is sent, if the email address or the login you provided

3
canaille/templates/group.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block script %} {% block script %}
<script src="/static/js/confirm.js"></script> <script src="/static/js/confirm.js"></script>
@ -58,8 +57,6 @@
</div> </div>
</h2> </h2>
{{ flask.messages() }}
<form method="POST" <form method="POST"
id="{{ form.__class__.__name__|lower }}" id="{{ form.__class__.__name__|lower }}"
action="{{ request.url }}" action="{{ request.url }}"

3
canaille/templates/groups.html
View file

@ -1,9 +1,6 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
{{ flask.messages() }}
<div class="ui segment"> <div class="ui segment">
<a class="ui primary button" href="{{ url_for('groups.create_group') }}">{% trans %}Add a group{% endtrans %}</a> <a class="ui primary button" href="{{ url_for('groups.create_group') }}">{% trans %}Add a group{% endtrans %}</a>
</div> </div>

3
canaille/templates/login.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="ui clearing segment"> <div class="ui clearing segment">
@ -19,8 +18,6 @@
<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 }}"

3
canaille/templates/password.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="ui clearing segment"> <div class="ui clearing segment">
@ -19,8 +18,6 @@
<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 }}"

3
canaille/templates/profile.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block script %} {% block script %}
<script src="/static/js/confirm.js"></script> <script src="/static/js/confirm.js"></script>
@ -52,8 +51,6 @@
</div> </div>
</h2> </h2>
{{ flask.messages() }}
<form method="POST" <form method="POST"
id="{{ form.__class__.__name__|lower }}" id="{{ form.__class__.__name__|lower }}"
action="{{ request.url }}" action="{{ request.url }}"

3
canaille/templates/reset-password.html
View file

@ -1,6 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'fomanticui.j2' as sui %} {% import 'fomanticui.j2' as sui %}
{% import 'flask.j2' as flask %}
{% block content %} {% block content %}
<div class="loginform"> <div class="loginform">
@ -13,8 +12,6 @@
</div> </div>
</h3> </h3>
{{ flask.messages() }}
<div class="ui attached clearing segment"> <div class="ui attached clearing segment">
{{ sui.render_form(form, _("Password reset"), action=url_for("account.reset", uid=uid, hash=hash)) }} {{ sui.render_form(form, _("Password reset"), action=url_for("account.reset", uid=uid, hash=hash)) }}
</div> </div>

3
canaille/templates/users.html
View file

@ -1,5 +1,4 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% import 'flask.j2' as flask %}
{% block style %} {% block style %}
<link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet"> <link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet">
@ -13,8 +12,6 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{{ flask.messages() }}
<div class="ui segment"> <div class="ui segment">
<a class="ui primary button" href="{{ url_for('account.profile_creation') }}">{% trans %}Add a user{% endtrans %}</a> <a class="ui primary button" href="{{ url_for('account.profile_creation') }}">{% trans %}Add a user{% endtrans %}</a>
</div> </div>