From 9894b49cbd2c41a8ec139381774de7b0cc238631 Mon Sep 17 00:00:00 2001 From: Diman0 Date: Fri, 24 Sep 2021 10:07:52 +0200 Subject: [PATCH] Merge/Update with changes from master --- core/admin/mailu/sso/forms.py | 2 + core/admin/mailu/sso/templates/base_sso.html | 72 +++++++++++++------ core/admin/mailu/sso/templates/form_sso.html | 10 +-- core/admin/mailu/sso/templates/login.html | 16 ++--- .../mailu/sso/templates/sidebar_sso.html | 43 ++++++----- core/admin/mailu/sso/views/base.py | 20 ++++-- core/nginx/conf/nginx.conf | 4 +- 7 files changed, 109 insertions(+), 58 deletions(-) diff --git a/core/admin/mailu/sso/forms.py b/core/admin/mailu/sso/forms.py index bc2b5363..8b5f4cba 100644 --- a/core/admin/mailu/sso/forms.py +++ b/core/admin/mailu/sso/forms.py @@ -11,6 +11,8 @@ LOCALPART_REGEX = "^[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_` class LoginForm(flask_wtf.FlaskForm): class Meta: csrf = False + target = fields.SelectField( u'Go to' ) email = fields.StringField(_('E-mail'), [validators.Email()]) pw = fields.PasswordField(_('Password'), [validators.DataRequired()]) submit = fields.SubmitField(_('Sign in')) + diff --git a/core/admin/mailu/sso/templates/base_sso.html b/core/admin/mailu/sso/templates/base_sso.html index 0edd692c..062adf36 100644 --- a/core/admin/mailu/sso/templates/base_sso.html +++ b/core/admin/mailu/sso/templates/base_sso.html @@ -1,55 +1,83 @@ -{% import "macros.html" as macros %} -{% import "bootstrap/utils.html" as utils %} +{%- import "macros.html" as macros %} +{%- import "bootstrap/utils.html" as utils %} - + - + + + + + Mailu-Admin | {{ config["SITENAME"] }} - Mailu - {{ config["SITENAME"] }}
-