Change some names

This commit is contained in:
Matt Wright
2012-08-22 16:55:31 -04:00
parent 8465fc4818
commit 68648c299f
6 changed files with 26 additions and 26 deletions
@@ -1,12 +0,0 @@
{% from "security/_macros.html" import render_field_with_errors, render_field %}
{% include "security/_messages.html" %}
<h1>Login</h1>
<form action="{{ url_for_security('login') }}" method="POST" name="login_form">
{{ 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) }}
</form>
{% include "security/_menu.html" %}
@@ -0,0 +1,12 @@
{% from "security/_macros.html" import render_field_with_errors, render_field %}
{% include "security/_messages.html" %}
<h1>Login</h1>
<form action="{{ url_for_security('login') }}" method="POST" name="login_user_form">
{{ 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) }}
</form>
{% include "security/_menu.html" %}
@@ -1,9 +1,9 @@
{% from "security/_macros.html" import render_field_with_errors, render_field %}
{% include "security/_messages.html" %}
<h1>Resend confirmation instructions</h1>
<form action="{{ url_for_security('send_confirmation') }}" method="POST" name="reset_confirmation_form">
{{ reset_confirmation_form.hidden_tag() }}
{{ render_field_with_errors(reset_confirmation_form.email) }}
{{ render_field(reset_confirmation_form.submit) }}
<form action="{{ url_for_security('send_confirmation') }}" method="POST" name="send_confirmation_form">
{{ send_confirmation_form.hidden_tag() }}
{{ render_field_with_errors(send_confirmation_form.email) }}
{{ render_field(send_confirmation_form.submit) }}
</form>
{% include "security/_menu.html" %}
@@ -1,10 +1,10 @@
{% from "security/_macros.html" import render_field_with_errors, render_field %}
{% include "security/_messages.html" %}
<h1>Login</h1>
<form action="{{ url_for_security('login') }}" method="POST" name="login_form">
{{ login_form.hidden_tag() }}
{{ render_field_with_errors(login_form.email) }}
{{ render_field(login_form.next) }}
{{ render_field(login_form.submit) }}
<form action="{{ url_for_security('login') }}" method="POST" name="send_login_form">
{{ 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) }}
</form>
{% include "security/_menu.html" %}
+5 -5
View File
@@ -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'))