OpenStack Dashboard (Horizon)

Merge lp:~yorik-sar/horizon/deploy-issues into lp:~hudson-openstack/horizon/trunk

  1. deploy-issues
  2. Merge into trunk
Proposed by Yuriy Taraday
Status: Merged
Approved by: Devin Carlen
Approved revision: 49
Merged at revision: 63
Proposed branch: lp:~yorik-sar/horizon/deploy-issues
Merge into: lp:~hudson-openstack/horizon/trunk
Diff against target: 133 lines (+14/-14)
8 files modified
django-openstack/src/django_openstack/templates/django_openstack/nova/base.html (+2/-2)
openstack-dashboard/dashboard/templates/403.html (+2/-2)
openstack-dashboard/dashboard/templates/404.html (+2/-2)
openstack-dashboard/dashboard/templates/500.html (+2/-2)
openstack-dashboard/dashboard/templates/base-root.html (+1/-1)
openstack-dashboard/dashboard/templates/base-sidebar.html (+2/-2)
openstack-dashboard/dashboard/templates/permission_denied.html (+2/-2)
openstack-dashboard/dashboard/templates/registration/password_reset_complete.html (+1/-1)
To merge this branch: bzr merge lp:~yorik-sar/horizon/deploy-issues
Reviewer Review Type Date Requested Status
Devin Carlen Approve
Review via email: mp+64794@code.launchpad.net

This proposal supersedes a proposal from 2011-05-13.

Description of the change

Some small issues we encountered trying to create distribution package for Dashboard installing it as subdir of appache's root.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote : Posted in a previous version of this proposal

Nice fixes!

review: Approve
Revision history for this message
Yuriy Taraday (yorik-sar) wrote :

Added more fixes to branch. Looks pretty clean now.

Revision history for this message
Devin Carlen (devcamcar) wrote :

looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django-openstack/src/django_openstack/templates/django_openstack/nova/base.html'
2--- django-openstack/src/django_openstack/templates/django_openstack/nova/base.html 2011-06-02 06:34:32 +0000
3+++ django-openstack/src/django_openstack/templates/django_openstack/nova/base.html 2011-06-16 09:11:25 +0000
4@@ -39,12 +39,12 @@
5 {% block nav_projects %}
6 {% load_projects %}
7 <li>
8- <h3 class="active"><a href="/">Projects</a></h3>
9+ <h3 class="active"><a href="{% url index %}">Projects</a></h3>
10 <div id="projects">
11 {% for p in projects %}
12 <div id="{{ p.projectname }}" class="project{% if p.projectname == project.projectname %} active{% endif %}">
13 <h4>
14- <a class="project_link" href="/project/{{ p.projectname }}">{{ p.projectname }}</a>
15+ <a class="project_link" href="{% url nova_project p.projectname %}">{{ p.projectname }}</a>
16 {% if p.projectManagerId == user.username %}
17 <a id="manage_project_{{p.projectname}}"
18 class="manage_link"
19
20=== modified file 'openstack-dashboard/dashboard/templates/403.html'
21--- openstack-dashboard/dashboard/templates/403.html 2011-06-03 04:40:37 +0000
22+++ openstack-dashboard/dashboard/templates/403.html 2011-06-16 09:11:25 +0000
23@@ -17,11 +17,11 @@
24 <div id="sidebar">
25 <ul id="navigation">
26 {% block nav_home %}
27- <li><h3><a href="/">Home</a></h3></li>
28+ <li><h3><a href="{% url index %}">Home</a></h3></li>
29 {% endblock %}
30
31 {% block nav_projects %}
32- <li><h3><a href="/">Projects</a></h3></li>
33+ <li><h3><a href="{% url index %}">Projects</a></h3></li>
34 {% endblock %}
35 </ul>
36 </div> <!-- end sidebar -->
37
38=== modified file 'openstack-dashboard/dashboard/templates/404.html'
39--- openstack-dashboard/dashboard/templates/404.html 2011-06-03 04:40:37 +0000
40+++ openstack-dashboard/dashboard/templates/404.html 2011-06-16 09:11:25 +0000
41@@ -16,11 +16,11 @@
42 <div id="sidebar">
43 <ul id="navigation">
44 {% block nav_home %}
45- <li><h3><a href="/">Home</a></h3></li>
46+ <li><h3><a href="{% url index %}">Home</a></h3></li>
47 {% endblock %}
48
49 {% block nav_projects %}
50- <li><h3><a href="/">Projects</a></h3></li>
51+ <li><h3><a href="{% url index %}">Projects</a></h3></li>
52 {% endblock %}
53 </ul>
54 </div> <!-- end sidebar -->
55
56=== modified file 'openstack-dashboard/dashboard/templates/500.html'
57--- openstack-dashboard/dashboard/templates/500.html 2011-06-03 04:40:37 +0000
58+++ openstack-dashboard/dashboard/templates/500.html 2011-06-16 09:11:25 +0000
59@@ -16,11 +16,11 @@
60 <div id="sidebar">
61 <ul id="navigation">
62 {% block nav_home %}
63- <li><h3><a href="/">Home</a></h3></li>
64+ <li><h3><a href="{% url index %}">Home</a></h3></li>
65 {% endblock %}
66
67 {% block nav_projects %}
68- <li><h3><a href="/">Projects</a></h3></li>
69+ <li><h3><a href="{% url index %}">Projects</a></h3></li>
70 {% endblock %}
71 </ul>
72 </div> <!-- end sidebar -->
73
74=== modified file 'openstack-dashboard/dashboard/templates/base-root.html'
75--- openstack-dashboard/dashboard/templates/base-root.html 2011-06-03 07:15:14 +0000
76+++ openstack-dashboard/dashboard/templates/base-root.html 2011-06-16 09:11:25 +0000
77@@ -19,7 +19,7 @@
78 <body>
79 <div id="wrapper">
80 <div id="header">
81- <h1><a href="/">{% site_branding %}<span> Cloud Computing</span></a></h1>
82+ <h1><a href="{% url index %}">{% site_branding %}<span> Cloud Computing</span></a></h1>
83 {% if user.is_authenticated %}
84 <div id="user_info">
85 <span class="user">{% trans "Signed in as" %} <strong>{{ request.user.username }}</strong>.</span>
86
87=== modified file 'openstack-dashboard/dashboard/templates/base-sidebar.html'
88--- openstack-dashboard/dashboard/templates/base-sidebar.html 2011-01-17 09:59:30 +0000
89+++ openstack-dashboard/dashboard/templates/base-sidebar.html 2011-06-16 09:11:25 +0000
90@@ -4,11 +4,11 @@
91 <div id="sidebar">
92 <ul id="navigation">
93 {% block nav_home %}
94- <li class="first"><h3><a href="/">Home</a></h3></li>
95+ <li class="first"><h3><a href="{% url index %}">Home</a></h3></li>
96 {% endblock %}
97
98 {% block nav_projects %}
99- <li><h3><a href="/">Projects</a></h3></li>
100+ <li><h3><a href="{% url index %}">Projects</a></h3></li>
101 {% endblock %}
102 </ul>
103 </div>
104
105=== modified file 'openstack-dashboard/dashboard/templates/permission_denied.html'
106--- openstack-dashboard/dashboard/templates/permission_denied.html 2011-06-07 04:54:57 +0000
107+++ openstack-dashboard/dashboard/templates/permission_denied.html 2011-06-16 09:11:25 +0000
108@@ -16,11 +16,11 @@
109 <div id="sidebar">
110 <ul id="navigation">
111 {% block nav_home %}
112- <li><h3><a href="/">Home</a></h3></li>
113+ <li><h3><a href="{% url index %}">Home</a></h3></li>
114 {% endblock %}
115
116 {% block nav_projects %}
117- <li><h3><a href="/">Projects</a></h3></li>
118+ <li><h3><a href="{% url index %}">Projects</a></h3></li>
119 {% endblock %}
120 </ul>
121 </div> <!-- end sidebar -->
122
123=== modified file 'openstack-dashboard/dashboard/templates/registration/password_reset_complete.html'
124--- openstack-dashboard/dashboard/templates/registration/password_reset_complete.html 2011-01-12 21:43:31 +0000
125+++ openstack-dashboard/dashboard/templates/registration/password_reset_complete.html 2011-06-16 09:11:25 +0000
126@@ -12,7 +12,7 @@
127 <span class="close ui-icon ui-icon-circle-close" style="display:none;"></span>
128 <p>
129 <span class="ui-icon ui-icon-check"></span>
130- Your password has been reset. You can now <a href="/accounts/login">login</a>.
131+ Your password has been reset. You can now <a href="{% url auth_login %}">login</a>.
132 </p>
133 </div>
134

Subscribers

People subscribed via source and target branches