MAAS

Merge lp:~jtv/maas/bug-1365396 into lp:~maas-committers/maas/trunk

  1. bug-1365396
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 2896
Proposed branch: lp:~jtv/maas/bug-1365396
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 30 lines (+1/-3)
2 files modified
src/maasserver/templates/maasserver/cluster_listing.html (+1/-2)
src/maasserver/templates/maasserver/node_list.html (+0/-1)
To merge this branch: bzr merge lp:~jtv/maas/bug-1365396
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+233334@code.launchpad.net

Commit message

Make the backlink to the front page appear on the remaining pages that didn't have it: the node & cluster listings. Other pages do have it.

We had explicit mentions of this block in the templates, but as it turns out, those _suppressed_ the standard link instead of adding it.

Description of the change

Actually there is one page that still doesn't have the link: the Add Node page. Because technically it's an overlay on top of the front page. I'm leaving that detail for some other enthusiast.

Jeroen

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Nice.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/templates/maasserver/cluster_listing.html'
2--- src/maasserver/templates/maasserver/cluster_listing.html 2014-04-02 13:53:19 +0000
3+++ src/maasserver/templates/maasserver/cluster_listing.html 2014-09-04 10:46:06 +0000
4@@ -3,7 +3,6 @@
5 {% block nav-active-cluster-list %}active{% endblock %}
6 {% block title %}{{ status_name }} clusters{% endblock %}
7 {% block page-title %}{{ current_count }}{% if input_query %} matching{% endif %} {{ status_name|lower }} cluster{{ current_count|pluralize }} in {% include "maasserver/site_title.html" %}{% endblock %}
8-{% block site-switcher %}{% endblock %}
9 {% block header-search %}{% endblock %}
10
11 {% block content %}
12@@ -51,4 +50,4 @@
13 <div class="clear"></div>
14
15
16-{% endblock %}
17\ No newline at end of file
18+{% endblock %}
19
20=== modified file 'src/maasserver/templates/maasserver/node_list.html'
21--- src/maasserver/templates/maasserver/node_list.html 2014-03-03 06:33:34 +0000
22+++ src/maasserver/templates/maasserver/node_list.html 2014-09-04 10:46:06 +0000
23@@ -3,7 +3,6 @@
24 {% block nav-active-node-list %}active{% endblock %}
25 {% block title %}Nodes{% endblock %}
26 {% block page-title %}{{ paginator.count }}{% if input_query %} matching{% endif %} node{{ paginator.count|pluralize }} in {% include "maasserver/site_title.html" %}{% endblock %}
27-{% block site-switcher %}{% endblock %}
28 {% block header-search %}{% endblock %}
29
30 {% block html_includes %}{% include "maasserver/snippets.html" %}