From 71551d4c21593e4b2fee0197be65ce23dbc64cf5 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Tue, 30 Jan 2018 17:33:00 +0100 Subject: [PATCH] Some visual and style code improvements. --- dav_events/static/dav_events/css/local.css | 33 ++++++++++--------- .../templates/dav_events/auth/login_form.html | 2 +- .../dav_events/auth/set_password_form.html | 2 +- dav_events/templates/dav_events/base.html | 10 +++--- .../dav_events/event_create/base.html | 2 +- .../dav_events/event_update_form.html | 4 +-- dav_events/templates/dav_events/home.html | 27 ++++++++++++--- 7 files changed, 50 insertions(+), 30 deletions(-) diff --git a/dav_events/static/dav_events/css/local.css b/dav_events/static/dav_events/css/local.css index b11c0d7..0aafdc7 100644 --- a/dav_events/static/dav_events/css/local.css +++ b/dav_events/static/dav_events/css/local.css @@ -25,39 +25,42 @@ thead input { color: #e3e3e3; } -#page-header .brand { - vertical-align: bottom; +#page-header h2 { + display: inline; font-size: 2rem; + vertical-align: bottom; } -#page-header .brand a { +#page-header h2 img { + margin-right: 1.2rem; +} + +#page-header h2 a { color: #ffffff; } -#page-header .brand a:hover { +#page-header h2 a:hover { color: #e3e3e3; text-decoration: none; } -#page-header img.brand { - margin-right: 1.2rem; -} - #page-header #login-widget { float: right; } -#messages { - margin-top: 2rem; +#messages div.alert { + margin-top: 1.2rem; + margin-bottom: 0rem; } #page-body { - padding-bottom: 6rem; + padding-top: 2.4rem; + padding-bottom: 4.8rem; } -#page-body h2 { - margin-top: 0px; - margin-bottom: 2rem; +#page-body h3 { + margin-top: -1rem; + margin-bottom: 1.5rem; } #page-footer { @@ -88,5 +91,5 @@ thead input { } .action-tabs { - margin-bottom: 2ex; + margin-bottom: 1.2rem; } diff --git a/dav_events/templates/dav_events/auth/login_form.html b/dav_events/templates/dav_events/auth/login_form.html index 7ade341..dad380b 100644 --- a/dav_events/templates/dav_events/auth/login_form.html +++ b/dav_events/templates/dav_events/auth/login_form.html @@ -10,7 +10,7 @@  
-

{% trans 'Login' %}

+

{% trans 'Login' %}

{% csrf_token %} diff --git a/dav_events/templates/dav_events/auth/set_password_form.html b/dav_events/templates/dav_events/auth/set_password_form.html index 7eebb46..9229d8b 100644 --- a/dav_events/templates/dav_events/auth/set_password_form.html +++ b/dav_events/templates/dav_events/auth/set_password_form.html @@ -10,7 +10,7 @@  
-

{% trans 'Neues Passwort setzen' %}

+

{% trans 'Neues Passwort setzen' %}

{% csrf_token %} diff --git a/dav_events/templates/dav_events/base.html b/dav_events/templates/dav_events/base.html index d37cd1d..267f34d 100644 --- a/dav_events/templates/dav_events/base.html +++ b/dav_events/templates/dav_events/base.html @@ -29,11 +29,11 @@
- - - Veranstaltungsheinzel - +

+ + Veranstaltungsheinzel + +

{% include 'dav_events/includes/login_widget.html' %}
diff --git a/dav_events/templates/dav_events/event_create/base.html b/dav_events/templates/dav_events/event_create/base.html index 77c5b07..cf5007b 100644 --- a/dav_events/templates/dav_events/event_create/base.html +++ b/dav_events/templates/dav_events/event_create/base.html @@ -5,7 +5,7 @@ {% block head-title %}{% block form-title %}{{ form.form_title }}{% endblock form-title %} - {{ block.super }}{% endblock head-title %} {% block page-container-fluid %} -

{% block form-header %}{{ form.form_title }}{% endblock form-header %}

+

{% block form-header %}{{ form.form_title }}{% endblock form-header %}

{% block form-errors %} {% bootstrap_form_errors form %} {% endblock form-errors %} diff --git a/dav_events/templates/dav_events/event_update_form.html b/dav_events/templates/dav_events/event_update_form.html index c0b94bf..c4a52e6 100644 --- a/dav_events/templates/dav_events/event_update_form.html +++ b/dav_events/templates/dav_events/event_update_form.html @@ -34,8 +34,8 @@ {% bootstrap_form form layout='horizontal' %}
- - {% trans 'Abbrechen' %} + + {% trans 'Abbrechen' %}
diff --git a/dav_events/templates/dav_events/home.html b/dav_events/templates/dav_events/home.html index da7ee19..4097a58 100644 --- a/dav_events/templates/dav_events/home.html +++ b/dav_events/templates/dav_events/home.html @@ -9,17 +9,34 @@ {% endblock messages %} {% block page-container %} -

{% trans 'Veranstaltungen' %}

+

{% trans 'Veranstaltungen' %}

-

Neue Veranstaltung eintragen

+

Neue Veranstaltung eintragen...

+

Hier kannst du Touren und Kurse anmelden, die du anbieten möchtest.

- Los + Du wirst durch eine Reihe von Eingabemasken geführt, die alles Mögliche abfragen, + was wir bezüglich deiner Tour / deines Kurses wissen müssen. +

+

+ Am Ende dieses Prozesses bekommst du noch einmal eine Zusammenfassung der Daten angezeigt. + Wenn du dann auf klickst, wird alles + an den Tourenreferenten und sein Team weitergeleitet. + Du wirst dann per E-Mail auf dem laufenden gehalten. +

+

+ Los geht's!

-

Veranstaltungen managen

+

Veranstaltungen verwalten...

- Los + Hier kannst du deine eingetragenen Touren und Kurse sehen. +

+

+ Tourenreferenten und Redakteure können hier Veranstaltungen freigeben und Programmlisten herunterladen. +

+

+ Allez!

{% endblock page-container %}