diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 15:04:54 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 15:04:54 +0100 |
| commit | 816cfb27666ebf73dcda4d316a5064b132af8981 (patch) | |
| tree | 53568d3d5b0e1a8654eb576ca029386fc2ed28ac | |
| parent | ce8877d1553978574ea16f2204dd089183ded45e (diff) | |
| download | Ishtar-816cfb27666ebf73dcda4d316a5064b132af8981.tar.bz2 Ishtar-816cfb27666ebf73dcda4d316a5064b132af8981.zip | |
Display version on footer
| -rw-r--r-- | example_project/settings.py | 2 | ||||
| -rw-r--r-- | ishtar_common/context_processors.py | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/footer.html | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index 437c75673..35bd590c8 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -29,7 +29,7 @@ STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' BASE_URL = "/" URL_PATH = "" -EXTRA_VERSION = '' +EXTRA_VERSION = 'git' ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt" diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 47cbac02d..8e14d8506 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -20,7 +20,7 @@ from django.conf import settings from django.contrib.sites.models import Site -from ishtar_common.version import VERSION +from ishtar_common.version import __version__ from ishtar_common.models import get_current_profile from menus import Menu @@ -54,9 +54,9 @@ def get_base_context(request): dct['JQUERY_URL'] = settings.JQUERY_URL dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL dct['COUNTRY'] = settings.COUNTRY - dct['VERSION'] = u".".join([unicode(n) for n in VERSION]) + dct['VERSION'] = __version__ if settings.EXTRA_VERSION: - dct['VERSION'] += unicode(settings.EXTRA_VERSION) + dct['VERSION'] += "-" + unicode(settings.EXTRA_VERSION) profile = get_current_profile() if profile: dct['raw_css'] = profile.get_raw_css() diff --git a/ishtar_common/templates/ishtar/blocks/footer.html b/ishtar_common/templates/ishtar/blocks/footer.html index 0d66816e2..8705c5892 100644 --- a/ishtar_common/templates/ishtar/blocks/footer.html +++ b/ishtar_common/templates/ishtar/blocks/footer.html @@ -1,3 +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 %} + {% blocktrans %}Powered by <a href="https://ishtar-archeo.net/">Ishtar</a> v{{VERSION}} - a free software under AGPL v3 license.{% endblocktrans %} </div>
\ No newline at end of file |