diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
| commit | c8dd8eba4546961fa154c0ae386709750fcfffb4 (patch) | |
| tree | 613ea46830ed40c5b9b031ba54664f05cfe98b75 /ishtar_common/templates/base.html | |
| parent | c1e94dc1b8851b61bc8d697e08f8a407b5269365 (diff) | |
| parent | 219a775ed06ba6e75b2a9a04af406aea3ef579bb (diff) | |
| download | Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.tar.bz2 Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/templates/base.html')
| -rw-r--r-- | ishtar_common/templates/base.html | 7 |
1 files changed, 4 insertions, 3 deletions
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> |