MAAS

Merge ~deadlight/maas:delete-fabric into maas:master

  1. Git
  2. lp:~deadlight/maas
  3. delete-fabric
  4. Merge into master
Proposed by Karl Williams
Status: Merged
Approved by: Karl Williams
Approved revision: 58375a88fc5702029931e1f7cef81d0b94ddce7d
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~deadlight/maas:delete-fabric
Merge into: maas:master
Diff against target: 105 lines (+45/-21)
1 file modified
src/maasserver/static/partials/fabric-details.html (+45/-21)
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Andres Rodriguez (community) Approve
MAAS Lander Approve
Review via email: mp+343169@code.launchpad.net

Commit message

LP: #1763219 - Restructure fabric deletion action to look good on more viewports.

Description of the change

Updated the delete action on the fabric details page to be a little more robust at various screen sizes.

QA: Delete a fabric from the fabric details page.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b delete-fabric lp:~deadlight/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 58375a88fc5702029931e1f7cef81d0b94ddce7d

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm! I have not tested it though.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b delete-fabric lp:~deadlight/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2452/consoleText

Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Looks good +1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b delete-fabric lp:~deadlight/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2462/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/static/partials/fabric-details.html b/src/maasserver/static/partials/fabric-details.html
index 9bea87a..70b299f 100644
--- a/src/maasserver/static/partials/fabric-details.html
+++ b/src/maasserver/static/partials/fabric-details.html
@@ -8,39 +8,63 @@
8<div class="ng-hide u-no-margin--top" data-ng-show="loaded">8<div class="ng-hide u-no-margin--top" data-ng-show="loaded">
9 <header class="p-strip--light is-shallow is-bordered page-header" media-query="min-width: 769px">9 <header class="p-strip--light is-shallow is-bordered page-header" media-query="min-width: 769px">
10 <div class="row">10 <div class="row">
11 <div class="col-8">11 <div>
12 <h1 class="page-header__title">{$ fabric.name $}</h1>12 <h1 class="page-header__title u-hide--small">{$ fabric.name $}</h1>
13 </div>13 <div class="col-12 u-hide u-show--small">
14 <div class="col-4">14 <h1 class="page-header__title">{$ fabric.name $}</h1>
15 <div class="page-header__controls ng-hide" data-ng-show="isSuperUser() && !isDefaultFabric() && !loading">15 </div>
16 <div class="page-header__controls u-no-margin--top ng-hide" data-ng-show="isSuperUser() && !isDefaultFabric() && !loading">
16 <button class="p-button--negative"17 <button class="p-button--negative"
17 data-ng-click="deleteButton()"18 data-ng-click="deleteButton()"
18 data-ng-hide="confirmingDelete">Delete fabric</button>19 data-ng-hide="confirmingDelete">Delete fabric</button>
19 </div>20 </div>
20 <div class="page-header__dropdown" data-ng-class="{ 'u-hide': !confirmingDelete }">21 <div class="page-header__controls u-no-margin--top" data-ng-class="{ 'u-hide': !confirmingDelete }">
21 <section class="page-header__section ng-hide u-align--right" data-ng-hide="canBeDeleted()">22 <section class="u-no-margin--top u-align--right" data-ng-hide="canBeDeleted()">
22 <p class="page-header__message page-header__message--error">23 <div class="u-hide--small">
23 Fabric cannot be deleted because it is the default fabric.24 <i class="p-icon--error"></i> Fabric cannot be deleted because it is the default fabric.&emsp;
24 </p>
25 <div class="page-header__controls">
26 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>25 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
27 </div>26 </div>
27 <div class="u-hide u-show--small u-align--left">
28 <div class="col-12 u-align--left">
29 <p><i class="p-icon--error"></i> Fabric cannot be deleted because it is the default fabric.</p>
30 </div>
31 <div class="col-12 u-align--right">
32 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
33 </div>
34 </div>
35
28 </section>36 </section>
29 <section class="page-header__section ng-hide u-align--right" data-ng-show="canBeDeleted() && !error">37 <section class="ng-hide u-no-margin--top u-align--right" data-ng-show="canBeDeleted() && !error">
30 <p class="page-header__message page-header__message--error">38 <div class="u-hide--small">
31 <i class="p-icon--warning"></i> Are you sure you want to delete this fabric?39 <i class="p-icon--warning"></i> Are you sure you want to delete this fabric?&emsp;
32 </p>
33 <div class="page-header__controls">
34 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>40 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
35 <button class="p-button--negative" data-ng-click="deleteConfirmButton()">Delete fabric</button>41 <button class="p-button--negative" data-ng-click="deleteConfirmButton()">Delete fabric</button>
36 </div>42 </div>
43 <div class="u-hide u-show--small u-align--left">
44 <div class="col-12 u-align--left">
45 <p><i class="p-icon--warning"></i> Are you sure you want to delete this fabric?</p>
46 </div>
47 <div class="col-12 u-align--right">
48 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
49 <button class="p-button--negative" data-ng-click="deleteConfirmButton()">Delete fabric</button>
50 </div>
51 </div>
37 </section>52 </section>
38 <section class="page-header__section ng-hide u-align--right" data-ng-show="canBeDeleted() && error">53 <section class="page-header__controls u-no-margin--top u-align--right" data-ng-show="canBeDeleted() && error">
39 <p class="page-header__message page-header__message--error">{$ error $}</p>54 <div class="u-hide--small">
40 <div class="page-header__controls">55 <i class="p-icon--error"></i> {$ error $}&emsp;
41 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>56 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
42 <button class="p-button--neutral" data-ng-click="deleteConfirmButton()">Retry</button>57 <button class="p-button--neutral" data-ng-click="deleteConfirmButton()">Retry</button>
43 </div>58 </div>
59 <div class="u-hide u-show--small u-align--left">
60 <div class="col-12 u-align--left">
61 <p><i class="p-icon--error"></i> {$ error $}</p>
62 </div>
63 <div class="col-12 u-align--right">
64 <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
65 <button class="p-button--neutral" data-ng-click="deleteConfirmButton()">Retry</button>
66 </div>
67 </div>
44 </section>68 </section>
45 </div>69 </div>
46 </div>70 </div>
@@ -82,7 +106,7 @@
82 </div>106 </div>
83 <div class="p-form__control">107 <div class="p-form__control">
84 <span data-ng-repeat="rack in racks | orderBy:'hostname' track by rack.system_id">108 <span data-ng-repeat="rack in racks | orderBy:'hostname' track by rack.system_id">
85 <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>, 109 <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>,
86 </span>110 </span>
87 </div>111 </div>
88 </div>112 </div>
@@ -104,7 +128,7 @@
104 </div>128 </div>
105 <div class="p-form__control">129 <div class="p-form__control">
106 <span data-ng-repeat="rack in racks | orderBy:'hostname' track by rack.system_id">130 <span data-ng-repeat="rack in racks | orderBy:'hostname' track by rack.system_id">
107 <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>, 131 <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>,
108 </span>132 </span>
109 </div>133 </div>
110 </div>134 </div>

Subscribers

People subscribed via source and target branches