Merge lp:~blake-rouse/maas/fix-1460614 into lp:maas/trunk

Proposed by Blake Rouse on 2015-06-05
Status: Merged
Approved by: Blake Rouse on 2015-06-05
Approved revision: 3990
Merged at revision: 3995
Proposed branch: lp:~blake-rouse/maas/fix-1460614
Merge into: lp:maas/trunk
Diff against target: 33 lines (+8/-8)
1 file modified
src/maasserver/static/partials/nodes-list.html (+8/-8)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1460614
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve on 2015-06-05
Review via email: mp+261257@code.launchpad.net

Commit message

Remove extra space after FQDN and after nodes in header.

To post a comment you must log in.
Blake Rouse (blake-rouse) wrote :

Self-approving, as this does not change the actual markup just some spacing on how it is rendered by the browser.

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/nodes-list.html'
2--- src/maasserver/static/partials/nodes-list.html 2015-06-05 14:46:36 +0000
3+++ src/maasserver/static/partials/nodes-list.html 2015-06-05 17:33:23 +0000
4@@ -5,8 +5,7 @@
5 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
6 <a href=""
7 data-ng-class="{ active: currentpage === 'nodes' }"
8- data-ng-click="toggleTab('nodes')">{$ nodes.length $} <ng-pluralize count="nodes.length" when="{'one': 'Node', 'other': 'Nodes'}"></ng-pluralize>
9- </a>
10+ data-ng-click="toggleTab('nodes')">{$ nodes.length $} <ng-pluralize count="nodes.length" when="{'one': 'Node', 'other': 'Nodes'}"></ng-pluralize></a>
11 <span class="divide"></span>
12 <a href=""
13 data-ng-class="{ active: currentpage === 'devices' }"
14@@ -502,12 +501,13 @@
15 </th>
16 <th colspan="2" class="table-listing__header fixed">
17 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->
18- <a href="" class="table-listing__header-link" data-ng-click="selectColumnOrSort('fqdn', 'nodes')" data-ng-class="{active: tabs.nodes.column === 'fqdn', sort: tabs.nodes.predicate === 'fqdn', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">
19- <span title="Fully Qualified Domain Name">FQDN</span>
20- </a> |
21- <a href="" class="table-listing__header-link" data-ng-click="selectColumnOrSort('pxe_mac', 'nodes')" data-ng-class="{active: tabs.nodes.column === 'pxe_mac', sort: tabs.nodes.predicate === 'pxe_mac', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}">
22- <span title="Media Access Control addresses">MAC</span>
23- </a>
24+ <a href="" class="table-listing__header-link"
25+ data-ng-click="selectColumnOrSort('fqdn', 'nodes')"
26+ data-ng-class="{active: tabs.nodes.column === 'fqdn', sort: tabs.nodes.predicate === 'fqdn', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}"><span title="Fully Qualified Domain Name">FQDN</span></a>
27+ |
28+ <a href="" class="table-listing__header-link"
29+ data-ng-click="selectColumnOrSort('pxe_mac', 'nodes')"
30+ data-ng-class="{active: tabs.nodes.column === 'pxe_mac', sort: tabs.nodes.predicate === 'pxe_mac', 'sort-asc': tabs.nodes.reverse === false, 'sort-desc': tabs.nodes.reverse === true}"><span title="Media Access Control addresses">MAC</span></a>
31 </th>
32 <th class="table-listing__header align-center">
33 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->