From b914225af239041c77bc4557a12e259a78d6025a Mon Sep 17 00:00:00 2001 From: Marian Sigler Date: Wed, 26 Sep 2012 06:13:26 +0200 Subject: add accounts logo, style header --- templates/base.html | 58 +++++++++++++++++++++++++++++++++---------------- templates/index.html | 1 - templates/settings.html | 6 ++--- 3 files changed, 42 insertions(+), 23 deletions(-) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index 425ea34..381fd0f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,6 +3,7 @@ + {% if title %}{{ title }} – {% endif %}spline accounts {%- for script in scripts %} @@ -13,30 +14,49 @@ - +

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

Angemeldet als {{ g.user.uid }} | Abmelden

- {%- else %} -

Nicht angemeldet | Login

- {%- endif %} - {%- endif %} + + + {%- if not no_login_message %} + + {%- endif %} +

- {% with messages = get_flashed_messages(with_categories=true) %} +

+ {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} -

{{ message }}

{% endif %} - {% endwith %} - - {% if title %} -

- {% endif %} + {% endwith %} - {% block content %}{% endblock %} + {% if title %} +

+ {% endif %} + {% block content %}{% endblock %} +

diff --git a/templates/index.html b/templates/index.html index cbbaa44..ea5e258 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,7 +1,6 @@ {%- extends 'base.html' %} {%- from '_macros.html' import render_field %} {%- block content %} -

Willkommen bei spline accounts!

{%- if session.username %}

Hallo {{ session.username }}. Einstellungen

{%- else %} diff --git a/templates/settings.html b/templates/settings.html index c672493..de317fb 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -4,16 +4,16 @@ {%- block content %}

{{ title }}

{{ title }}

Globale Einstellungen ändern

Globale Einstellungen ändern

Dienste verwalten

Dienste verwalten

{{ service.name }}

{{ service.name }}