MAAS

Merge ~ya-bo-ng/maas:commissioning-layout into maas:master

  1. Git
  2. lp:~ya-bo-ng/maas
  3. commissioning-layout
  4. Merge into master
Proposed by Anthony Dillon
Status: Merged
Approved by: Anthony Dillon
Approved revision: 3b93d99906a4dd8978aa2b2b659083bf6972531e
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:commissioning-layout
Merge into: maas:master
Diff against target: 98 lines (+23/-43)
2 files modified
src/maasserver/static/partials/node-details.html (+15/-27)
src/maasserver/static/partials/nodes-list.html (+8/-16)
Reviewer Review Type Date Requested Status
Lilyana Videnova (community) Approve
MAAS Lander Approve
Review via email: mp+363394@code.launchpad.net

Commit message

Updated the layout of the commissioning action in the machine details page.

Description of the change

Go to machine details and select commission from the header actions.
Check that the layout matches the Zeplin: https://app.zeplin.io/project/5c6571027d43e746400f8f1c/screen/5c657f66e74ed84622c3b293

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

UNIT TESTS
-b commissioning-layout lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 26d9f6c65b2df4339354c7481aefa3a45536d833

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

Here is a screenshot of the Zeplin design: https://images.zenhubusercontent.com/55f93fbc4f7a08fbb7f4ee18/ca8551a4-d0b7-4e7a-91be-ed89ff0b480c

~ya-bo-ng/maas:commissioning-layout updated
3b93d99... by Anthony Dillon

Layout node-listing commissioning form

Revision history for this message
Lilyana Videnova (lilyanavidenova) wrote :

good good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
2index 77fc542..4b1a0e5 100755
3--- a/src/maasserver/static/partials/node-details.html
4+++ b/src/maasserver/static/partials/node-details.html
5@@ -74,33 +74,21 @@
6 <div class="page-header__section">
7 <form class="p-form">
8 <div class="row">
9- <div class="col-10 ng-hide" data-ng-show="action.option.name === 'commission' || action.option.name === 'test'">
10- <ul class="p-inline-list--settings u-no-margin--left u-no-padding--left">
11- <li class="p-inline-list__item">
12- <input id="enableSSH" type="checkbox" data-ng-model="commissionOptions.enableSSH">
13- <label for="enableSSH">Allow SSH access and prevent machine from powering off</label>
14- </li>
15- <li class="p-inline-list__item ng-hide" data-ng-show="action.option.name === 'commission'">
16- <input id="skipNetworking" type="checkbox" data-ng-model="commissionOptions.skipNetworking">
17- <label for="skipNetworking">Retain network configuration</label>
18- </li>
19- <li class="p-inline-list__item ng-hide" data-ng-show="action.option.name === 'commission'">
20- <input id="skipStorage" type="checkbox" data-ng-model="commissionOptions.skipStorage">
21- <label for="skipStorage">Retain storage configuration</label>
22- </li>
23- <li class="p-inline-list__item ng-hide" data-ng-show="action.option.name === 'commission'">
24- <input id="skipBMCConfig" type="checkbox" data-ng-model="commissionOptions.skipBMCConfig">
25- <label for="skipBMCConfig">Skip configuring supported BMC controllers with a MAAS generated username and password.</label>
26- </li>
27- <li class="p-inline-list__item ng-hide" data-ng-show="action.option.name === 'commission'">
28- <input id="updateFirmware" type="checkbox" data-ng-model="commissionOptions.updateFirmware">
29- <label for="updateFirmware">Update firmware</label>
30- </li>
31- <li class="p-inline-list__item ng-hide" data-ng-show="action.option.name === 'commission'">
32- <input id="configureHBA" type="checkbox"data-ng-model="commissionOptions.configureHBA">
33- <label for="configureHBA">Configure HBA</label>
34- </li>
35- </ul>
36+ <div class="col-5 ng-hide" data-ng-show="action.option.name === 'commission' || action.option.name === 'test'">
37+ <input id="enableSSH" type="checkbox" data-ng-model="commissionOptions.enableSSH">
38+ <label for="enableSSH">Allow SSH access and prevent machine from powering off</label>
39+ <input id="skipBMCConfig" type="checkbox" data-ng-model="commissionOptions.skipBMCConfig">
40+ <label for="skipBMCConfig">Skip configuring supported BMC controllers with a MAAS generated username and password.</label>
41+ <input id="skipNetworking" type="checkbox" data-ng-model="commissionOptions.skipNetworking">
42+ <label for="skipNetworking">Retain network configuration</label>
43+ </div>
44+ <div class="col-5 ng-hide" data-ng-show="action.option.name === 'commission' || action.option.name === 'test'">
45+ <input id="skipStorage" type="checkbox" data-ng-model="commissionOptions.skipStorage">
46+ <label for="skipStorage">Retain storage configuration</label>
47+ <input id="updateFirmware" type="checkbox" data-ng-model="commissionOptions.updateFirmware">
48+ <label for="updateFirmware">Update firmware</label>
49+ <input id="configureHBA" type="checkbox"data-ng-model="commissionOptions.configureHBA">
50+ <label for="configureHBA">Configure HBA</label>
51 </div>
52 </div>
53 <div class="row">
54diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
55index 4785971..a850317 100644
56--- a/src/maasserver/static/partials/nodes-list.html
57+++ b/src/maasserver/static/partials/nodes-list.html
58@@ -170,32 +170,24 @@
59 <div class="row">
60 <div class="col-10 ng-hide" data-ng-show="tabs[tab].actionOption.name === 'commission'">
61 <form>
62- <ul class="p-inline-list--settings u-no-margin--left u-no-padding--left">
63- <li class="p-inline-list__item">
64+ <div class="row">
65+ <div class="col-5">
66 <input id="{$ tab $}-enableSSH" type="checkbox" data-ng-model="tabs[tab].commissionOptions.enableSSH">
67 <label for="{$ tab $}-enableSSH">Allow SSH access and prevent machine powering off</label>
68- </li>
69- <li class="p-inline-list__item">
70+ <input id="{$ tab $}-skipBMCConfig" type="checkbox" data-ng-model="tabs[tab].commissionOptions.skipBMCConfig">
71+ <label for="{$ tab $}-skipBMCConfig">Skip configuring supported BMC controllers with a MAAS generated username and password.</label>
72 <input id="{$ tab $}-skipNetworking" type="checkbox" data-ng-model="tabs[tab].commissionOptions.skipNetworking">
73 <label for="{$ tab $}-skipNetworking">Retain network configuration</label>
74- </li>
75- <li class="p-inline-list__item">
76+ </div>
77+ <div class="col-5">
78 <input id="{$ tab $}-skipStorage" type="checkbox" data-ng-model="tabs[tab].commissionOptions.skipStorage">
79 <label for="{$ tab $}-skipStorage">Retain storage configuration</label>
80- </li>
81- <li class="p-inline-list__item">
82- <input id="{$ tab $}-skipBMCConfig" type="checkbox" data-ng-model="tabs[tab].commissionOptions.skipBMCConfig">
83- <label for="{$ tab $}-skipBMCConfig">Skip configuring supported BMC controllers with a MAAS generated username and password.</label>
84- </li>
85- <li class="p-inline-list__item">
86 <input id="{$ tab $}-updateFirmware" type="checkbox" data-ng-model="tabs[tab].commissionOptions.updateFirmware">
87 <label for="{$ tab $}-updateFirmware">Update firmware</label>
88- </li>
89- <li class="p-inline-list__item">
90 <input id="{$ tab $}-configureHBA" type="checkbox" data-ng-model="tabs[tab].commissionOptions.configureHBA">
91 <label for="{$ tab $}-configureHBA">Configure HBA</label>
92- </li>
93- </ul>
94+ </div>
95+ </div>
96 </form>
97 </div>
98 <div class="ng-hide" data-ng-show="tabs[tab].actionOption.name === 'test' || tabs[tab].actionOption.name === 'deploy' || tabs[tab].actionOption.name === 'release' || tabs[tab].actionOption.name === 'set-zone' || tabs[tab].actionOption.name === 'set-pool'">

Subscribers

People subscribed via source and target branches