From 65e8dc7c444f6bcb71d434a6f69ec64546f828e2 Mon Sep 17 00:00:00 2001
From: Christophe Benz <christophe.benz@jailbreak.paris>
Date: Mon, 24 Jun 2019 13:23:50 +0200
Subject: [PATCH] Display version number in footer

---
 CHANGELOG.md                             |  6 ++++++
 setup.py                                 |  4 +++-
 validata_ui/__init__.py                  |  6 ++++++
 validata_ui/templates/base_template.html | 21 +++++++++++----------
 validata_ui/version.py                   |  1 +
 5 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 validata_ui/version.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4eba84..7b70f28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## master
+
+Non-breaking changes:
+
+- display version number in footer
+
 ## 0.2.0
 
 New features for users:
diff --git a/setup.py b/setup.py
index ea49421..204d5be 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,8 @@ from pathlib import Path
 
 from setuptools import setup
 
+from validata_ui.version import VERSION
+
 # Gets the long description from the README.md file
 readme_filepath = Path(__file__).parent / 'README.md'
 with readme_filepath.open('rt', encoding='utf-8') as fd_in:
@@ -12,7 +14,7 @@ with readme_filepath.open('rt', encoding='utf-8') as fd_in:
 
 setup(
     name='validata_ui',
-    version='0.2.0',
+    version=VERSION,
 
     description='Validata Web UI',
     long_description=LONG_DESCRIPTION,
diff --git a/validata_ui/__init__.py b/validata_ui/__init__.py
index ade4979..2213c3d 100644
--- a/validata_ui/__init__.py
+++ b/validata_ui/__init__.py
@@ -14,6 +14,7 @@ import tableschema
 import opendataschema
 
 from . import config
+from .version import VERSION
 
 log = logging.getLogger(__name__)
 
@@ -88,5 +89,10 @@ def urlencode(context, value):
     return quote_plus(value)
 
 
+@app.context_processor
+def inject_version():
+    return {"validata_ui_version": VERSION}
+
+
 # Keep this import after app initialisation (to avoid cyclic imports)
 from . import views  # noqa isort:skip
diff --git a/validata_ui/templates/base_template.html b/validata_ui/templates/base_template.html
index 594b5ad..f828ca8 100644
--- a/validata_ui/templates/base_template.html
+++ b/validata_ui/templates/base_template.html
@@ -74,19 +74,20 @@
     </div>
 
     <footer class="footer hidden-print">
-        <div>
+        <p>
             Le service de validation du <a href="https://www.validata.fr/">projet Validata</a>
             est mis à disposition par
             <a href="http://www.opendatafrance.net/">OpenDataFrance</a> avec
-            l'aide de <a href="https://jailbreak.paris">Jailbreak</a>
-        </div>
-        <ul class="list-unstyled mt-4">
-            <p>
-              <a href="/api/v1/apidocs" target="_blank">API</a>
-              | <a href="https://git.opendatafrance.net/validata" target="_blank">Code source</a>
-              | <a href="https://riot.im/app/#/room/#validata:jailbreak.paris" target="_blank">Salon de discussion public</a>
-            </p>
-        </ul>
+            l'aide de <a href="https://jailbreak.paris">Jailbreak</a>.
+        </p>
+        <p>
+            <a href="/api/v1/apidocs" target="_blank">API</a>
+            | <a href="https://git.opendatafrance.net/validata" target="_blank">Codes sources</a>
+            | <a href="https://riot.im/app/#/room/#validata:jailbreak.paris" target="_blank">Salon de discussion public</a>
+        </p>
+        <p class="text-muted">
+            (version <a href="https://git.opendatafrance.net/validata/validata-ui/tree/v{{ validata_ui_version }}" target="_blank">{{ validata_ui_version }}</a>)
+        </p>
     </footer>
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
diff --git a/validata_ui/version.py b/validata_ui/version.py
new file mode 100644
index 0000000..81343d7
--- /dev/null
+++ b/validata_ui/version.py
@@ -0,0 +1 @@
+VERSION = '0.2.0'
-- 
GitLab