MAAS

Merge lp:~ricgard/maas/bug-1682255 into lp:~maas-committers/maas/trunk

  1. bug-1682255
  2. Merge into trunk
Proposed by Richard McCartney
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 5981
Proposed branch: lp:~ricgard/maas/bug-1682255
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 79 lines (+30/-15)
1 file modified
src/maasserver/static/partials/boot-images.html (+30/-15)
To merge this branch: bzr merge lp:~ricgard/maas/bug-1682255
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+322535@code.launchpad.net

Commit message

Fixes the custom and generated images row dropdown for images.

Description of the change

Fixes the custom and generated images row dropdown for images.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

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/boot-images.html'
2--- src/maasserver/static/partials/boot-images.html 2017-04-07 16:08:21 +0000
3+++ src/maasserver/static/partials/boot-images.html 2017-04-13 15:48:46 +0000
4@@ -247,7 +247,7 @@
5 No images have been uploaded.
6 </div>
7 </div>
8- <div class="table__row" data-ng-repeat="image in generatedImages | orderBy:['-title', 'arch']">
9+ <div class="table__row" data-ng-repeat="image in generatedImages | orderBy:['-title', 'arch']" data-ng-class="{ 'is-active': isShowingDeleteConfirm(image)}">
10 <div class="table__data table-col--2">
11 <i class="icon {$ image.icon $}"></i>
12 </div>
13@@ -264,15 +264,24 @@
14 <button class="table__controls-action u-text--error"
15 aria-label="Remove"
16 data-ng-click="toggleMenu(); quickRemove(image)">Remove image</button>
17+ </div>
18 </div>
19 </div>
20- <div class="table__row is-active" data-ng-if="isShowingDeleteConfirm(image)">
21- <div class="table__data u-float--left">
22- <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this image?</p>
23- </div>
24- <div class="table__data u-float--right">
25- <a class="button--base button--inline" data-ng-click="cancelRemove()">Cancel</a>
26- <button class="button--destructive button--inline" data-ng-click="confirmRemove(image)">Remove</button>
27+ <div>
28+ <div class="table__dropdown" data-ng-if="isShowingDeleteConfirm(image)">
29+ <div class="table__dropdown-title">
30+ <h2 data-ng-click="cancelRemove()" class="u-float--left">Remove image</h2>
31+ <button data-ng-click="cancelRemove()" class="icon icon--remove u-float--right u-margin--top-small u-margin--right-small"></button>
32+ </div>
33+ <div class="table__row is-active">
34+ <div class="table__data u-float--left">
35+ <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this image?</p>
36+ </div>
37+ <div class="table__data u-float--right">
38+ <a class="button--base button--inline" data-ng-click="cancelRemove()">Cancel</a>
39+ <button class="button--destructive button--inline" data-ng-click="confirmRemove(image)">Remove</button>
40+ </div>
41+ </div>
42 </div>
43 </div>
44 </div>
45@@ -298,7 +307,7 @@
46 No images have been uploaded.
47 </div>
48 </div>
49- <div class="table__row" data-ng-repeat="image in customImages | orderBy:['-title', 'arch']">
50+ <div class="table__row" data-ng-repeat="image in customImages | orderBy:['-title', 'arch']" data-ng-class="{ 'is-active': isShowingDeleteConfirm(image)}">
51 <div class="table__data table-col--2">
52 <i class="icon {$ image.icon $}"></i>
53 </div>
54@@ -318,13 +327,19 @@
55 </div>
56 </div>
57 </div>
58- <div class="table__row is-active" data-ng-if="isShowingDeleteConfirm(image)">
59- <div class="table__data u-float--left">
60- <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this image?</p>
61+ <div class="table__dropdown" data-ng-if="isShowingDeleteConfirm(image)">
62+ <div class="table__dropdown-title">
63+ <h2 data-ng-click="cancelRemove()" class="u-float--left">Remove image</h2>
64+ <button data-ng-click="cancelRemove()" class="icon icon--remove u-float--right u-margin--top-small u-margin--right-small"></button>
65 </div>
66- <div class="table__data u-float--right">
67- <a class="button--base button--inline" data-ng-click="cancelRemove()">Cancel</a>
68- <button class="button--destructive button--inline" data-ng-click="confirmRemove(image)">Remove</button>
69+ <div class="table__row is-active">
70+ <div class="table__data u-float--left">
71+ <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this image?</p>
72+ </div>
73+ <div class="table__data u-float--right">
74+ <a class="button--base button--inline" data-ng-click="cancelRemove()">Cancel</a>
75+ <button class="button--destructive button--inline" data-ng-click="confirmRemove(image)">Remove</button>
76+ </div>
77 </div>
78 </div>
79 </div>