← Back to branch summary

~ubuntu-branches/ubuntu/vivid/horizon/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/embedded-xstatic.patch

  • Committer: Package Import Robot
  • Author(s): James Page, Chris Johnston, James Page
  • Date: 2014-10-03 17:54:18 UTC
  • mfrom: (0.3.1) (1.2.2)
  • Revision ID: package-import@ubuntu.com-20141003175418-wuk513xcytndqft7
Tags: 1:2014.2~rc1-0ubuntu1
https://launchpad.net/bugs/1308651
[ Chris Johnston ]
* d/theme/css/ubuntu.css: Fix Ubuntu theme for Instances "more" dropdown
  (LP: #1308651).

[ James Page ]
* New upstream release candidate:
  - d/p/*: Refresh.
* d/watch: Use tarballs.openstack.org for upstream releases. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/embedded-xstatic.patch
5
5
 
6
6
--- a/horizon/test/settings.py
7
7
+++ b/horizon/test/settings.py
8
 
@@ -22,22 +22,22 @@ import sys
 
8
@@ -22,25 +22,25 @@ import sys
9
9
 
10
10
 import django
11
11
 from django.utils import html_parser
13
13
-import xstatic.pkg.angular
14
14
-import xstatic.pkg.angular_cookies
15
15
-import xstatic.pkg.angular_mock
 
16
-import xstatic.pkg.bootstrap_datepicker
 
17
-import xstatic.pkg.bootstrap_scss
16
18
-import xstatic.pkg.d3
17
19
-import xstatic.pkg.font_awesome
18
20
-import xstatic.pkg.hogan
21
23
-import xstatic.pkg.jquery_migrate
22
24
-import xstatic.pkg.jquery_quicksearch
23
25
-import xstatic.pkg.jquery_tablesorter
 
26
-import xstatic.pkg.jquery_ui
24
27
-import xstatic.pkg.jsencrypt
25
28
-import xstatic.pkg.qunit
26
29
-import xstatic.pkg.rickshaw
29
32
+import horizon.xstatic.pkg.angular
30
33
+import horizon.xstatic.pkg.angular_cookies
31
34
+import horizon.xstatic.pkg.angular_mock
 
35
+import horizon.xstatic.pkg.bootstrap_datepicker
 
36
+import horizon.xstatic.pkg.bootstrap_scss
32
37
+import horizon.xstatic.pkg.d3
33
38
+import horizon.xstatic.pkg.font_awesome
34
39
+import horizon.xstatic.pkg.hogan
37
42
+import horizon.xstatic.pkg.jquery_migrate
38
43
+import horizon.xstatic.pkg.jquery_quicksearch
39
44
+import horizon.xstatic.pkg.jquery_tablesorter
 
45
+import horizon.xstatic.pkg.jquery_ui
40
46
+import horizon.xstatic.pkg.jsencrypt
41
47
+import horizon.xstatic.pkg.qunit
42
48
+import horizon.xstatic.pkg.rickshaw
44
50
 
45
51
 from horizon.test import patches
46
52
 
47
 
@@ -154,35 +154,35 @@ STATICFILES_FINDERS = (
 
53
@@ -158,49 +158,49 @@ STATICFILES_FINDERS = (
48
54
 
49
 
 STATICFILES_DIRS = (
 
55
 STATICFILES_DIRS = [
50
56
     ('horizon/lib/angular',
51
57
-        xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
52
58
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular).base_dir),
56
62
     ('horizon/lib/angular',
57
63
-        xstatic.main.XStatic(xstatic.pkg.angular_mock).base_dir),
58
64
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_mock).base_dir),
 
65
     ('horizon/lib/bootstrap_datepicker',
 
66
-        xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
 
67
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_datepicker).base_dir),
 
68
     ('bootstrap',
 
69
-        xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
 
70
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_scss).base_dir),
59
71
     ('horizon/lib',
60
72
-        xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
61
73
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.d3).base_dir),
92
104
     ('horizon/lib',
93
105
-        xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
94
106
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.spin).base_dir),
95
 
 )
 
107
 ]
 
108
 
 
109
-if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
 
110
+if horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).version.startswith('1.10.'):
 
111
     # The 1.10.x versions already contain the 'ui' directory.
 
112
     STATICFILES_DIRS.append(('horizon/lib/jquery-ui',
 
113
-        xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
 
114
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
 
115
 else:
 
116
     # Newer versions dropped the directory, add it to keep the path the same.
 
117
     STATICFILES_DIRS.append(('horizon/lib/jquery-ui/ui',
 
118
-        xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
 
119
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
96
120
 
97
121
 LOGGING = {
 
122
     'version': 1,
98
123
--- a/openstack_dashboard/settings.py
99
124
+++ b/openstack_dashboard/settings.py
100
 
@@ -22,22 +22,22 @@ import sys
 
125
@@ -22,25 +22,25 @@ import sys
101
126
 import warnings
102
127
 
103
128
 from django.utils.translation import ugettext_lazy as _
105
130
-import xstatic.pkg.angular
106
131
-import xstatic.pkg.angular_cookies
107
132
-import xstatic.pkg.angular_mock
 
133
-import xstatic.pkg.bootstrap_datepicker
 
134
-import xstatic.pkg.bootstrap_scss
108
135
-import xstatic.pkg.d3
109
136
-import xstatic.pkg.font_awesome
110
137
-import xstatic.pkg.hogan
113
140
-import xstatic.pkg.jquery_migrate
114
141
-import xstatic.pkg.jquery_quicksearch
115
142
-import xstatic.pkg.jquery_tablesorter
 
143
-import xstatic.pkg.jquery_ui
116
144
-import xstatic.pkg.jsencrypt
117
145
-import xstatic.pkg.qunit
118
146
-import xstatic.pkg.rickshaw
121
149
+import horizon.xstatic.pkg.angular
122
150
+import horizon.xstatic.pkg.angular_cookies
123
151
+import horizon.xstatic.pkg.angular_mock
 
152
+import horizon.xstatic.pkg.bootstrap_datepicker
 
153
+import horizon.xstatic.pkg.bootstrap_scss
124
154
+import horizon.xstatic.pkg.d3
125
155
+import horizon.xstatic.pkg.font_awesome
126
156
+import horizon.xstatic.pkg.hogan
129
159
+import horizon.xstatic.pkg.jquery_migrate
130
160
+import horizon.xstatic.pkg.jquery_quicksearch
131
161
+import horizon.xstatic.pkg.jquery_tablesorter
 
162
+import horizon.xstatic.pkg.jquery_ui
132
163
+import horizon.xstatic.pkg.jsencrypt
133
164
+import horizon.xstatic.pkg.qunit
134
165
+import horizon.xstatic.pkg.rickshaw
136
167
 
137
168
 from openstack_dashboard import exceptions
138
169
 
139
 
@@ -151,35 +151,35 @@ STATICFILES_FINDERS = (
 
170
@@ -154,50 +154,50 @@ STATICFILES_FINDERS = (
140
171
 
141
 
 STATICFILES_DIRS = (
 
172
 STATICFILES_DIRS = [
142
173
     ('horizon/lib/angular',
143
174
-        xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
144
175
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular).base_dir),
148
179
     ('horizon/lib/angular',
149
180
-        xstatic.main.XStatic(xstatic.pkg.angular_mock).base_dir),
150
181
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.angular_mock).base_dir),
 
182
     ('horizon/lib/bootstrap_datepicker',
 
183
-        xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
 
184
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_datepicker).base_dir),
 
185
     ('bootstrap',
 
186
-        xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
 
187
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.bootstrap_scss).base_dir),
151
188
     ('horizon/lib',
152
189
-        xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
153
190
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.d3).base_dir),
184
221
     ('horizon/lib',
185
222
-        xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
186
223
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.spin).base_dir),
187
 
 )
 
224
 ]
 
225
 
 
226
 
 
227
-if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
 
228
+if horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).version.startswith('1.10.'):
 
229
     # The 1.10.x versions already contain the 'ui' directory.
 
230
     STATICFILES_DIRS.append(('horizon/lib/jquery-ui',
 
231
-        xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
 
232
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
 
233
 else:
 
234
     # Newer versions dropped the directory, add it to keep the path the same.
 
235
     STATICFILES_DIRS.append(('horizon/lib/jquery-ui/ui',
 
236
-        xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
 
237
+        horizon.xstatic.main.XStatic(horizon.xstatic.pkg.jquery_ui).base_dir))
188
238
 
189
239
 COMPRESS_PRECOMPILERS = (
 
240
     ('text/scss', 'django_pyscss.compressor.DjangoScssFilter'),