← Back to branch summary

~ubuntu-branches/ubuntu/raring/horizon/raring

« back to all changes in this revision

Viewing changes to debian/patches/add_juju_settings_panel.patch

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-06-01 10:57:56 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120601105756-dif0km7n98vhdi2x
Tags: 2012.2~f2~20120530.1777-0ubuntu1
* New upstream release. 
* debian/patches/add_juju_settings_panel.patch: Refreshed
* debian/patches/turn-off-debug.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/add_juju_settings_panel.patch
1
 
Index: horizon/horizon/dashboards/settings/dashboard.py
2
 
===================================================================
3
 
--- horizon.orig/horizon/dashboards/settings/dashboard.py       2012-04-11 20:01:15.375885784 -0700
4
 
+++ horizon/horizon/dashboards/settings/dashboard.py    2012-04-11 20:02:56.531890920 -0700
 
1
diff -Naurp horizon.orig/horizon/dashboards/settings/dashboard.py horizon/horizon/dashboards/settings/dashboard.py
 
2
--- horizon.orig/horizon/dashboards/settings/dashboard.py       2012-05-31 14:08:31.380889052 -0400
 
3
+++ horizon/horizon/dashboards/settings/dashboard.py    2012-05-31 14:09:09.112889071 -0400
5
4
@@ -16,6 +16,7 @@
6
5
 #    under the License.
7
6
 
10
9
 
11
10
 import horizon
12
11
 
13
 
@@ -23,7 +24,15 @@
 
12
@@ -23,7 +24,15 @@ import horizon
14
13
 class Settings(horizon.Dashboard):
15
14
     name = _("Settings")
16
15
     slug = "settings"
27
26
     default_panel = 'user'
28
27
     nav = False
29
28
 
30
 
Index: horizon/horizon/dashboards/settings/juju/__init__.py
31
 
===================================================================
32
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
33
 
+++ horizon/horizon/dashboards/settings/juju/__init__.py        2012-04-11 20:02:56.531890920 -0700
34
 
@@ -0,0 +1 @@
35
 
+# Horizon Juju settings panel
36
 
Index: horizon/horizon/dashboards/settings/juju/forms.py
37
 
===================================================================
38
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
39
 
+++ horizon/horizon/dashboards/settings/juju/forms.py   2012-04-11 20:02:56.535890920 -0700
 
29
diff -Naurp horizon.orig/horizon/dashboards/settings/juju/forms.py horizon/horizon/dashboards/settings/juju/forms.py
 
30
--- horizon.orig/horizon/dashboards/settings/juju/forms.py      1969-12-31 19:00:00.000000000 -0500
 
31
+++ horizon/horizon/dashboards/settings/juju/forms.py   2012-05-31 14:09:09.116889042 -0400
40
32
@@ -0,0 +1,96 @@
41
33
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
42
34
+
134
126
+        response['Content-Disposition'] = 'attachment; filename=environments.yaml'
135
127
+        response['Content-Length'] = str(len(response.content))
136
128
+        return response
137
 
Index: horizon/horizon/dashboards/settings/juju/panel.py
138
 
===================================================================
139
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
140
 
+++ horizon/horizon/dashboards/settings/juju/panel.py   2012-04-11 20:02:56.535890920 -0700
 
129
diff -Naurp horizon.orig/horizon/dashboards/settings/juju/__init__.py horizon/horizon/dashboards/settings/juju/__init__.py
 
130
--- horizon.orig/horizon/dashboards/settings/juju/__init__.py   1969-12-31 19:00:00.000000000 -0500
 
131
+++ horizon/horizon/dashboards/settings/juju/__init__.py        2012-05-31 14:09:09.112889071 -0400
 
132
@@ -0,0 +1 @@
 
133
+# Horizon Juju settings panel
 
134
diff -Naurp horizon.orig/horizon/dashboards/settings/juju/panel.py horizon/horizon/dashboards/settings/juju/panel.py
 
135
--- horizon.orig/horizon/dashboards/settings/juju/panel.py      1969-12-31 19:00:00.000000000 -0500
 
136
+++ horizon/horizon/dashboards/settings/juju/panel.py   2012-05-31 14:09:09.116889042 -0400
141
137
@@ -0,0 +1,28 @@
142
138
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
143
139
+# Copyright 2012 Openstack, LLC
167
163
+
168
164
+
169
165
+dashboard.Settings.register(JujuPanel)
170
 
Index: horizon/horizon/dashboards/settings/juju/urls.py
171
 
===================================================================
172
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
173
 
+++ horizon/horizon/dashboards/settings/juju/urls.py    2012-04-11 20:02:56.535890920 -0700
 
166
diff -Naurp horizon.orig/horizon/dashboards/settings/juju/urls.py horizon/horizon/dashboards/settings/juju/urls.py
 
167
--- horizon.orig/horizon/dashboards/settings/juju/urls.py       1969-12-31 19:00:00.000000000 -0500
 
168
+++ horizon/horizon/dashboards/settings/juju/urls.py    2012-05-31 14:09:09.116889042 -0400
174
169
@@ -0,0 +1,24 @@
175
170
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
176
171
+
196
191
+urlpatterns = patterns('horizon.dashboards.settings.juju.views',
197
192
+    url(r'^$', IndexView.as_view(), name='index'),
198
193
+)
199
 
Index: horizon/horizon/dashboards/settings/juju/views.py
200
 
===================================================================
201
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
202
 
+++ horizon/horizon/dashboards/settings/juju/views.py   2012-04-11 20:02:56.535890920 -0700
 
194
diff -Naurp horizon.orig/horizon/dashboards/settings/juju/views.py horizon/horizon/dashboards/settings/juju/views.py
 
195
--- horizon.orig/horizon/dashboards/settings/juju/views.py      1969-12-31 19:00:00.000000000 -0500
 
196
+++ horizon/horizon/dashboards/settings/juju/views.py   2012-05-31 14:09:09.116889042 -0400
203
197
@@ -0,0 +1,28 @@
204
198
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
205
199
+
229
223
+class IndexView(forms.ModalFormView):
230
224
+    form_class = DownloadJujuEnvironment
231
225
+    template_name = 'settings/juju/index.html'
232
 
Index: horizon/horizon/dashboards/settings/templates/settings/juju/download_form.html
233
 
===================================================================
234
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
235
 
+++ horizon/horizon/dashboards/settings/templates/settings/juju/download_form.html      2012-04-11 20:02:56.535890920 -0700
 
226
diff -Naurp horizon.orig/horizon/dashboards/settings/templates/settings/juju/download_form.html horizon/horizon/dashboards/settings/templates/settings/juju/download_form.html
 
227
--- horizon.orig/horizon/dashboards/settings/templates/settings/juju/download_form.html 1969-12-31 19:00:00.000000000 -0500
 
228
+++ horizon/horizon/dashboards/settings/templates/settings/juju/download_form.html      2012-05-31 14:09:09.116889042 -0400
236
229
@@ -0,0 +1,20 @@
237
230
+{% extends "horizon/common/_modal_form.html" %}
238
231
+{% load i18n %}
254
247
+    <input class="btn btn-primary pull-right" type="submit" value="{% trans "Download Juju Environment Config" %}" />
255
248
+    {% if hide %}<a href="{% url horizon:settings:juju:index %}" class="btn secondary cancel close">{% trans "Cancel" %}</a>{% endif %}
256
249
+{% endblock %}
257
 
Index: horizon/horizon/dashboards/settings/templates/settings/juju/environments.yaml.template
258
 
===================================================================
259
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
260
 
+++ horizon/horizon/dashboards/settings/templates/settings/juju/environments.yaml.template      2012-04-11 20:02:56.535890920 -0700
 
250
diff -Naurp horizon.orig/horizon/dashboards/settings/templates/settings/juju/environments.yaml.template horizon/horizon/dashboards/settings/templates/settings/juju/environments.yaml.template
 
251
--- horizon.orig/horizon/dashboards/settings/templates/settings/juju/environments.yaml.template 1969-12-31 19:00:00.000000000 -0500
 
252
+++ horizon/horizon/dashboards/settings/templates/settings/juju/environments.yaml.template      2012-05-31 14:09:09.116889042 -0400
261
253
@@ -0,0 +1,21 @@
262
254
+# To use Juju with your Openstack cloud:
263
255
+#    1. Run: apt-get install juju
280
272
+    s3-uri: {{ s3_url }}
281
273
+    default-series: precise
282
274
+    default-image-id: ami-00000001
283
 
Index: horizon/horizon/dashboards/settings/templates/settings/juju/index.html
284
 
===================================================================
285
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
286
 
+++ horizon/horizon/dashboards/settings/templates/settings/juju/index.html      2012-04-11 20:02:56.535890920 -0700
 
275
diff -Naurp horizon.orig/horizon/dashboards/settings/templates/settings/juju/index.html horizon/horizon/dashboards/settings/templates/settings/juju/index.html
 
276
--- horizon.orig/horizon/dashboards/settings/templates/settings/juju/index.html 1969-12-31 19:00:00.000000000 -0500
 
277
+++ horizon/horizon/dashboards/settings/templates/settings/juju/index.html      2012-05-31 14:09:09.116889042 -0400
287
278
@@ -0,0 +1,11 @@
288
279
+{% extends 'settings/base.html' %}
289
280
+{% load i18n %}
296
287
+{% block settings_main %}
297
288
+  {% include "settings/juju/download_form.html" %}
298
289
+{% endblock %}
299
 
Index: horizon/openstack_dashboard/local/local_settings.py.example
300
 
===================================================================
301
 
--- horizon.orig/openstack_dashboard/local/local_settings.py.example    2012-04-11 19:52:21.843349000 -0700
302
 
+++ horizon/openstack_dashboard/local/local_settings.py.example 2012-04-11 20:12:50.747921080 -0700
303
 
@@ -7,6 +7,12 @@
304
 
 PROD = False
305
 
 USE_SSL = False
 
290
diff -Naurp horizon.orig/openstack_dashboard/local/local_settings.py.example horizon/openstack_dashboard/local/local_settings.py.example
 
291
--- horizon.orig/openstack_dashboard/local/local_settings.py.example    2012-05-31 14:08:31.396889052 -0400
 
292
+++ horizon/openstack_dashboard/local/local_settings.py.example 2012-05-31 14:09:09.116889042 -0400
 
293
@@ -13,6 +13,12 @@ PROD = False
 
294
 # https://docs.djangoproject.com/en/1.4/ref/settings/#secure-proxy-ssl-header
 
295
 # SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
306
296
 
307
297
+# Ubuntu-specific: Enables an extra panel in the 'Settings' section
308
298
+# that easily generates a Juju environments.yaml for download,