diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 12:24:56 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 12:24:56 +0100 |
| commit | 30b806371c23ccd90d9c079fa253a8ca22f49562 (patch) | |
| tree | 1bae789693542b971635ba7d76e130008f796fb6 | |
| parent | 277829bdf01336802b452e7c81a0f2e3e2f6ecd3 (diff) | |
| download | Ishtar-30b806371c23ccd90d9c079fa253a8ca22f49562.tar.bz2 Ishtar-30b806371c23ccd90d9c079fa253a8ca22f49562.zip | |
Add a footer (refs #3432)
| -rw-r--r-- | ishtar_common/static/media/style.css | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 7 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/footer.html | 3 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/default_wizard.html | 5 | ||||
| -rw-r--r-- | ishtar_pdl/static/pdl/styles.css | 16 |
5 files changed, 26 insertions, 7 deletions
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%}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +{% load i18n %}{% load url from future %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}"> @@ -109,10 +109,11 @@ {% block content %}{% endblock %} </div> + {% block footer %} <div id="footer"> - {% block footer %} - {% endblock %} + {% include 'ishtar/blocks/footer.html' %} </div> + {% endblock %} <div id="progress"> <div id='progress-content'> <p class='progress-detail progress-1'>{% trans "Processing..." %}</p> 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 %}<div id="foot"> + {% blocktrans %}Powered by <a href="https://ishtar-archeo.net/">Ishtar</a> - a free software under AGPL v3 license.{% endblocktrans %} +</div>
\ 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 %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} +{% block "footer" %} + <div id="footer"> {% block "validation_bar" %} {% include 'ishtar/wizard/validation_bar.html' %} {% endblock %} +{% include 'ishtar/blocks/footer.html' %} +{% endblock %} + </div> </div> </form> {% 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; |