django-nova

Merge lp:~jakedahn/django-nova/sidebarux into lp:django-nova

  1. sidebarux
  2. Merge into trunk
Proposed by Jake Dahn
Status: Merged
Approved by: Devin Carlen
Approved revision: 7
Merged at revision: 7
Proposed branch: lp:~jakedahn/django-nova/sidebarux
Merge into: lp:django-nova
Diff against target: 40 lines (+16/-14)
1 file modified
src/django_nova/templates/django_nova/base.html (+16/-14)
To merge this branch: bzr merge lp:~jakedahn/django-nova/sidebarux
Reviewer Review Type Date Requested Status
Devin Carlen Pending
Review via email: mp+46688@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

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/base.html'
2--- src/django_nova/templates/django_nova/base.html 2011-01-17 06:58:19 +0000
3+++ src/django_nova/templates/django_nova/base.html 2011-01-18 22:01:54 +0000
4@@ -51,20 +51,22 @@
5 title="Manage User Roles">Manage Project</a>
6 {% endif %}
7 </h4>
8- <ul>
9- <li {% if p.projectname == project.projectname and sidebar_selected == "instances" %}class="active"{% endif %}>
10- <a id="lnk_instances_{{p.projectname}}" href="{% url nova_instances p.projectname %}">Instances</a>
11- </li>
12- <li {% if p.projectname == project.projectname and sidebar_selected == "images" %}class="active"{% endif %}>
13- <a id="lnk_images_{{p.projectname}}" href="{% url nova_images p.projectname %}">Images</a>
14- </li>
15- <li {% if p.projectname == project.projectname and sidebar_selected == "keys" %}class="active"{% endif %}>
16- <a id="lnk_keypairs_{{p.projectname}}" href="{% url nova_keypairs p.projectname %}">Keys</a>
17- </li>
18- <li {% if p.projectname == project.projectname and sidebar_selected == "volumes" %}class="active"{% endif %}>
19- <a id="lnk_volumes_{{p.projectname}}" href="{% url nova_volumes p.projectname %}">Volumes</a>
20- </li>
21- </ul>
22+ {% if project.projectname == p.projectname %}
23+ <ul>
24+ <li {% if p.projectname == project.projectname and sidebar_selected == "instances" %}class="active"{% endif %}>
25+ <a id="lnk_instances_{{p.projectname}}" href="{% url nova_instances p.projectname %}">Instances</a>
26+ </li>
27+ <li {% if p.projectname == project.projectname and sidebar_selected == "images" %}class="active"{% endif %}>
28+ <a id="lnk_images_{{p.projectname}}" href="{% url nova_images p.projectname %}">Images</a>
29+ </li>
30+ <li {% if p.projectname == project.projectname and sidebar_selected == "keys" %}class="active"{% endif %}>
31+ <a id="lnk_keypairs_{{p.projectname}}" href="{% url nova_keypairs p.projectname %}">Keys</a>
32+ </li>
33+ <li {% if p.projectname == project.projectname and sidebar_selected == "volumes" %}class="active"{% endif %}>
34+ <a id="lnk_volumes_{{p.projectname}}" href="{% url nova_volumes p.projectname %}">Volumes</a>
35+ </li>
36+ </ul>
37+ {% endif %}
38 </div>
39 {% endfor %}
40 </div>

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: