diff --git a/template_helper.py b/template_helper.py
index 26be0e7215fc5b849558187d656f4ce4a3fd78e8..2effb5934f1a06051a1a5cc6b8664a39a00ac9ee 100644
--- a/template_helper.py
+++ b/template_helper.py
@@ -13,9 +13,14 @@ app.add_template_global(min, name='min')
app.add_template_global(max, name='max')
# get git commit
-output = subprocess.check_output(['git', "log", "-g", "-1", "--pretty=%H # %h # %d # %s"]).decode('UTF-8').split('#', 3)
+output = subprocess.check_output(['git', "log", "-g", "-1", "--pretty=%H#%h#%d#%s"]).decode('UTF-8').split('#', 3)
app.jinja_env.globals['gitversion'] = {'hash': output[1], 'longhash': output[0], 'branch': output[2], 'msg': output[3]}
+@app.url_defaults
+def static_version_inject(endpoint, values):
+ if endpoint == 'static':
+ values['v'] = app.jinja_env.globals['gitversion']['longhash']
+
@app.template_global()
def ismod(*args):
return ('user' in session)
diff --git a/templates/base.html b/templates/base.html
index 1b8868618e7584fd6d5d8bf93907bab3dc41a990..4a85f2d20ea0ae90ad787bcd563ff7ba07b3145f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,11 +15,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{url_for('static', filename='bootstrap/bootstrap.css')}}" rel="stylesheet">
- <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='style.css', v='bdd2884')}}">
+ <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='style.css')}}">
<link rel="stylesheet" href="{{url_for('static', filename='font-awesome/css/all.css')}}">
- <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='videojs/video-js.css', v='d042c96')}}">
- <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='videojs/videojs.markers.css', v='d042c96')}}">
- <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='videojs/videojs-resolution-switcher.css', v='d042c96')}}">
+ <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='videojs/video-js.css')}}">
+ <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='videojs/videojs.markers.css')}}">
+ <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='videojs/videojs-resolution-switcher.css')}}">
{% if ismod() %}
<link rel="stylesheet" type="text/css" href="{{url_for('static', filename='bootstrap-multiselect.css')}}">
{% endif %}
@@ -32,11 +32,11 @@
<script src="{{url_for('static', filename='bootstrap-multiselect.js')}}"></script>
<script src="{{url_for('static', filename='plotly.min.js')}}"></script>
{% endif %}
- <script src="{{url_for('static', filename='videojs/video.js', v='d042c96')}}"></script>
- <script src="{{url_for('static', filename='videojs/lang/de.js', v='d042c96')}}"></script>
- <script src="{{url_for('static', filename='videojs/videojs-resolution-switcher.js', v='d042c96')}}"></script>
- <script src="{{url_for('static', filename='videojs/videojs.hotkeys.js', v='d042c96')}}"></script>
- <script src="{{url_for('static', filename='videojs/videojs-markers.js', v='d042c96')}}"></script>
+ <script src="{{url_for('static', filename='videojs/video.js')}}"></script>
+ <script src="{{url_for('static', filename='videojs/lang/de.js')}}"></script>
+ <script src="{{url_for('static', filename='videojs/videojs-resolution-switcher.js')}}"></script>
+ <script src="{{url_for('static', filename='videojs/videojs.hotkeys.js')}}"></script>
+ <script src="{{url_for('static', filename='videojs/videojs-markers.js')}}"></script>
{% endblock %}
</head>
<body>