Merge lp:~ricgard/maas/storage-format-hoverstate into lp:~maas-committers/maas/trunk

Proposed by Richard McCartney
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4399
Proposed branch: lp:~ricgard/maas/storage-format-hoverstate
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 18 lines (+5/-3)
1 file modified
src/maasserver/static/partials/node-details.html (+5/-3)
To merge this branch: bzr merge lp:~ricgard/maas/storage-format-hoverstate
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+275299@code.launchpad.net

Commit message

Resolving secondary hover controls alignment issue.

Description of the change

Resolving the storage markup so any mount/format controls will be aligned correctly.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

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/node-details.html'
2--- src/maasserver/static/partials/node-details.html 2015-10-21 17:51:01 +0000
3+++ src/maasserver/static/partials/node-details.html 2015-10-22 10:41:56 +0000
4@@ -796,9 +796,11 @@
5 <div class="table__data table__column--15">{$ getDeviceType(item) $}</div>
6 <div class="table__data table__column--15">
7 {$ item.fstype $}
8- <a class="table__controls table__controls--secondary" data-ng-show="canFormatAndMount(item)"
9- data-ng-click="availableQuickFormatAndMount(item)"
10- data-ng-class="{ 'margin-left--ten': item.fstype }">{$ getFormatAndMountButtonText (item) $}</a>
11+ <span class="table__controls table__controls--secondary">
12+ <a data-ng-show="canFormatAndMount(item)"
13+ data-ng-click="availableQuickFormatAndMount(item)"
14+ data-ng-class="{ 'margin-left--ten': item.fstype }">{$ getFormatAndMountButtonText (item) $}</a>
15+ </span>
16 </div>
17 <div class="table__data table__column--15" colspan="2" data-ng-show="column === 'model'">{$ item.model $}</div>
18 <div class="table__data table__column--15 ng-hide" colspan="2" data-ng-show="column === 'serial'">{$ item.serial $}</div>