|
1 In-house patch to remove the imports of xstatic packages. These |
|
2 imports are no longer needed as the static assets are collected at |
|
3 package time and the xstatic modules are not being delivered. |
|
4 |
|
5 NOTE: This patch is applied AFTER gmake install has completed rather |
|
6 than during gmake prep. We need the xstatic functionality to collect |
|
7 all the JavaScript libraries before packaging. |
|
8 |
|
9 --- a/usr/lib/python2.6/vendor-packages/openstack_dashboard/settings.py 2015-01-13 10:40:30.930622964 -0700 |
|
10 +++ b/usr/lib/python2.6/vendor-packages/openstack_dashboard/settings.py 2015-01-13 10:40:57.470743881 -0700 |
|
11 @@ -22,21 +22,6 @@ import sys |
|
12 import warnings |
|
13 |
|
14 from django.utils.translation import ugettext_lazy as _ |
|
15 -import xstatic.main |
|
16 -import xstatic.pkg.angular |
|
17 -import xstatic.pkg.bootstrap_datepicker |
|
18 -import xstatic.pkg.bootstrap_scss |
|
19 -import xstatic.pkg.d3 |
|
20 -import xstatic.pkg.font_awesome |
|
21 -import xstatic.pkg.hogan |
|
22 -import xstatic.pkg.jquery |
|
23 -import xstatic.pkg.jquery_migrate |
|
24 -import xstatic.pkg.jquery_quicksearch |
|
25 -import xstatic.pkg.jquery_tablesorter |
|
26 -import xstatic.pkg.jquery_ui |
|
27 -import xstatic.pkg.jsencrypt |
|
28 -import xstatic.pkg.rickshaw |
|
29 -import xstatic.pkg.spin |
|
30 |
|
31 from openstack_dashboard import exceptions |
|
32 |
|
33 @@ -148,45 +133,6 @@ STATICFILES_FINDERS = ( |
|
34 'compressor.finders.CompressorFinder', |
|
35 ) |
|
36 |
|
37 -STATICFILES_DIRS = [ |
|
38 - ('horizon/lib/angular', |
|
39 - xstatic.main.XStatic(xstatic.pkg.angular).base_dir), |
|
40 - ('horizon/lib/bootstrap_datepicker', |
|
41 - xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir), |
|
42 - ('bootstrap', |
|
43 - xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir), |
|
44 - ('horizon/lib', |
|
45 - xstatic.main.XStatic(xstatic.pkg.d3).base_dir), |
|
46 - ('horizon/lib', |
|
47 - xstatic.main.XStatic(xstatic.pkg.hogan).base_dir), |
|
48 - ('horizon/lib/font-awesome', |
|
49 - xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir), |
|
50 - ('horizon/lib/jquery', |
|
51 - xstatic.main.XStatic(xstatic.pkg.jquery).base_dir), |
|
52 - ('horizon/lib/jquery', |
|
53 - xstatic.main.XStatic(xstatic.pkg.jquery_migrate).base_dir), |
|
54 - ('horizon/lib/jquery', |
|
55 - xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch).base_dir), |
|
56 - ('horizon/lib/jquery', |
|
57 - xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter).base_dir), |
|
58 - ('horizon/lib/jsencrypt', |
|
59 - xstatic.main.XStatic(xstatic.pkg.jsencrypt).base_dir), |
|
60 - ('horizon/lib', |
|
61 - xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir), |
|
62 - ('horizon/lib', |
|
63 - xstatic.main.XStatic(xstatic.pkg.spin).base_dir), |
|
64 -] |
|
65 - |
|
66 - |
|
67 -if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'): |
|
68 - # The 1.10.x versions already contain the 'ui' directory. |
|
69 - STATICFILES_DIRS.append(('horizon/lib/jquery-ui', |
|
70 - xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir)) |
|
71 -else: |
|
72 - # Newer versions dropped the directory, add it to keep the path the same. |
|
73 - STATICFILES_DIRS.append(('horizon/lib/jquery-ui/ui', |
|
74 - xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir)) |
|
75 - |
|
76 COMPRESS_PRECOMPILERS = ( |
|
77 ('text/scss', 'django_pyscss.compressor.DjangoScssFilter'), |
|
78 ) |