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
7
  <body>
7
  <body>
6
8
    <center>
8
    <center>
7
9
      <h1>The link you clicked has expired.</h1>
9
      <h1>The link you clicked has expired.</h1>
9
10
      <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>
10
      <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
11
   </center>
11
   </center>
11
12
  </body>
12
  </body>
12
13
</html>
13
</html>
13
14
14
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
13
TEMPLATE_DIRS = (
13
TEMPLATE_DIRS = (
19
14
    os.path.join(ROOT_PATH, 'tests', 'templates')
14
    os.path.join(ROOT_PATH, 'tests', 'templates')
20
15
)
15
)
21
16
SITE_BRANDING = 'OpenStack'
22
17
SITE_NAME = 'openstack'
23
16
NOVA_DEFAULT_ENDPOINT = 'none'
18
NOVA_DEFAULT_ENDPOINT = 'none'
24
17
NOVA_DEFAULT_REGION = 'test'
19
NOVA_DEFAULT_REGION = 'test'
25
18
NOVA_ACCESS_KEY = 'test'
20
NOVA_ACCESS_KEY = 'test'
26
19
21
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
21
"""
21
"""
32
22
22
33
23
from django import http
23
from django import http
34
24
from django.conf import settings
35
24
from django.shortcuts import render_to_response
25
from django.shortcuts import render_to_response
36
25
from django_nova import models
26
from django_nova import models
37
26
27
38
@@ -35,8 +36,8 @@
39
35
36
40
36
    response = http.HttpResponse(mimetype='application/zip')
37
    response = http.HttpResponse(mimetype='application/zip')
41
37
    response['Content-Disposition'] = \
38
    response['Content-Disposition'] = \
44
38
        'attachment; filename=nebula-%s-%s-x509.zip' % \
39
        'attachment; filename=%s-%s-%s-x509.zip' % \
45
39
        (credentials.project, credentials.username)
40
        (settings.SITE_NAME, credentials.project, credentials.username)
46
40
    response.write(credentials.get_zip())
41
    response.write(credentials.get_zip())
47
41
42
48
42
    return response
43
    return response
49
43
44
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
25
25
55
26
from django import http
26
from django import http
56
27
from django import template
27
from django import template
57
28
from django.conf import settings
58
28
from django.contrib import messages
29
from django.contrib import messages
59
29
from django.contrib.auth.decorators import login_required
30
from django.contrib.auth.decorators import login_required
60
30
from django.shortcuts import redirect, render_to_response
31
from django.shortcuts import redirect, render_to_response
61
@@ -45,7 +46,8 @@
62
45
        return (not image_is_admin(i)) and (not image_is_project(i))
46
        return (not image_is_admin(i)) and (not image_is_project(i))
63
46
47
64
47
    return {'Project Images': filter(image_is_project, images),
48
    return {'Project Images': filter(image_is_project, images),
66
48
            'Nebula Images': filter(image_is_admin, images),
49
            '%s Images' % settings.SITE_BRANDING: filter(image_is_admin,
67
50
                                                         images),
68
49
            'Community Images': filter(image_is_community, images)}
51
            'Community Images': filter(image_is_community, images)}
69
50
52
70
51
53
71
52
54
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
22
22
77
23
from django import http
23
from django import http
78
24
from django import template
24
from django import template
79
25
from django.conf import settings
80
25
from django.contrib.auth.decorators import login_required
26
from django.contrib.auth.decorators import login_required
81
26
from django.shortcuts import redirect, render_to_response
27
from django.shortcuts import redirect, render_to_response
82
27
from django_nova import forms as nova_forms
28
from django_nova import forms as nova_forms
83
@@ -99,8 +100,8 @@
84
99
100
85
100
    response = http.HttpResponse(mimetype='application/zip')
101
    response = http.HttpResponse(mimetype='application/zip')
86
101
    response['Content-Disposition'] = \
102
    response['Content-Disposition'] = \
89
102
        'attachment; filename=nebula-%s-%s-x509.zip' % \
103
        'attachment; filename=%s-%s-%s-x509.zip' % \
90
103
        (project.projectname, request.user)
104
        (settings.SITE_NAME, project.projectname, request.user)
91
104
    response.write(project.get_zip())
105
    response.write(project.get_zip())
92
105
106
93
106
    return response
107
    return response
Reviewer	Review Type	Date Requested	Status
Ken Pepple (community)			Approve on 2011-01-31
Devin Carlen			Pending
Review via email: mp+48058@code.launchpad.net