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/static/media/style.css | 4 + ishtar_common/templates/base.html | 103 +++++++++++++++++------- ishtar_common/templates/registration/login.html | 52 +++++++++--- 3 files changed, 117 insertions(+), 42 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 4f0330502..cc1477bdc 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -524,6 +524,10 @@ div#language_form_div label{ line-height: 1.7em; } +#shortcut-menu{ + display: none; +} + div#context_menu{ height:110px; margin-right:10px; 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 %} - + @@ -79,7 +120,6 @@
{% if not reminders %}
{% else %}
{% trans "Current items" %} @@ -112,12 +152,15 @@ {% endfor %} -
- {% if warnings %} -
    {% for warning in warnings %} -
  • {{warning}}
  • {% endfor %} -
- {% endif %} +
+ {% if warnings %}{% for warning in warnings %} + + {% endfor %}{% endif %} {% block content %}{% endblock %}
diff --git a/ishtar_common/templates/registration/login.html b/ishtar_common/templates/registration/login.html index e8122f150..1b6062e53 100644 --- a/ishtar_common/templates/registration/login.html +++ b/ishtar_common/templates/registration/login.html @@ -2,18 +2,46 @@ {% load i18n %} {% block content %} -
-
{% csrf_token %} - - -{{ form.as_table }} - - -
{%trans "Log in"%}
-
+
+
+

{%trans "Log in"%}

+
{% csrf_token %} + + {% if form.non_field_errors %} +
+ {% for error in form.non_field_errors %} +
+ {{error}} +
+ {% endfor %} +
+ {% endif %} + + {% for field in form %} + {% if field.errors %} +
+ {{field.errors}} +
+ {% endif %} +
+ +
{{field}}
+
+ {% endfor %} + +
+
+ +
+
+
+
-
-

{% trans "Forgot password?" %} {% trans "Reset it" %}

-

{% trans "Not member?" %} {% trans "Register" %}

+
+
+
+ {% trans "Forgot password?" %} {% trans "Reset it" %} – + {% trans "Not member?" %} {% trans "Register" %} +
{% endblock %} -- cgit v1.2.3