From c51a0fa8ffc6765774230a6f2550b8087e7c49cf Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 2 Feb 2017 12:24:56 +0100 Subject: Add a footer (refs #3432) --- ishtar_common/static/media/style.css | 2 +- ishtar_common/templates/base.html | 7 ++++--- ishtar_common/templates/ishtar/blocks/footer.html | 3 +++ .../templates/ishtar/wizard/default_wizard.html | 5 +++++ ishtar_pdl/static/pdl/styles.css | 16 +++++++++++++--- 5 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 ishtar_common/templates/ishtar/blocks/footer.html diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 6fe6e6532..5ff9e9895 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -395,7 +395,7 @@ div#validation-bar.big{ } a.button{ - padding: 8px; + padding: 7px; } #reset_wizards{ diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 870409e41..614a83595 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -1,4 +1,4 @@ -{% load i18n %}{% load url from future%} @@ -109,10 +109,11 @@ {% block content %}{% endblock %} + {% block footer %} + {% endblock %}

{% trans "Processing..." %}

diff --git a/ishtar_common/templates/ishtar/blocks/footer.html b/ishtar_common/templates/ishtar/blocks/footer.html new file mode 100644 index 000000000..0d66816e2 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/footer.html @@ -0,0 +1,3 @@ +{% load i18n %} \ No newline at end of file diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index fad1895bd..e77484e61 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -44,9 +44,14 @@ {% endblock %} {{ previous_fields|safe }} +{% block "footer" %} +
{% endblock %} diff --git a/ishtar_pdl/static/pdl/styles.css b/ishtar_pdl/static/pdl/styles.css index 0f7980033..b35d0ade2 100644 --- a/ishtar_pdl/static/pdl/styles.css +++ b/ishtar_pdl/static/pdl/styles.css @@ -1,14 +1,24 @@ -div#validation-bar{ +div#footer{ position: fixed; bottom: 0px; background-color: #CCC; width: 100%; left: 0px; - height: 40px; - padding: 5px; z-index: 101; } +div#validation-bar{ + padding-top: 5px; + margin-bottom: 7px; +} + +div#foot{ + font-size: 0.75em; + text-align: center; + background-color: #bbb; + padding: 0.2em; +} + #reset_wizards{ right:50px; position:absolute; -- cgit v1.2.3