4 |
4 |
5 NOTE: This patch is applied AFTER gmake install has completed rather |
5 NOTE: This patch is applied AFTER gmake install has completed rather |
6 than during gmake prep. We need the xstatic functionality to collect |
6 than during gmake prep. We need the xstatic functionality to collect |
7 all the JavaScript libraries before packaging. |
7 all the JavaScript libraries before packaging. |
8 |
8 |
9 --- /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py.orig 2015-05-04 16:35:35.859239557 -0600 |
9 --- /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py.~1~ 2016-04-26 02:16:33.459370382 -0800 |
10 +++ /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py 2015-05-04 16:35:58.697407748 -0600 |
10 +++ /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py 2016-04-26 02:17:12.667657098 -0800 |
11 @@ -17,99 +17,5 @@ distributions can edit or replace this f |
11 @@ -18,117 +18,11 @@ to match their distribution's standards. |
12 to match their distribution's standards. |
|
13 """ |
12 """ |
14 |
13 |
|
14 import os |
|
15 - |
15 -import xstatic.main |
16 -import xstatic.main |
16 -import xstatic.pkg.angular |
17 -import xstatic.pkg.angular |
17 -import xstatic.pkg.angular_bootstrap |
18 -import xstatic.pkg.angular_bootstrap |
|
19 -import xstatic.pkg.angular_gettext |
18 -import xstatic.pkg.angular_lrdragndrop |
20 -import xstatic.pkg.angular_lrdragndrop |
19 -import xstatic.pkg.angular_smart_table |
21 -import xstatic.pkg.angular_smart_table |
20 -import xstatic.pkg.bootstrap_datepicker |
22 -import xstatic.pkg.bootstrap_datepicker |
21 -import xstatic.pkg.bootstrap_scss |
23 -import xstatic.pkg.bootstrap_scss |
|
24 -import xstatic.pkg.bootswatch |
22 -import xstatic.pkg.d3 |
25 -import xstatic.pkg.d3 |
23 -import xstatic.pkg.font_awesome |
26 -import xstatic.pkg.font_awesome |
24 -import xstatic.pkg.hogan |
27 -import xstatic.pkg.hogan |
25 -import xstatic.pkg.jquery |
28 -import xstatic.pkg.jquery |
26 -import xstatic.pkg.jquery_migrate |
29 -import xstatic.pkg.jquery_migrate |
27 -import xstatic.pkg.jquery_quicksearch |
30 -import xstatic.pkg.jquery_quicksearch |
28 -import xstatic.pkg.jquery_tablesorter |
31 -import xstatic.pkg.jquery_tablesorter |
29 -import xstatic.pkg.jquery_ui |
32 -import xstatic.pkg.jquery_ui |
30 -import xstatic.pkg.jsencrypt |
33 -import xstatic.pkg.jsencrypt |
31 -import xstatic.pkg.magic_search |
34 -import xstatic.pkg.mdi |
32 -import xstatic.pkg.rickshaw |
35 -import xstatic.pkg.rickshaw |
|
36 -import xstatic.pkg.roboto_fontface |
33 -import xstatic.pkg.spin |
37 -import xstatic.pkg.spin |
34 -import xstatic.pkg.termjs |
38 -import xstatic.pkg.termjs |
35 - |
39 - |
36 - |
40 from horizon.utils import file_discovery |
|
41 |
|
42 |
37 def get_staticfiles_dirs(webroot='/'): |
43 def get_staticfiles_dirs(webroot='/'): |
38 - STATICFILES_DIRS = [ |
44 - STATICFILES_DIRS = [ |
39 - ('horizon/lib/angular', |
45 - ('horizon/lib/angular', |
40 - xstatic.main.XStatic(xstatic.pkg.angular, |
46 - xstatic.main.XStatic(xstatic.pkg.angular, |
41 - root_url=webroot).base_dir), |
47 - root_url=webroot).base_dir), |
42 - ('horizon/lib/angular', |
48 - ('horizon/lib/angular', |
43 - xstatic.main.XStatic(xstatic.pkg.angular_bootstrap, |
49 - xstatic.main.XStatic(xstatic.pkg.angular_bootstrap, |
|
50 - root_url=webroot).base_dir), |
|
51 - ('horizon/lib/angular', |
|
52 - xstatic.main.XStatic(xstatic.pkg.angular_gettext, |
44 - root_url=webroot).base_dir), |
53 - root_url=webroot).base_dir), |
45 - ('horizon/lib/angular', |
54 - ('horizon/lib/angular', |
46 - xstatic.main.XStatic(xstatic.pkg.angular_lrdragndrop, |
55 - xstatic.main.XStatic(xstatic.pkg.angular_lrdragndrop, |
47 - root_url=webroot).base_dir), |
56 - root_url=webroot).base_dir), |
48 - ('horizon/lib/angular', |
57 - ('horizon/lib/angular', |
52 - xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker, |
61 - xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker, |
53 - root_url=webroot).base_dir), |
62 - root_url=webroot).base_dir), |
54 - ('bootstrap', |
63 - ('bootstrap', |
55 - xstatic.main.XStatic(xstatic.pkg.bootstrap_scss, |
64 - xstatic.main.XStatic(xstatic.pkg.bootstrap_scss, |
56 - root_url=webroot).base_dir), |
65 - root_url=webroot).base_dir), |
|
66 - ('horizon/lib/bootswatch', |
|
67 - xstatic.main.XStatic(xstatic.pkg.bootswatch, |
|
68 - root_url=webroot).base_dir), |
57 - ('horizon/lib', |
69 - ('horizon/lib', |
58 - xstatic.main.XStatic(xstatic.pkg.d3, |
70 - xstatic.main.XStatic(xstatic.pkg.d3, |
59 - root_url=webroot).base_dir), |
71 - root_url=webroot).base_dir), |
60 - ('horizon/lib', |
72 - ('horizon/lib', |
61 - xstatic.main.XStatic(xstatic.pkg.hogan, |
73 - xstatic.main.XStatic(xstatic.pkg.hogan, |
76 - xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter, |
88 - xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter, |
77 - root_url=webroot).base_dir), |
89 - root_url=webroot).base_dir), |
78 - ('horizon/lib/jsencrypt', |
90 - ('horizon/lib/jsencrypt', |
79 - xstatic.main.XStatic(xstatic.pkg.jsencrypt, |
91 - xstatic.main.XStatic(xstatic.pkg.jsencrypt, |
80 - root_url=webroot).base_dir), |
92 - root_url=webroot).base_dir), |
81 - ('horizon/lib/magic_search', |
93 - ('horizon/lib/mdi', |
82 - xstatic.main.XStatic(xstatic.pkg.magic_search, |
94 - xstatic.main.XStatic(xstatic.pkg.mdi, |
83 - root_url=webroot).base_dir), |
95 - root_url=webroot).base_dir), |
84 - ('horizon/lib', |
96 - ('horizon/lib', |
85 - xstatic.main.XStatic(xstatic.pkg.rickshaw, |
97 - xstatic.main.XStatic(xstatic.pkg.rickshaw, |
86 - root_url=webroot).base_dir), |
98 - root_url=webroot).base_dir), |
|
99 - ('horizon/lib/roboto_fontface', |
|
100 - xstatic.main.XStatic(xstatic.pkg.roboto_fontface, |
|
101 - root_url=webroot).base_dir), |
87 - ('horizon/lib', |
102 - ('horizon/lib', |
88 - xstatic.main.XStatic(xstatic.pkg.spin, |
103 - xstatic.main.XStatic(xstatic.pkg.spin, |
89 - root_url=webroot).base_dir), |
104 - root_url=webroot).base_dir), |
90 - ('horizon/lib', |
105 - ('horizon/lib', |
91 - xstatic.main.XStatic(xstatic.pkg.termjs, |
106 - xstatic.main.XStatic(xstatic.pkg.termjs, |
92 - root_url=webroot).base_dir), |
107 - root_url=webroot).base_dir), |
93 - ] |
108 - ] |
94 - |
109 - |
95 - if xstatic.main.XStatic(xstatic.pkg.jquery_ui, |
110 - if xstatic.main.XStatic(xstatic.pkg.jquery_ui, |
96 - root_url=webroot).version.startswith('1.10.'): |
111 - root_url=webroot).version.startswith('1.10.'): |
97 - # The 1.10.x versions already contain the 'ui' directory. |
112 - # The 1.10.x versions already contain the 'ui' directory. |