Merge lp:~blake-rouse/maas/fix-comm-options into lp:maas/trunk

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: 5176
Merged at revision: 5176
Proposed branch: lp:~blake-rouse/maas/fix-comm-options
Merge into: lp:maas/trunk
Diff against target: 58 lines (+14/-18)
1 file modified
src/maasserver/static/partials/nodes-list.html (+14/-18)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-comm-options
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+300104@code.launchpad.net

Commit message

Fix commissioning options on the node listing page to not be grayed out.

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/nodes-list.html'
2--- src/maasserver/static/partials/nodes-list.html 2016-06-14 20:52:22 +0000
3+++ src/maasserver/static/partials/nodes-list.html 2016-07-14 16:28:59 +0000
4@@ -51,40 +51,36 @@
5 <div class="page-header__dropdown ng-hide" data-ng-show="tabs.nodes.actionOption">
6 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
7 <div class="page-header__feedback ng-hide" data-ng-hide="isActionError('nodes') || hasActionsInProgress('nodes')">
8- <form class="form-inline">
9- <div class="eight-col no-margin-bottom ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">
10- <div class="inline width--auto margin-top--ten margin-right left">
11+ <form class="form form--inline">
12+ <div class="nine-col no-margin-bottom ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">
13+ <div class="form__group u-margin--right u-margin--top-tiny">
14 <input class="checkbox margin-right" id="enableSSH" type="checkbox"
15 data-ng-model="tabs.nodes.commissionOptions.enableSSH">
16 <label class="checkbox-label" for="enableSSH">Allow SSH access and prevent machine from powering off</label>
17 </div>
18- <div class="inline width--auto margin-top--ten margin-right left">
19+ <div class="form__group u-margin--right u-margin--top-tiny">
20 <input class="checkbox margin-right" id="skipNetworking" type="checkbox"
21 data-ng-model="tabs.nodes.commissionOptions.skipNetworking">
22 <label class="checkbox-label" for="skipNetworking">Retain network configuration</label>
23 </div>
24- <div class="inline width--auto margin-top--ten margin-right left">
25+ <div class="form__group u-margin--top-tiny">
26 <input class="checkbox" id="skipStorage" type="checkbox"
27 data-ng-model="tabs.nodes.commissionOptions.skipStorage">
28 <label class="checkbox-label" for="skipStorage">Retain storage configuration</label>
29 </div>
30 </div>
31- <span class="ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">
32- <label for="image">Choose your image</label>
33+ <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">
34+ <label for="image" class="u-margin--right">Choose your image</label>
35 <span data-maas-os-select="osinfo" data-ng-model="tabs.nodes.osSelection"></span>
36 </span>
37 <!-- XXX rbanffy 2015-03-23 - Need to add e2e test. -->
38- <span class="ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">
39- <span class="five-col no-margin-bottom">
40- <span class="inline">
41- <label for="zone">Select Zone</label>
42- <select name="zone" id="zone" class="three-col" placeholder="Choose a zone"
43- data-ng-model="tabs.nodes.zoneSelection"
44- data-ng-options="zone as zone.name for zone in zones">
45- <option value="" disabled="disabled">Choose a zone</option>
46- </select>
47- </span>
48- </span>
49+ <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">
50+ <label for="zone" class="u-margin--right">Select Zone</label>
51+ <select name="zone" id="zone" placeholder="Choose a zone"
52+ data-ng-model="tabs.nodes.zoneSelection"
53+ data-ng-options="zone as zone.name for zone in zones">
54+ <option value="" disabled="disabled">Choose a zone</option>
55+ </select>
56 </span>
57 <div class="right">
58 <a href="" class="link-cta-ubuntu text-button" data-ng-click="actionCancel('nodes')">Cancel</a>