diff --git a/flask_security/templates/security/login.html b/flask_security/templates/security/login.html deleted file mode 100644 index 7dd3673..0000000 --- a/flask_security/templates/security/login.html +++ /dev/null @@ -1,12 +0,0 @@ -{% from "security/_macros.html" import render_field_with_errors, render_field %} -{% include "security/_messages.html" %} -

Login

-
- {{ login_form.hidden_tag() }} - {{ render_field_with_errors(login_form.email) }} - {{ render_field_with_errors(login_form.password) }} - {{ render_field_with_errors(login_form.remember) }} - {{ render_field(login_form.next) }} - {{ render_field(login_form.submit) }} -
-{% include "security/_menu.html" %} \ No newline at end of file diff --git a/flask_security/templates/security/login_user.html b/flask_security/templates/security/login_user.html new file mode 100644 index 0000000..d781ce0 --- /dev/null +++ b/flask_security/templates/security/login_user.html @@ -0,0 +1,12 @@ +{% from "security/_macros.html" import render_field_with_errors, render_field %} +{% include "security/_messages.html" %} +

Login

+
+ {{ login_user_form.hidden_tag() }} + {{ render_field_with_errors(login_user_form.email) }} + {{ render_field_with_errors(login_user_form.password) }} + {{ render_field_with_errors(login_user_form.remember) }} + {{ render_field(login_user_form.next) }} + {{ render_field(login_user_form.submit) }} +
+{% include "security/_menu.html" %} \ No newline at end of file diff --git a/flask_security/templates/security/register.html b/flask_security/templates/security/register_user.html similarity index 100% rename from flask_security/templates/security/register.html rename to flask_security/templates/security/register_user.html diff --git a/flask_security/templates/security/send_confirmation.html b/flask_security/templates/security/send_confirmation.html index d4dc2ed..3e82840 100644 --- a/flask_security/templates/security/send_confirmation.html +++ b/flask_security/templates/security/send_confirmation.html @@ -1,9 +1,9 @@ {% from "security/_macros.html" import render_field_with_errors, render_field %} {% include "security/_messages.html" %}

Resend confirmation instructions

-
- {{ reset_confirmation_form.hidden_tag() }} - {{ render_field_with_errors(reset_confirmation_form.email) }} - {{ render_field(reset_confirmation_form.submit) }} + + {{ send_confirmation_form.hidden_tag() }} + {{ render_field_with_errors(send_confirmation_form.email) }} + {{ render_field(send_confirmation_form.submit) }}
{% include "security/_menu.html" %} \ No newline at end of file diff --git a/flask_security/templates/security/send_login.html b/flask_security/templates/security/send_login.html index 7a2c872..2645b97 100644 --- a/flask_security/templates/security/send_login.html +++ b/flask_security/templates/security/send_login.html @@ -1,10 +1,10 @@ {% from "security/_macros.html" import render_field_with_errors, render_field %} {% include "security/_messages.html" %}

Login

-
- {{ login_form.hidden_tag() }} - {{ render_field_with_errors(login_form.email) }} - {{ render_field(login_form.next) }} - {{ render_field(login_form.submit) }} + + {{ send_login_form.hidden_tag() }} + {{ render_field_with_errors(send_login_form.email) }} + {{ render_field(send_login_form.next) }} + {{ render_field(send_login_form.submit) }}
{% include "security/_menu.html" %} \ No newline at end of file diff --git a/flask_security/views.py b/flask_security/views.py index ed9b126..e47ea72 100644 --- a/flask_security/views.py +++ b/flask_security/views.py @@ -115,8 +115,8 @@ def login(): do_flash(*msg) return redirect(confirm_url) - return render_template('security/login.html', - login_form=form, + return render_template('security/login_user.html', + login_user_form=form, **_ctx('login')) @@ -138,7 +138,7 @@ def register(): form = RegisterForm(csrf_enabled=not app.testing) if not form.validate_on_submit(): - return render_template('security/register.html', + return render_template('security/register_user.html', register_user_form=form, **_ctx('register')) @@ -184,7 +184,7 @@ def send_login(): form.email.errors.append(get_message('DISABLED_ACCOUNT')[0]) return render_template('security/send_login.html', - login_form=form, + send_login_form=form, **_ctx('send_login')) @@ -221,7 +221,7 @@ def send_confirmation(): do_flash(*msg) return render_template('security/send_confirmation.html', - reset_confirmation_form=form, + send_confirmation_form=form, **_ctx('send_confirmation'))