diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base.html | 58 | ||||
-rw-r--r-- | templates/index.html | 1 | ||||
-rw-r--r-- | templates/settings.html | 6 |
3 files changed, 42 insertions, 23 deletions
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 @@ <!doctype html> <html> <head> + <meta charset="utf-8" /> <title>{% if title %}{{ title }} – {% endif %}spline accounts</title> {%- for script in scripts %} <script type="text/javascript" src="{{ url_for('static', filename=script) }}"></script> @@ -13,30 +14,49 @@ </head> <body> - <h1 id="header"><img src="{{url_for('static', filename='logo.png')}}" alt="Spline" /></h1> + <div id="header-background"> </div> + <header> + <h1><img src="{{url_for('static', filename='logo.png')}}" alt="spline accounts" /></h1> + <span id="roundcornerb"> </span> + <span id="roundcornerw"> </span> - {%- if not no_login_message %} - {%- if g.user %} - <p>Angemeldet als <strong>{{ g.user.uid }}</strong> | <a href="{{ url_for('logout') }}">Abmelden</a></p> - {%- else %} - <p>Nicht angemeldet | <a href="{{ url_for('index') }}">Login</a></p> - {%- endif %} - {%- endif %} + <nav id="mainnav"> + <ul> + <li><a href="http://spline.de">spline.de</a></li> + <li><a href="{#{ url_for('about') }#}">Über spline accounts</a></li> + </ul> + </nav> + + {%- if not no_login_message %} + <nav id="usermenu"> + <ul> + {%- if g.user %} + <li>Angemeldet als <strong>{{ g.user.uid }}</strong></li> + <li><a href="{{ url_for('logout') }}">Abmelden</a></li> + {%- else %} + <li>Nicht angemeldet</li> + <li><a href="{{ url_for('index') }}">Login</a></li> + {%- endif %} + </ul> + </nav> + {%- endif %} + </header> - {% with messages = get_flashed_messages(with_categories=true) %} + <section id="content"> + {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} - <ul class="flashes"> - {% for category, message in messages %} + <ul class="flashes"> + {% for category, message in messages %} <li class="{{ category }}">{{ message }}</li> - {% endfor %} - </ul> + {% endfor %} + </ul> {% endif %} - {% endwith %} - - {% if title %} - <h2>{{ title }}</h2> - {% endif %} + {% endwith %} - {% block content %}{% endblock %} + {% if title %} + <h1>{{ title }}</h1> + {% endif %} + {% block content %}{% endblock %} + </section> </body> </html> 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 %} -<p>Willkommen bei <strong>spline accounts</strong>!</p> {%- if session.username %} <p>Hallo {{ session.username }}. <a href="{{ url_for('settings') }}">Einstellungen</a></p> {%- 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 %} <form action="{{ url_for('settings') }}" method="post" class="form-horizontal"> {{ render_field(form.old_password, autofocus="autofocus") }} - <h3>Globale Einstellungen ändern</h3> + <h2>Globale Einstellungen ändern</h2> {{ render_field(form.mail) }} {{ render_field(form.password) }} {{ render_field(form.password_confirm) }} {{ form.csrf_token }} <div class="form-actions"><input type="submit" value="Speichern" name="submit_main" /></div> - <h3>Dienste verwalten</h3> + <h2>Dienste verwalten</h2> {%- for service in services %} - <h4>{{ service.name }}</h4> + <h3>{{ service.name }}</h3> {%- if service.changed %} <p>Eigenes Passwort gesetzt</p> <p>löschen, todo</p> |