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

mail view refactoring

Browse source
This commit is contained in:
Éloi Rivard 2022-01-11 21:11:54 +01:00
parent 52e802b34f
commit b47f0e0414
4 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
canaille/admin/mail.py → canaille/admin.py
View file

@ -15,7 +15,7 @@ from wtforms.validators import DataRequired
from wtforms.validators import Email
bp = Blueprint("mails", __name__, url_prefix="/mail")
bp = Blueprint("admin", __name__, url_prefix="/admin")
class MailTestForm(FlaskForm):
@ -33,7 +33,7 @@ class MailTestForm(FlaskForm):
)
@bp.route("/", methods=["GET", "POST"])
@bp.route("/mail", methods=["GET", "POST"])
@permissions_needed("manage_oidc")
def mail_index(user):
form = MailTestForm(request.form or None)
@ -46,7 +46,7 @@ def mail_index(user):
return render_template("mail/admin.html", form=form)
@bp.route("/password-init.html")
@bp.route("/mail/password-init.html")
@permissions_needed("manage_oidc")
def password_init_html(user):
base_url = url_for("account.index", _external=True)
@ -69,7 +69,7 @@ def password_init_html(user):
)
@bp.route("/password-init.txt")
@bp.route("/mail/password-init.txt")
@permissions_needed("manage_oidc")
def password_init_txt(user):
base_url = url_for("account.index", _external=True)
@ -88,7 +88,7 @@ def password_init_txt(user):
)
@bp.route("/reset.html")
@bp.route("/mail/reset.html")
@permissions_needed("manage_oidc")
def password_reset_html(user):
base_url = url_for("account.index", _external=True)
@ -111,7 +111,7 @@ def password_reset_html(user):
)
@bp.route("/reset.txt")
@bp.route("/mail/reset.txt")
@permissions_needed("manage_oidc")
def password_reset_txt(user):
base_url = url_for("account.index", _external=True)
@ -130,7 +130,7 @@ def password_reset_txt(user):
)
@bp.route("/<uid>/<email>/invitation.html")
@bp.route("/mail/<uid>/<email>/invitation.html")
@permissions_needed("manage_oidc")
def invitation_html(user, uid, email):
base_url = url_for("account.index", _external=True)
@ -153,7 +153,7 @@ def invitation_html(user, uid, email):
)
@bp.route("/<uid>/<email>/invitation.txt")
@bp.route("/mail/<uid>/<email>/invitation.txt")
@permissions_needed("manage_oidc")
def invitation_txt(user, uid, email):
base_url = url_for("account.index", _external=True)

7
canaille/admin/__init__.py
View file

@ -1,7 +0,0 @@
from flask import Blueprint
from . import mail
bp = Blueprint("admin", __name__, url_prefix="/admin")
bp.register_blueprint(mail.bp)

12
canaille/templates/mail/admin.html
View file

@ -36,8 +36,8 @@
<div class="item">
<div class="right floated content">
<div class="ui buttons">
<a class="ui button" href="{{ url_for("admin.mails.password_init_txt") }}">TXT</a>
<a class="ui button" href="{{ url_for("admin.mails.password_init_html") }}">HTML</a>
<a class="ui button" href="{{ url_for("admin.password_init_txt") }}">TXT</a>
<a class="ui button" href="{{ url_for("admin.password_init_html") }}">HTML</a>
</div>
</div>
<div class="middle aligned content">
@ -48,8 +48,8 @@
<div class="item">
<div class="right floated content">
<div class="ui buttons">
<a class="ui button" href="{{ url_for("admin.mails.password_reset_txt") }}">TXT</a>
<a class="ui button" href="{{ url_for("admin.mails.password_reset_html") }}">HTML</a>
<a class="ui button" href="{{ url_for("admin.password_reset_txt") }}">TXT</a>
<a class="ui button" href="{{ url_for("admin.password_reset_html") }}">HTML</a>
</div>
</div>
<div class="middle aligned content">
@ -60,8 +60,8 @@
<div class="item">
<div class="right floated content">
<div class="ui buttons">
<a class="ui button" href="{{ url_for("admin.mails.invitation_txt", uid=user.uid, email=user.mail[0]) }}">TXT</a>
<a class="ui button" href="{{ url_for("admin.mails.invitation_html", uid=user.uid, email=user.mail[0]) }}">HTML</a>
<a class="ui button" href="{{ url_for("admin.invitation_txt", uid=user.uid, email=user.mail[0]) }}">TXT</a>
<a class="ui button" href="{{ url_for("admin.invitation_html", uid=user.uid, email=user.mail[0]) }}">HTML</a>
</div>
</div>
<div class="middle aligned content">

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

@ -76,7 +76,7 @@
<i class="user secret icon"></i>
{% trans %}Codes{% endtrans %}
</a>
<a class="item" href="{{ url_for('admin.mails.mail_index') }}">
<a class="item" href="{{ url_for('admin.mail_index') }}">
<i class="user mail icon"></i>
{% trans %}Emails{% endtrans %}
</a>