Merge lp:~jakedahn/horizon/lp760239 into lp:~hudson-openstack/horizon/trunk

[Jake Dahn]

This branch adds styling to the permission denied page.

[Devin Carlen (devcamcar)]

10 + 'Permission Denied %s' % e.message)

let's drop the %s and e.message. they are redundant here

review: Needs Fixing

[lp:~jakedahn/horizon/lp760239]

34. By Jake Dahn on 2011-04-20

removing redundant error message

35. By Jake Dahn on 2011-04-22

removing redirect from images view, as it is handled by the @handle_nova_error decorator

Unmerged revisions

=== modified file 'django-nova/src/django_nova/views/images.py'
--- django-nova/src/django_nova/views/images.py	2011-04-13 19:05:52 +0000
+++ django-nova/src/django_nova/views/images.py	2011-04-20 18:21:33 +0000
@@ -88,6 +88,9 @@
             except exceptions.NovaApiError, e:
                 messages.error(request,
                                'Unable to launch: %s' % e.message)
+            except exceptions.NovaUnauthorizedError, e:
+                messages.error(request, 'Permission Denied')
+                return redirect('dashboard_permission_denied')
             else:
                 for instance in reservation.instances:
                     messages.success(request,

=== modified file 'openstack-dashboard/dashboard/templates/permission_denied.html'
--- openstack-dashboard/dashboard/templates/permission_denied.html	2011-01-12 21:43:31 +0000
+++ openstack-dashboard/dashboard/templates/permission_denied.html	2011-04-20 18:21:33 +0000
@@ -1,11 +1,26 @@
-{% extends "dashboard/base.html" %}
+{% extends "base.html" %}
 
 {% block title %} - Permission Denied{% endblock %}
-{% block pageclass %}denied{% endblock %}
 
 {% block content %}
-  <div id="page_head">
-    <h2 id="page_heading">Permission Denied</h2>
-    <p id="page_description">You do not have permission to view the requested page.</p>
+  <div id="right_content">
+    <div id="page_head">
+      <h2 id="page_heading">Permission Denied</h2>
+      <p id="page_description">You do not have permission to view the requested page.</p>
+    </div>
   </div>
 {% endblock %}
+
+{% block sidebar %}
+  <div id="sidebar">
+    <ul id="navigation">
+      {% block nav_home %}
+      <li><h3><a href="/">Home</a></h3></li>
+      {% endblock %}
+
+      {% block nav_projects %}
+      <li><h3><a href="/">Projects</a></h3></li>
+      {% endblock %}
+    </ul>
+  </div> <!-- end sidebar -->
+{% endblock %}