9
9
openstack_dashboard/settings.py | 78 ++++++++++++++++++++---------------------
10
10
2 files changed, 77 insertions(+), 77 deletions(-)
12
--- a/horizon/test/settings.py
13
+++ b/horizon/test/settings.py
14
@@ -22,25 +22,25 @@ import sys
17
from django.utils import html_parser
19
-import xstatic.pkg.angular
20
-import xstatic.pkg.angular_cookies
21
-import xstatic.pkg.angular_mock
22
-import xstatic.pkg.bootstrap_datepicker
23
-import xstatic.pkg.bootstrap_scss
24
-import xstatic.pkg.d3
25
-import xstatic.pkg.font_awesome
26
-import xstatic.pkg.hogan
27
-import xstatic.pkg.jasmine
28
-import xstatic.pkg.jquery
29
-import xstatic.pkg.jquery_migrate
30
-import xstatic.pkg.jquery_quicksearch
31
-import xstatic.pkg.jquery_tablesorter
32
-import xstatic.pkg.jquery_ui
33
-import xstatic.pkg.jsencrypt
34
-import xstatic.pkg.qunit
35
-import xstatic.pkg.rickshaw
36
-import xstatic.pkg.spin
37
+import horizon.xstatic.main
38
+import horizon.xstatic.pkg.angular
39
+import horizon.xstatic.pkg.angular_cookies
40
+import horizon.xstatic.pkg.angular_mock
41
+import horizon.xstatic.pkg.bootstrap_datepicker
42
+import horizon.xstatic.pkg.bootstrap_scss
43
+import horizon.xstatic.pkg.d3
44
+import horizon.xstatic.pkg.font_awesome
45
+import horizon.xstatic.pkg.hogan
46
+import horizon.xstatic.pkg.jasmine
47
+import horizon.xstatic.pkg.jquery
48
+import horizon.xstatic.pkg.jquery_migrate
49
+import horizon.xstatic.pkg.jquery_quicksearch
50
+import horizon.xstatic.pkg.jquery_tablesorter
51
+import horizon.xstatic.pkg.jquery_ui
52
+import horizon.xstatic.pkg.jsencrypt
53
+import horizon.xstatic.pkg.qunit
54
+import horizon.xstatic.pkg.rickshaw
55
+import horizon.xstatic.pkg.spin
57
from horizon.test import patches
59
@@ -158,51 +158,51 @@ STATICFILES_FINDERS = (
62
('horizon/lib/angular',
63
- xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
64
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular).base_dir),
65
('horizon/lib/angular',
66
- xstatic.main.XStatic(xstatic.pkg.angular_cookies).base_dir),
67
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_cookies).base_dir),
68
('horizon/lib/angular',
69
- xstatic.main.XStatic(xstatic.pkg.angular_mock).base_dir),
70
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_mock).base_dir),
71
('horizon/lib/bootstrap_datepicker',
72
- xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
73
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_datepicker).base_dir),
75
- xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
76
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_scss).base_dir),
78
- xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
79
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.d3).base_dir),
81
- xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
82
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.hogan).base_dir),
83
('horizon/lib/font-awesome',
84
- xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
85
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.font_awesome).base_dir),
86
('horizon/lib/jasmine-1.3.1',
87
- xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
88
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jasmine).base_dir),
89
('horizon/lib/jquery',
90
- xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
91
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery).base_dir),
92
('horizon/lib/jquery',
93
- xstatic.main.XStatic(xstatic.pkg.jquery_migrate).base_dir),
94
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_migrate).base_dir),
95
('horizon/lib/jquery',
96
- xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch).base_dir),
97
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_quicksearch).base_dir),
98
('horizon/lib/jquery',
99
- xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter).base_dir),
100
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_tablesorter).base_dir),
101
('horizon/lib/jsencrypt',
102
- xstatic.main.XStatic(xstatic.pkg.jsencrypt).base_dir),
103
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jsencrypt).base_dir),
104
('horizon/lib/qunit',
105
- xstatic.main.XStatic(xstatic.pkg.qunit).base_dir),
106
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.qunit).base_dir),
108
- xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
109
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.rickshaw).base_dir),
111
- xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
112
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.spin).base_dir),
115
-if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
116
+if horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).version.startswith('1.10.'):
117
# The 1.10.x versions already contain the 'ui' directory.
118
STATICFILES_DIRS.append(
119
('horizon/lib/jquery-ui',
120
- xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
121
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
123
# Newer versions dropped the directory, add it to keep the path the same.
124
STATICFILES_DIRS.append(
125
('horizon/lib/jquery-ui/ui',
126
- xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
127
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
131
--- a/openstack_dashboard/settings.py
132
+++ b/openstack_dashboard/settings.py
133
@@ -22,25 +22,25 @@ import sys
136
from django.utils.translation import ugettext_lazy as _
138
-import xstatic.pkg.angular
139
-import xstatic.pkg.angular_cookies
140
-import xstatic.pkg.angular_mock
141
-import xstatic.pkg.bootstrap_datepicker
142
-import xstatic.pkg.bootstrap_scss
143
-import xstatic.pkg.d3
144
-import xstatic.pkg.font_awesome
145
-import xstatic.pkg.hogan
146
-import xstatic.pkg.jasmine
147
-import xstatic.pkg.jquery
148
-import xstatic.pkg.jquery_migrate
149
-import xstatic.pkg.jquery_quicksearch
150
-import xstatic.pkg.jquery_tablesorter
151
-import xstatic.pkg.jquery_ui
152
-import xstatic.pkg.jsencrypt
153
-import xstatic.pkg.qunit
154
-import xstatic.pkg.rickshaw
155
-import xstatic.pkg.spin
156
+import horizon.xstatic.main
157
+import horizon.xstatic.pkg.angular
158
+import horizon.xstatic.pkg.angular_cookies
159
+import horizon.xstatic.pkg.angular_mock
160
+import horizon.xstatic.pkg.bootstrap_datepicker
161
+import horizon.xstatic.pkg.bootstrap_scss
162
+import horizon.xstatic.pkg.d3
163
+import horizon.xstatic.pkg.font_awesome
164
+import horizon.xstatic.pkg.hogan
165
+import horizon.xstatic.pkg.jasmine
166
+import horizon.xstatic.pkg.jquery
167
+import horizon.xstatic.pkg.jquery_migrate
168
+import horizon.xstatic.pkg.jquery_quicksearch
169
+import horizon.xstatic.pkg.jquery_tablesorter
170
+import horizon.xstatic.pkg.jquery_ui
171
+import horizon.xstatic.pkg.jsencrypt
172
+import horizon.xstatic.pkg.qunit
173
+import horizon.xstatic.pkg.rickshaw
174
+import horizon.xstatic.pkg.spin
176
from openstack_dashboard import exceptions
178
@@ -152,52 +152,52 @@ STATICFILES_FINDERS = (
181
('horizon/lib/angular',
182
- xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
183
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular).base_dir),
184
('horizon/lib/angular',
185
- xstatic.main.XStatic(xstatic.pkg.angular_cookies).base_dir),
186
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_cookies).base_dir),
187
('horizon/lib/angular',
188
- xstatic.main.XStatic(xstatic.pkg.angular_mock).base_dir),
189
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_mock).base_dir),
190
('horizon/lib/bootstrap_datepicker',
191
- xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
192
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_datepicker).base_dir),
194
- xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
195
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_scss).base_dir),
197
- xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
198
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.d3).base_dir),
200
- xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
201
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.hogan).base_dir),
202
('horizon/lib/font-awesome',
203
- xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
204
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.font_awesome).base_dir),
205
('horizon/lib/jasmine-1.3.1',
206
- xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
207
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jasmine).base_dir),
208
('horizon/lib/jquery',
209
- xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
210
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery).base_dir),
211
('horizon/lib/jquery',
212
- xstatic.main.XStatic(xstatic.pkg.jquery_migrate).base_dir),
213
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_migrate).base_dir),
214
('horizon/lib/jquery',
215
- xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch).base_dir),
216
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_quicksearch).base_dir),
217
('horizon/lib/jquery',
218
- xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter).base_dir),
219
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_tablesorter).base_dir),
220
('horizon/lib/jsencrypt',
221
- xstatic.main.XStatic(xstatic.pkg.jsencrypt).base_dir),
222
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jsencrypt).base_dir),
223
('horizon/lib/qunit',
224
- xstatic.main.XStatic(xstatic.pkg.qunit).base_dir),
225
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.qunit).base_dir),
227
- xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
228
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.rickshaw).base_dir),
230
- xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
231
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.spin).base_dir),
235
-if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
236
+if horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).version.startswith('1.10.'):
237
# The 1.10.x versions already contain the 'ui' directory.
238
STATICFILES_DIRS.append(
239
('horizon/lib/jquery-ui',
240
- xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
241
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
243
# Newer versions dropped the directory, add it to keep the path the same.
244
STATICFILES_DIRS.append(
245
('horizon/lib/jquery-ui/ui',
246
- xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
247
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
249
COMPRESS_PRECOMPILERS = (
250
('text/scss', 'django_pyscss.compressor.DjangoScssFilter'),
12
--- a/openstack_dashboard/static_settings.py
13
+++ b/openstack_dashboard/static_settings.py
15
to match their distribution's standards.
19
-import xstatic.pkg.angular
20
-import xstatic.pkg.angular_bootstrap
21
-import xstatic.pkg.angular_smart_table
22
-import xstatic.pkg.bootstrap_datepicker
23
-import xstatic.pkg.bootstrap_scss
24
-import xstatic.pkg.d3
25
-import xstatic.pkg.font_awesome
26
-import xstatic.pkg.hogan
27
-import xstatic.pkg.jasmine
28
-import xstatic.pkg.jquery
29
-import xstatic.pkg.jquery_migrate
30
-import xstatic.pkg.jquery_quicksearch
31
-import xstatic.pkg.jquery_tablesorter
32
-import xstatic.pkg.jquery_ui
33
-import xstatic.pkg.jsencrypt
34
-import xstatic.pkg.qunit
35
-import xstatic.pkg.rickshaw
36
-import xstatic.pkg.spin
37
+import horizon.xstatic.main
38
+import horizon.xstatic.pkg.angular
39
+import horizon.xstatic.pkg.angular_bootstrap
40
+import horizon.xstatic.pkg.angular_smart_table
41
+import horizon.xstatic.pkg.bootstrap_datepicker
42
+import horizon.xstatic.pkg.bootstrap_scss
43
+import horizon.xstatic.pkg.d3
44
+import horizon.xstatic.pkg.font_awesome
45
+import horizon.xstatic.pkg.hogan
46
+import horizon.xstatic.pkg.jasmine
47
+import horizon.xstatic.pkg.jquery
48
+import horizon.xstatic.pkg.jquery_migrate
49
+import horizon.xstatic.pkg.jquery_quicksearch
50
+import horizon.xstatic.pkg.jquery_tablesorter
51
+import horizon.xstatic.pkg.jquery_ui
52
+import horizon.xstatic.pkg.jsencrypt
53
+import horizon.xstatic.pkg.qunit
54
+import horizon.xstatic.pkg.rickshaw
55
+import horizon.xstatic.pkg.spin
59
('horizon/lib/angular',
60
- xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
61
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular).base_dir),
62
('horizon/lib/angular',
63
- xstatic.main.XStatic(xstatic.pkg.angular_bootstrap).base_dir),
64
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_bootstrap).base_dir),
65
('horizon/lib/smart-table',
66
- xstatic.main.XStatic(xstatic.pkg.angular_smart_table).base_dir),
67
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_smart_table).base_dir),
68
('horizon/lib/bootstrap_datepicker',
69
- xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
70
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_datepicker).base_dir),
72
- xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
73
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_scss).base_dir),
75
- xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
76
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.d3).base_dir),
78
- xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
79
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.hogan).base_dir),
80
('horizon/lib/font-awesome',
81
- xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
82
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.font_awesome).base_dir),
83
('horizon/lib/jasmine',
84
- xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
85
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jasmine).base_dir),
86
('horizon/lib/jquery',
87
- xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
88
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery).base_dir),
89
('horizon/lib/jquery',
90
- xstatic.main.XStatic(xstatic.pkg.jquery_migrate).base_dir),
91
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_migrate).base_dir),
92
('horizon/lib/jquery',
93
- xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch).base_dir),
94
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_quicksearch).base_dir),
95
('horizon/lib/jquery',
96
- xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter).base_dir),
97
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_tablesorter).base_dir),
98
('horizon/lib/jsencrypt',
99
- xstatic.main.XStatic(xstatic.pkg.jsencrypt).base_dir),
100
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jsencrypt).base_dir),
101
('horizon/lib/qunit',
102
- xstatic.main.XStatic(xstatic.pkg.qunit).base_dir),
103
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.qunit).base_dir),
105
- xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
106
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.rickshaw).base_dir),
108
- xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
109
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.spin).base_dir),
113
-if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
114
+if horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).version.startswith('1.10.'):
115
# The 1.10.x versions already contain the 'ui' directory.
116
STATICFILES_DIRS.append(
117
('horizon/lib/jquery-ui',
118
- xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
119
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
121
# Newer versions dropped the directory, add it to keep the path the same.
122
STATICFILES_DIRS.append(
123
('horizon/lib/jquery-ui/ui',
124
- xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
125
+ horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))