From 60ce7256e8bb38f7f7dd98b0e5540346bffcdea4 Mon Sep 17 00:00:00 2001 From: Marian Sigler Date: Mon, 24 Sep 2012 03:05:54 +0200 Subject: Add `logout_required; Add bootstrap for forms --- templates/_macros.html | 17 ++++++++++------- templates/base.html | 6 +++--- templates/index.html | 10 ++++------ templates/register.html | 13 ++++++------- templates/register_complete.html | 23 +++++++++++++---------- templates/settings.html | 15 ++++++--------- 6 files changed, 42 insertions(+), 42 deletions(-) (limited to 'templates') diff --git a/templates/_macros.html b/templates/_macros.html index 2c933be..8298040 100644 --- a/templates/_macros.html +++ b/templates/_macros.html @@ -1,16 +1,19 @@ {% macro render_field(field) %} -
{{ field.label }} -
{{ field(**kwargs)|safe }} - {% if field.errors|length == 1 %} +
+ {{ field.label }} +
+ {{ field(**kwargs)|safe }} + {%- if field.errors|length == 1 %}
{{ field.errors.0 }}
- {% elif field.errors %} + {% elif field.errors %}
    {% for error in field.errors %}
  • {{ error }}
    • {% endfor %}
- {% endif %} -
-{% endmacro %} + {% endif %} + + +{%- endmacro %} diff --git a/templates/base.html b/templates/base.html index 1886d12..c3ed80b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,4 @@ -{%- set styles = ['layout.css'] + styles|default([]) %} +{%- set styles = ['layout.css', 'bootstrap-form.css'] + styles|default([]) %} {%- set scripts = [] + scripts|default([]) %} @@ -19,11 +19,13 @@

{{ title }}

{% endif %} + {%- if not no_login_message %} {%- if g.user %}

Logged in as {{ g.user.uid }}. Log out

{%- else %}

Not logged in. Log in

{%- endif %} + {%- endif %} {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} @@ -36,7 +38,5 @@ {% endwith %} {% block content %}{% endblock %} - - 
{{ session.__repr__() }}
diff --git a/templates/index.html b/templates/index.html index 6147883..abcbb1d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,13 +6,11 @@

Hallo {{ session.username }}. Einstellungen

{%- else %}

Account erstellen

-
-
- {{ render_field(form.username) }} - {{ render_field(form.password) }} -
+ + {{ render_field(form.username) }} + {{ render_field(form.password) }} {{ form.csrf_token }} - +
{%- endif %} {%- endblock %} diff --git a/templates/register.html b/templates/register.html index e04baac..cdd101d 100644 --- a/templates/register.html +++ b/templates/register.html @@ -1,14 +1,13 @@ {%- extends 'base.html' %} {%- from '_macros.html' import render_field %} {%- set title = 'Account erstellen' %} +{%- set no_login_message = true %} {%- block content %} -
-
- {{ form.errors }} - {{ render_field(form.username) }} - {{ render_field(form.mail) }} -
+ + {{ form.errors }} + {{ render_field(form.username) }} + {{ render_field(form.mail) }} {{ form.csrf_token }} - +
{%- endblock %} diff --git a/templates/register_complete.html b/templates/register_complete.html index f44e43a..06d2cd9 100644 --- a/templates/register_complete.html +++ b/templates/register_complete.html @@ -1,21 +1,24 @@ {%- extends 'base.html' %} {%- from '_macros.html' import render_field %} {%- set title = 'Account erstellen' %} +{%- set no_login_message = true %} {%- block content %} -
+

Deine E-Mail-Adresse wurde erfolgreich bestätigt. Bitte setze nun ein Passwort, um die Registrierung abzuschließen.

-
-
Benutzername
-
-
E-Mail-Adresse
-
- {{ render_field(form.password) }} - {{ render_field(form.password_confirm) }} -
+
+
Benutzername
+
+
+
+
E-Mail-Adresse
+
+
+ {{ render_field(form.password) }} + {{ render_field(form.password_confirm) }} {{ form.csrf_token }} - +
{%- endblock %} diff --git a/templates/settings.html b/templates/settings.html index 876d2f1..13d63f4 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -2,17 +2,14 @@ {%- from '_macros.html' import render_field %} {%- set title = 'Einstellungen' %} {%- block content %} -
+

Globale Einstellungen ändern

-

-

- {{ render_field(form.old_password) }} - {{ render_field(form.mail) }} - {{ render_field(form.password) }} - {{ render_field(form.password_confirm) }} -
+ {{ render_field(form.old_password) }} + {{ render_field(form.mail) }} + {{ render_field(form.password) }} + {{ render_field(form.password_confirm) }} {{ form.csrf_token }} - +

Dienste verwalten