MAAS

Merge lp:~andreserl/maas/lp1630591 into lp:~maas-committers/maas/trunk

  1. lp1630591
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 5449
Proposed branch: lp:~andreserl/maas/lp1630591
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 37 lines (+3/-3)
3 files modified
src/maasserver/static/partials/networks-list.html (+1/-1)
src/maasserver/templates/maasserver/base.html (+1/-1)
src/maasserver/templates/maasserver/index.html (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/lp1630591
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+307726@code.launchpad.net

Commit message

Rename 'Networks' tab to 'Subnets'.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good.

Revision history for this message
Mike Pontillo (mpontillo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/partials/networks-list.html'
2--- src/maasserver/static/partials/networks-list.html 2016-09-23 22:23:42 +0000
3+++ src/maasserver/static/partials/networks-list.html 2016-10-05 15:12:35 +0000
4@@ -1,6 +1,6 @@
5 <header class="page-header">
6 <div class="wrapper--inner">
7- <h1 class="page-header__title">Networks</h1>
8+ <h1 class="page-header__title">Subnets</h1>
9 <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
10 <p class="page-header__status" data-ng-show="loading"><span class="u-text--loading"><i class="icon icon--loading u-animation--spin"></i> Loading...</span></p>
11
12
13=== modified file 'src/maasserver/templates/maasserver/base.html'
14--- src/maasserver/templates/maasserver/base.html 2016-09-23 18:48:54 +0000
15+++ src/maasserver/templates/maasserver/base.html 2016-10-05 15:12:35 +0000
16@@ -125,7 +125,7 @@
17 <a class="{% block nav-active-zone-list %}{% endblock %}" href="{% url 'zone-list' %}">Zones</a>
18 </li>
19 <li>
20- <a class="{% block nav-active-network-list %}{% endblock %}" href="{% url 'index' %}#/networks?by=fabric">Networks</a>
21+ <a class="{% block nav-active-network-list %}{% endblock %}" href="{% url 'index' %}#/networks?by=fabric">Subnets</a>
22 </li>
23 {% if user.is_superuser %}
24 <li>
25
26=== modified file 'src/maasserver/templates/maasserver/index.html'
27--- src/maasserver/templates/maasserver/index.html 2016-09-22 15:15:31 +0000
28+++ src/maasserver/templates/maasserver/index.html 2016-10-05 15:12:35 +0000
29@@ -101,7 +101,7 @@
30 <a data-ng-class="{ active: page === 'zones' }" href="{% url 'zone-list' %}">Zones</a>
31 </li>
32 <li>
33- <a data-ng-class="{ active: page === 'networks' }" href="{% url 'index' %}#/networks?by=fabric">Networks</a>
34+ <a data-ng-class="{ active: page === 'networks' }" href="{% url 'index' %}#/networks?by=fabric">Subnets</a>
35 </li>
36
37 {% if user.is_superuser %}