diff --git a/dav_auth/templates/dav_auth/forms/login.html b/dav_auth/templates/dav_auth/forms/login.html index 1214928..3f592fb 100644 --- a/dav_auth/templates/dav_auth/forms/login.html +++ b/dav_auth/templates/dav_auth/forms/login.html @@ -10,7 +10,7 @@  
-

{% trans 'Login' %}

+

{% trans 'Login' %}

{% csrf_token %} diff --git a/dav_auth/templates/dav_auth/forms/reset_password.html b/dav_auth/templates/dav_auth/forms/reset_password.html index 007da89..001e909 100644 --- a/dav_auth/templates/dav_auth/forms/reset_password.html +++ b/dav_auth/templates/dav_auth/forms/reset_password.html @@ -10,7 +10,7 @@  
-

{% trans 'Passwort vergessen?' %}

+

{% trans 'Passwort vergessen?' %}

{% csrf_token %} diff --git a/dav_auth/templates/dav_auth/forms/set_password.html b/dav_auth/templates/dav_auth/forms/set_password.html index d46536c..5abe91f 100644 --- a/dav_auth/templates/dav_auth/forms/set_password.html +++ b/dav_auth/templates/dav_auth/forms/set_password.html @@ -10,7 +10,7 @@  
-

{% trans 'Neues Passwort setzen' %}

+

{% trans 'Neues Passwort setzen' %}

{% csrf_token %} diff --git a/dav_base/static/dav_base/css/local.css b/dav_base/static/dav_base/css/local.css index 89d2e59..c0ea572 100644 --- a/dav_base/static/dav_base/css/local.css +++ b/dav_base/static/dav_base/css/local.css @@ -74,13 +74,6 @@ thead input { */ #page-body { padding-bottom: 4.8rem; - background-color: #fcc; -} - -#page-body .vspace { - content: "\202f"; - height: 0px; - margin-bottom: 1.2rem; } #page-body h5, #page-body h6 { @@ -120,8 +113,13 @@ thead input { /* * Misc */ -.jumbotron > h1 { - margin-top: 0px; +.top-most { + margin-top: 1.2rem; +} + +.jumbotron { + padding-top: 34px; + padding-bottom: 34px; } .action-tabs { diff --git a/dav_base/templates/400.html b/dav_base/templates/400.html index 72d4509..12ab9e2 100644 --- a/dav_base/templates/400.html +++ b/dav_base/templates/400.html @@ -1,6 +1,11 @@ {% extends "dav_base/error_base.html" %} +{% load i18n %} {% block error-code %}400{% endblock %} {% block error-title %}Bad Request{% endblock %} -{% block error-heading %}Fehlerhafte Anfrage{% endblock %} -{% block error-body %}

Irgendwas ist hier falsch gelaufen.

{% endblock %} +{% block error-heading %}{% trans 'Fehlerhafte Anfrage' %}{% endblock %} +{% block error-body %} +

+ {% trans 'Irgendwas ist hier falsch gelaufen.' %} +

+{% endblock %} diff --git a/dav_base/templates/403.html b/dav_base/templates/403.html index 1da7207..2aecd08 100644 --- a/dav_base/templates/403.html +++ b/dav_base/templates/403.html @@ -1,8 +1,11 @@ {% extends "dav_base/error_base.html" %} +{% load i18n %} {% block error-code %}403{% endblock %} {% block error-title %}Forbidden{% endblock %} -{% block error-heading %}Keine Berechtigung{% endblock %} +{% block error-heading %}{% trans 'Keine Berechtigung' %}{% endblock %} {% block error-body %} -

Irgendwas darfst du hier nicht.

+

+ {% trans 'Irgendwas darfst du hier nicht.' %} +

{% endblock %} diff --git a/dav_base/templates/404.html b/dav_base/templates/404.html index 58ee5a2..74ec0d9 100644 --- a/dav_base/templates/404.html +++ b/dav_base/templates/404.html @@ -1,6 +1,13 @@ {% extends "dav_base/error_base.html" %} +{% load i18n %} {% block error-code %}404{% endblock %} {% block error-title %}Not Found{% endblock %} -{% block error-heading %}Ressource nicht gefunden{% endblock %} -{% block error-body %}

{{ exception }}

{% endblock %} +{% block error-heading %}{% trans 'Adresse existiert nicht' %}{% endblock %} +{% block error-body %} +

+ {% blocktrans with path=request.path %} + Die angeforderte Ressource '{{ path }}' ist auf diesem Server nicht verfügbar. + {% endblocktrans %} +

+{% endblock %} diff --git a/dav_base/templates/500.html b/dav_base/templates/500.html index 65bcc31..2a9032d 100644 --- a/dav_base/templates/500.html +++ b/dav_base/templates/500.html @@ -1,6 +1,11 @@ {% extends "dav_base/error_base.html" %} +{% load i18n %} {% block error-code %}500{% endblock %} {% block error-title %}Internal Server Error{% endblock %} -{% block error-heading %}Serverfehler{% endblock %} -{% block error-body %}

Irgendwas ist jetzt kaputt.

{% endblock %} +{% block error-heading %}{% trans 'Serverfehler' %}{% endblock %} +{% block error-body %} +

+ {% trans 'Irgendwas ist jetzt kaputt.' %} +

+{% endblock %} diff --git a/dav_base/templates/dav_base/css_demo.html b/dav_base/templates/dav_base/css_demo.html index 540ba2e..59f8ecb 100644 --- a/dav_base/templates/dav_base/css_demo.html +++ b/dav_base/templates/dav_base/css_demo.html @@ -11,7 +11,7 @@ {% endblock messages %} {% block page-container-fluid %} -

Header h1 Small Text

+

Header h1 Small Text

Header h2 Small Text

Header h3 Small Text

Header h4 Small Text

diff --git a/dav_base/templates/dav_base/error_base.html b/dav_base/templates/dav_base/error_base.html index 795ebe7..a1b1c95 100644 --- a/dav_base/templates/dav_base/error_base.html +++ b/dav_base/templates/dav_base/error_base.html @@ -4,14 +4,14 @@ {% block head-title %}{% block error-code %}{% endblock %} {% block error-title %}Error{% endblock %} - {{ block.super }}{% endblock head-title %} {% block page-container %} -
-
-

{% block error-heading %}Error{% endblock %}

-
-
- {% block error-body %} -

Irgendwas ist hier falsch gelaufen.

- {% endblock %} -
+
+
+

{% block error-heading %}Error{% endblock %}

+
+ {% block error-body %} +

Irgendwas ist hier falsch gelaufen.

+ {% endblock %} +
+
{% endblock page-container %} diff --git a/dav_base/templates/dav_base/root.html b/dav_base/templates/dav_base/root.html index fd2c078..ed0f2c8 100644 --- a/dav_base/templates/dav_base/root.html +++ b/dav_base/templates/dav_base/root.html @@ -3,7 +3,7 @@ {% load i18n %} {% block page-container %} -
+

Hallo,

du bist auf dem Entwicklungs- und Testserver der @@ -13,7 +13,6 @@ Wenn du Fragen hast, kannst du dich an heinzel@alpenverein-karlsruhe.de wenden.

-

 

{% if root_urls %}

Module:

diff --git a/dav_events/templates/dav_events/event_create/base.html b/dav_events/templates/dav_events/event_create/base.html index 2861918..64c35f7 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_detail.html b/dav_events/templates/dav_events/event_detail.html index 2875dd0..e60b743 100644 --- a/dav_events/templates/dav_events/event_detail.html +++ b/dav_events/templates/dav_events/event_detail.html @@ -110,7 +110,7 @@ {% endblock modals %} {% block page-container-fluid %} -
+
{% if has_permission_submit %}
diff --git a/dav_events/templates/dav_events/event_list_export_form.html b/dav_events/templates/dav_events/event_list_export_form.html index fc22f4c..b6c7b31 100644 --- a/dav_events/templates/dav_events/event_list_export_form.html +++ b/dav_events/templates/dav_events/event_list_export_form.html @@ -3,7 +3,7 @@ {% load i18n %} {% block page-container-fluid %} -
+
diff --git a/dav_events/templates/dav_events/event_update_form.html b/dav_events/templates/dav_events/event_update_form.html index 064a847..ffd6373 100644 --- a/dav_events/templates/dav_events/event_update_form.html +++ b/dav_events/templates/dav_events/event_update_form.html @@ -34,7 +34,7 @@ {% endblock head-additional %} {% block page-container-fluid %} -
+