Merge lp:~devcamcar/django-nova/lp710866 into lp:django-nova

Proposed by Devin Carlen
Status: Merged
Approved by: Devin Carlen
Approved revision: 13
Merged at revision: 14
Proposed branch: lp:~devcamcar/django-nova/lp710866
Merge into: lp:django-nova
Diff against target: 93 lines (+12/-6)
5 files modified
src/django_nova/templates/django_nova/credentials/expired.html (+1/-1)
src/django_nova/testsettings.py (+2/-0)
src/django_nova/views/credentials.py (+3/-2)
src/django_nova/views/images.py (+3/-1)
src/django_nova/views/projects.py (+3/-2)
To merge this branch: bzr merge lp:~devcamcar/django-nova/lp710866
Reviewer Review Type Date Requested Status
Ken Pepple (community) Approve
Devin Carlen Pending
Review via email: mp+48058@code.launchpad.net

Commit message

Removed references to "Nebula"

Description of the change

Removed references to "Nebula"

To post a comment you must log in.
Revision history for this message
Ken Pepple (ken-pepple) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/django_nova/templates/django_nova/credentials/expired.html'
2--- src/django_nova/templates/django_nova/credentials/expired.html 2011-01-12 20:02:06 +0000
3+++ src/django_nova/templates/django_nova/credentials/expired.html 2011-01-31 21:18:20 +0000
4@@ -7,7 +7,7 @@
5 <body>
6 <center>
7 <h1>The link you clicked has expired.</h1>
8- <p style="width:460px;">This credentials download link you have reached is either invalid or has expired. Each link is only good for one use. If you need to download your credentials again, please contact the Nebula support team.</p>
9+ <p style="width:460px;">This credentials download link you have reached is either invalid or has expired. Each link is only good for one use. If you need to download your credentials again, please contact the support team.</p>
10 </center>
11 </body>
12 </html>
13
14=== modified file 'src/django_nova/testsettings.py'
15--- src/django_nova/testsettings.py 2011-01-22 01:04:51 +0000
16+++ src/django_nova/testsettings.py 2011-01-31 21:18:20 +0000
17@@ -13,6 +13,8 @@
18 TEMPLATE_DIRS = (
19 os.path.join(ROOT_PATH, 'tests', 'templates')
20 )
21+SITE_BRANDING = 'OpenStack'
22+SITE_NAME = 'openstack'
23 NOVA_DEFAULT_ENDPOINT = 'none'
24 NOVA_DEFAULT_REGION = 'test'
25 NOVA_ACCESS_KEY = 'test'
26
27=== modified file 'src/django_nova/views/credentials.py'
28--- src/django_nova/views/credentials.py 2011-01-18 23:07:26 +0000
29+++ src/django_nova/views/credentials.py 2011-01-31 21:18:20 +0000
30@@ -21,6 +21,7 @@
31 """
32
33 from django import http
34+from django.conf import settings
35 from django.shortcuts import render_to_response
36 from django_nova import models
37
38@@ -35,8 +36,8 @@
39
40 response = http.HttpResponse(mimetype='application/zip')
41 response['Content-Disposition'] = \
42- 'attachment; filename=nebula-%s-%s-x509.zip' % \
43- (credentials.project, credentials.username)
44+ 'attachment; filename=%s-%s-%s-x509.zip' % \
45+ (settings.SITE_NAME, credentials.project, credentials.username)
46 response.write(credentials.get_zip())
47
48 return response
49
50=== modified file 'src/django_nova/views/images.py'
51--- src/django_nova/views/images.py 2011-01-24 23:21:05 +0000
52+++ src/django_nova/views/images.py 2011-01-31 21:18:20 +0000
53@@ -25,6 +25,7 @@
54
55 from django import http
56 from django import template
57+from django.conf import settings
58 from django.contrib import messages
59 from django.contrib.auth.decorators import login_required
60 from django.shortcuts import redirect, render_to_response
61@@ -45,7 +46,8 @@
62 return (not image_is_admin(i)) and (not image_is_project(i))
63
64 return {'Project Images': filter(image_is_project, images),
65- 'Nebula Images': filter(image_is_admin, images),
66+ '%s Images' % settings.SITE_BRANDING: filter(image_is_admin,
67+ images),
68 'Community Images': filter(image_is_community, images)}
69
70
71
72=== modified file 'src/django_nova/views/projects.py'
73--- src/django_nova/views/projects.py 2011-01-18 23:07:26 +0000
74+++ src/django_nova/views/projects.py 2011-01-31 21:18:20 +0000
75@@ -22,6 +22,7 @@
76
77 from django import http
78 from django import template
79+from django.conf import settings
80 from django.contrib.auth.decorators import login_required
81 from django.shortcuts import redirect, render_to_response
82 from django_nova import forms as nova_forms
83@@ -99,8 +100,8 @@
84
85 response = http.HttpResponse(mimetype='application/zip')
86 response['Content-Disposition'] = \
87- 'attachment; filename=nebula-%s-%s-x509.zip' % \
88- (project.projectname, request.user)
89+ 'attachment; filename=%s-%s-%s-x509.zip' % \
90+ (settings.SITE_NAME, project.projectname, request.user)
91 response.write(project.get_zip())
92
93 return response

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: