Merge pull request #132 from cchurch/ui_version_query_string

Add Tower version to query string for minified CSS/JS.
This commit is contained in:
Chris Church 2015-04-13 17:07:18 -04:00
commit 1dd45852a6
3 changed files with 12 additions and 2 deletions

View File

@ -122,6 +122,7 @@ REMOTE_HOST_HEADERS = ['REMOTE_ADDR', 'REMOTE_HOST']
TEMPLATE_CONTEXT_PROCESSORS += (
'django.core.context_processors.request',
'awx.ui.context_processors.settings',
'awx.ui.context_processors.version',
)
MIDDLEWARE_CLASSES += (

View File

@ -1,9 +1,18 @@
# Copyright (c) 2014 AnsibleWorks, Inc.
# All Rights Reserved.
# Django
from django.conf import settings as django_settings
# Ansible Tower
from awx.main.utils import get_awx_version
def settings(request):
return {
'settings': django_settings,
}
def version(request):
return {
'version': get_awx_version(),
}

View File

@ -16,14 +16,14 @@
<link rel="stylesheet" href="{{ STATIC_URL }}lib/codemirror/addon/lint/lint.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}lib/nvd3/build/nv.d3.css" type="text/css">
<link rel="stylesheet" href="{{ STATIC_URL }}tower.min.css" type="text/css">
<link rel="stylesheet" href="{{ STATIC_URL }}tower.min.css?v={{version}}" type="text/css">
<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
<script>
var $basePath = "{{ STATIC_URL }}";
</script>
<script src="{{ STATIC_URL }}tower.concat.js"></script>
<script src="{{ STATIC_URL }}tower.concat.js?v={{version}}"></script>
</head>
<body>