openstack/deb-horizon
Code Issues Proposed changes

Merge "Upgrade and unbundle jquery-ui"

Browse Source
This commit is contained in:
Jenkins 2014-10-01 15:54:39 +00:00 committed by Gerrit Code Review
commit 5a44fb44d6
5 changed files with 27 additions and 3963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3958
horizon/static/horizon/lib/jquery/jquery-ui-1.9.2.custom.js vendored
View File

File diff suppressed because it is too large Load Diff

2
horizon/templates/horizon/_scripts.html
View File

@ -25,7 +25,7 @@
<script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.tablesorter.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/spin.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/spin.jquery.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/jquery/jquery-ui-1.9.2.custom.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/jquery-ui/ui/jquery-ui.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.bootstrap.wizard.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}horizon/lib/d3.js" type="text/javascript" charset="utf-8"></script>

14
horizon/test/settings.py
View File

@ -35,6 +35,7 @@ import xstatic.pkg.jquery
import xstatic.pkg.jquery_migrate
import xstatic.pkg.jquery_quicksearch
import xstatic.pkg.jquery_tablesorter
import xstatic.pkg.jquery_ui
import xstatic.pkg.jsencrypt
import xstatic.pkg.qunit
import xstatic.pkg.rickshaw
@ -153,7 +154,7 @@ STATICFILES_FINDERS = (
'compressor.finders.CompressorFinder',
)
STATICFILES_DIRS = (
STATICFILES_DIRS = [
('horizon/lib/angular',
xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
('horizon/lib/angular',
@ -186,7 +187,16 @@ STATICFILES_DIRS = (
xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
('horizon/lib',
xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
)
]
if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
# The 1.10.x versions already contain the 'ui' directory.
STATICFILES_DIRS.append(('horizon/lib/jquery-ui',
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
else:
# Newer versions dropped the directory, add it to keep the path the same.
STATICFILES_DIRS.append(('horizon/lib/jquery-ui/ui',
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
LOGGING = {
'version': 1,

15
openstack_dashboard/settings.py
View File

@ -35,6 +35,7 @@ import xstatic.pkg.jquery
import xstatic.pkg.jquery_migrate
import xstatic.pkg.jquery_quicksearch
import xstatic.pkg.jquery_tablesorter
import xstatic.pkg.jquery_ui
import xstatic.pkg.jsencrypt
import xstatic.pkg.qunit
import xstatic.pkg.rickshaw
@ -150,7 +151,7 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
)
STATICFILES_DIRS = (
STATICFILES_DIRS = [
('horizon/lib/angular',
xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
('horizon/lib/angular',
@ -183,7 +184,17 @@ STATICFILES_DIRS = (
xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
('horizon/lib',
xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
)
]
if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
# The 1.10.x versions already contain the 'ui' directory.
STATICFILES_DIRS.append(('horizon/lib/jquery-ui',
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
else:
# Newer versions dropped the directory, add it to keep the path the same.
STATICFILES_DIRS.append(('horizon/lib/jquery-ui/ui',
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
COMPRESS_PRECOMPILERS = (
('text/scss', 'django_pyscss.compressor.DjangoScssFilter'),

1
requirements.txt
View File

@ -47,6 +47,7 @@ xstatic-jquery>=1.7.2 # MIT License
xstatic-jquery-migrate>=1.2.1.1 # MIT License
xstatic-jquery.quicksearch>=2.0.3.1 # MIT License
xstatic-jquery.tablesorter>=2.0.5b.0 # MIT License
xstatic-jquery-ui>=1.10.1 # MIT License
xstatic-jsencrypt>=2.0.0.2 # MIT License
xstatic-qunit>=1.14.0.2 # MIT License
xstatic-rickshaw>=1.5.0 # BSD License (prior)