{% block title %}Ishtar{% if APP_NAME %} - {{APP

From b85b1165c0ef9875bc6ffb1f55502c50299e4828 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 23 Oct 2017 13:45:10 +0200 Subject: UI: work on bootstrap layout --- ishtar_common/templates/base.html | 103 +++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 30 deletions(-) (limited to 'ishtar_common/templates/base.html') diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 62f47dab4..06322da04 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -2,6 +2,7 @@ + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} {% compress js %} @@ -37,40 +38,80 @@ - + {% for url_css in JQGRID_CSS %}{% endfor %} {% endcompress %} {% block extra_head %} {% endblock %} - {% if raw_css %}{% endif %} + {% comment %}{% if raw_css %}{% endif %}{% endcomment %} -

{% block header %} - {% if user.is_authenticated %} - {% trans "Logged in" %}: {{ user.username }} - ({% trans "Log out" %} | - {% trans "Change password" %}) - {% else %} - {% trans "Log in" %} + + +

+ {{APP_NAME}} +
+ {{ user.username }} +
+ + {% trans "Log out" %} + + + {% trans "Change password" %} + +
+
+ {% trans "Log in" %} +

- -

+ +
+ {% csrf_token %} +
+ {% for lang in LANGUAGES %} + + {{ lang.1 }} + + {% endfor %} + {% comment %} + + {% endcomment %} +
+
+

{% endblock %} -

@@ -79,7 +120,6 @@

-{% if APP_NAME %}

{%endif%} {% if not reminders %}

{% else %}

{% trans "Current items" %} @@ -112,12 +152,15 @@ {% endfor %} -

- {% if warnings %} -

{{warning}}

- {% endif %} +

+ {% if warnings %}{% for warning in warnings %} +

+ {{warning}} + +

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

-- cgit v1.2.3