External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-04 17:55:06 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132 from cchurch/ui_version_query_string

Browse Source 
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
parent bbe23b0071 d1123d145f
commit 1dd45852a6
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/settings/defaults.py
View File

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

9
awx/ui/context_processors.py
View File

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

4
awx/ui/templates/ui/index.html
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/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 }}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" /> <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
<script> <script>
var $basePath = "{{ STATIC_URL }}"; var $basePath = "{{ STATIC_URL }}";
</script> </script>
<script src="{{ STATIC_URL }}tower.concat.js"></script> <script src="{{ STATIC_URL }}tower.concat.js?v={{version}}"></script>
</head> </head>
<body> <body>