MAAS

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

  1. fix-1460614
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 3995
Proposed branch: lp:~blake-rouse/maas/fix-1460614
Merge into: lp:~maas-committers/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
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.
Revision history for this message
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
=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html 2015-06-05 14:46:36 +0000
+++ src/maasserver/static/partials/nodes-list.html 2015-06-05 17:33:23 +0000
@@ -5,8 +5,7 @@
5 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->5 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
6 <a href=""6 <a href=""
7 data-ng-class="{ active: currentpage === 'nodes' }"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>8 data-ng-click="toggleTab('nodes')">{$ nodes.length $} <ng-pluralize count="nodes.length" when="{'one': 'Node', 'other': 'Nodes'}"></ng-pluralize></a>
9 </a>
10 <span class="divide"></span>9 <span class="divide"></span>
11 <a href=""10 <a href=""
12 data-ng-class="{ active: currentpage === 'devices' }"11 data-ng-class="{ active: currentpage === 'devices' }"
@@ -502,12 +501,13 @@
502 </th>501 </th>
503 <th colspan="2" class="table-listing__header fixed">502 <th colspan="2" class="table-listing__header fixed">
504 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->503 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->
505 <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}">504 <a href="" class="table-listing__header-link"
506 <span title="Fully Qualified Domain Name">FQDN</span>505 data-ng-click="selectColumnOrSort('fqdn', 'nodes')"
507 </a> |506 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>
508 <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}">507 |
509 <span title="Media Access Control addresses">MAC</span>508 <a href="" class="table-listing__header-link"
510 </a>509 data-ng-click="selectColumnOrSort('pxe_mac', 'nodes')"
510 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>
511 </th>511 </th>
512 <th class="table-listing__header align-center">512 <th class="table-listing__header align-center">
513 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->513 <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->