diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2016-01-23 14:01:03 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2016-01-25 01:56:14 +0100 |
commit | b841c0b8e39e98f9cda8b86404eb3c5b79d175f0 (patch) | |
tree | 746eb8e716f8ad634af64c0358ececda60c70a26 /accounts/templates | |
parent | 899947bd00df10cca15aca1b3c14125b38b35ecf (diff) | |
download | web-b841c0b8e39e98f9cda8b86404eb3c5b79d175f0.tar.gz web-b841c0b8e39e98f9cda8b86404eb3c5b79d175f0.tar.bz2 web-b841c0b8e39e98f9cda8b86404eb3c5b79d175f0.zip |
Render most forms automatically, csrf is also only a field
Most forms could be rendered in a loop, so that it automatically contains
all fields. The csrf field is only a field, too. So that it could be rendered
with render_field, too.
Diffstat (limited to 'accounts/templates')
-rw-r--r-- | accounts/templates/_macros.html | 15 | ||||
-rw-r--r-- | accounts/templates/admin/create_account.html | 8 | ||||
-rw-r--r-- | accounts/templates/admin/disable_account.html | 7 | ||||
-rw-r--r-- | accounts/templates/index.html | 27 | ||||
-rw-r--r-- | accounts/templates/lost_password.html | 17 | ||||
-rw-r--r-- | accounts/templates/lost_password_complete.html | 11 | ||||
-rw-r--r-- | accounts/templates/register.html | 6 | ||||
-rw-r--r-- | accounts/templates/register_complete.html | 13 | ||||
-rw-r--r-- | accounts/templates/settings.html | 4 |
9 files changed, 54 insertions, 54 deletions
diff --git a/accounts/templates/_macros.html b/accounts/templates/_macros.html index 58739ae..efb4b2d 100644 --- a/accounts/templates/_macros.html +++ b/accounts/templates/_macros.html @@ -11,6 +11,9 @@ {%- endmacro %} {% macro render_field(field) %} + {% if field.type in ['HiddenField', 'CSRFTokenField'] %} + {{ field()|safe }} + {% else %} <div class="control-group"> {{ field.label }} <div class="controls"> @@ -18,17 +21,7 @@ {{ render_errors(field.errors) }} </div> </div> -{%- endmacro %} - -{% macro render_csrf(form) %} -{{ form.csrf_token }} -{%- if 'csrf_token' in form.errors %} -<div class="control-group"> - <div class="controls"> - {{ render_errors(form.errors.csrf_token) }} - </div> -</div> -{%- endif %} +{% endif %} {%- endmacro %} {% macro render_errors(errors) %} diff --git a/accounts/templates/admin/create_account.html b/accounts/templates/admin/create_account.html index 2a53fd9..208410c 100644 --- a/accounts/templates/admin/create_account.html +++ b/accounts/templates/admin/create_account.html @@ -1,5 +1,5 @@ {%- extends 'base.html' %} -{%- from '_macros.html' import render_field, render_submit, render_csrf %} +{%- from '_macros.html' import render_field, render_submit %} {%- set title = 'Account erstellen' %} {%- block content %} <p> @@ -13,9 +13,9 @@ ein Passwort setzen kann. </p> <form action="" method="post" class="form-horizontal"> - {{ render_field(form.username, autofocus="autofocus") }} - {{ render_field(form.mail) }} + {% for field in form %} + {{ render_field(field) }} + {% endfor %} {{ render_submit(value='Link verschicken')}} - {{ render_csrf(form) }} </form> {%- endblock %} diff --git a/accounts/templates/admin/disable_account.html b/accounts/templates/admin/disable_account.html index b6eccda..9842d6c 100644 --- a/accounts/templates/admin/disable_account.html +++ b/accounts/templates/admin/disable_account.html @@ -1,5 +1,5 @@ {%- extends 'base.html' %} -{%- from '_macros.html' import render_field, render_submit, render_csrf %} +{%- from '_macros.html' import render_field, render_submit %} {%- set title = 'Account deaktivieren' %} {%- block content %} <p> @@ -13,8 +13,9 @@ Accounts, die sicher Spammer sind! </p> <form action="" method="post" class="form-horizontal"> - {{ render_field(form.username, autofocus="autofocus") }} + {% for field in form %} + {{ render_field(field) }} + {% endfor %} {{ render_submit(value='Account deaktivieren')}} - {{ render_csrf(form) }} </form> {%- endblock %} diff --git a/accounts/templates/index.html b/accounts/templates/index.html index 4e98750..4d398de 100644 --- a/accounts/templates/index.html +++ b/accounts/templates/index.html @@ -1,20 +1,21 @@ {%- extends 'base.html' %} -{%- from '_macros.html' import render_field %} +{%- from '_macros.html' import render_field, render_submit %} {%- block content %} +<h2>Login</h2> +<p> + Willkommen bei <strong>spline accounts</strong>. + Melde dich an, + <a href="{{ url_for('about') }}">informier dich</a>, oder + <a href="{{ url_for('register') }}">leg einen Account an</a>. +</p> <form action="{{ url_for('index') }}" method="post" class="form-horizontal"> - <h2>Login</h2> - <p> - Willkommen bei <strong>spline accounts</strong>. - Melde dich an, - <a href="{{ url_for('about') }}">informier dich</a>, oder - <a href="{{ url_for('register') }}">leg einen Account an</a>. - </p> - {{ render_field(form.username, autofocus="autofocus") }} - {{ render_field(form.password) }} - <div class="form-actions"><input type="submit" value="Login" /></div> - <p class="form-actions"><a href="/register">Account erstellen</a></div> - <p class="form-actions"><a href="/lost_password">Passwort oder Benutzername vergessen</a></div> + {% for field in form %} + {{ render_field(field) }} + {% endfor %} + {{ render_submit(value='Login') }} + <p class="form-actions"><a href="{{ url_for('register') }}">Account erstellen</a></div> + <p class="form-actions"><a href="{{ url_for('lost_password') }}">Passwort oder Benutzername vergessen</a></div> </form> {%- endblock %} diff --git a/accounts/templates/lost_password.html b/accounts/templates/lost_password.html index fc1e6b8..11021f1 100644 --- a/accounts/templates/lost_password.html +++ b/accounts/templates/lost_password.html @@ -3,14 +3,17 @@ {%- set title = 'Passwort vergessen' %} {%- set no_login_message = true %} {%- block content %} +<p> + Du hast dein Passwort und/oder deinen Benutzernamen vergessen? Kein Problem. + Gib einfach unten deinen Benutzernamen bzw. E-Mail-Adresse ein, und wir + schicken dir einen Link, mit dem du dir ein neues setzen kannst. + In dieser Mail steht dann auch dein Benutzername. +</p> + <form action="{{ url_for('lost_password') }}" method="post" class="form-horizontal"> - <p> - Du hast dein Passwort und/oder deinen Benutzernamen vergessen? Kein Problem. - Gib einfach unten deinen Benutzernamen bzw. E-Mail-Adresse ein, und wir - schicken dir einen Link, mit dem du dir ein neues setzen kannst. - In dieser Mail steht dann auch dein Benutzername. - </p> - {{ render_field(form.username_or_mail, autofocus="autofocus") }} + {% for field in form %} + {{ render_field(field) }} + {% endfor %} {{ render_submit(value='Weiter')}} </form> {%- endblock %} diff --git a/accounts/templates/lost_password_complete.html b/accounts/templates/lost_password_complete.html index 6ab4a1c..78ef512 100644 --- a/accounts/templates/lost_password_complete.html +++ b/accounts/templates/lost_password_complete.html @@ -3,16 +3,17 @@ {%- set title = 'Passwort vergessen' %} {%- set no_login_message = true %} {%- block content %} +<p> + Hier kannst du jetzt ein neues Passwort setzen. +</p> <form action="{{ url_for('lost_password_complete', token=token) }}" method="post" class="form-horizontal"> - <p> - Hier kannst du jetzt ein neues Passwort setzen. - </p> <div class="control-group"> <div class="control-label">Benutzername</div> <div class="controls"><input readonly="readonly" value="{{ username }}" /></div> </div> - {{ render_field(form.password, autofocus="autofocus") }} - {{ render_field(form.password_confirm) }} + {% for field in form %} + {{ render_field(field) }} + {% endfor %} {{ render_submit(value='Speichern')}} </form> {%- endblock %} diff --git a/accounts/templates/register.html b/accounts/templates/register.html index 7f56280..c317396 100644 --- a/accounts/templates/register.html +++ b/accounts/templates/register.html @@ -14,9 +14,9 @@ geändert werden. </p> <form action="{{ url_for('register') }}" method="post" class="form-horizontal"> - {{ render_field(form.username, autofocus="autofocus") }} - {{ render_field(form.mail) }} - {{ render_field(form.question) }} + {% for field in form %} + {{ render_field(field) }} + {% endfor %} {{ render_submit(value='E-Mail-Adresse bestätigen')}} </form> {%- endblock %} diff --git a/accounts/templates/register_complete.html b/accounts/templates/register_complete.html index 633f446..d5cec72 100644 --- a/accounts/templates/register_complete.html +++ b/accounts/templates/register_complete.html @@ -3,11 +3,11 @@ {%- set title = 'Account erstellen' %} {%- set no_login_message = true %} {%- block content %} +<p> + Deine E-Mail-Adresse wurde erfolgreich bestätigt. + Bitte setze nun ein Passwort, um die Registrierung abzuschließen. +</p> <form action="{{ url_for('register_complete', token=token) }}" method="post" class="form-horizontal"> - <p> - Deine E-Mail-Adresse wurde erfolgreich bestätigt. - Bitte setze nun ein Passwort, um die Registrierung abzuschließen. - </p> <div class="control-group"> <div class="control-label">Benutzername</div> <div class="controls"><input readonly="readonly" value="{{ username }}" /></div> @@ -16,8 +16,9 @@ <div class="control-label">E-Mail-Adresse</div> <div class="controls"><input readonly="readonly" value="{{ mail }}" /></div> </div> - {{ render_field(form.password, autofocus="autofocus") }} - {{ render_field(form.password_confirm) }} + {% for field in form %} + {{ render_field(field) }} + {% endfor %} {{ render_submit(value='Registrieren')}} </form> {%- endblock %} diff --git a/accounts/templates/settings.html b/accounts/templates/settings.html index dcae7ff..58f2079 100644 --- a/accounts/templates/settings.html +++ b/accounts/templates/settings.html @@ -1,5 +1,5 @@ {%- extends 'base.html' %} -{%- from '_macros.html' import render_field, render_csrf, render_submit %} +{%- from '_macros.html' import render_field, render_submit %} {%- set title = 'Einstellungen' %} {%- block content %} <form action="{{ url_for('settings') }}" method="post" class="form-horizontal"> @@ -9,7 +9,7 @@ {{ render_field(form.old_password) }} {{ render_field(form.password) }} {{ render_field(form.password_confirm) }} - {{ render_csrf(form) }} + {{ render_field(form.csrf_token) }} {{ render_submit(value='Speichern',name='submit_main') }} <h2>Dienste verwalten</h2> |