MAAS

Merge ~ltrager/maas:lp1766680 into maas:master

  1. Git
  2. lp:~ltrager/maas
  3. lp1766680
  4. Merge into master
Proposed by Lee Trager
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 30037affd6af72a814f1b9ac0347f8a70e785878
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:lp1766680
Merge into: maas:master
Diff against target: 105 lines (+34/-47)
1 file modified
src/maasserver/static/partials/nodes-list.html (+34/-47)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
MAAS Lander unittests Pending
Review via email: mp+344200@code.launchpad.net

Commit message

LP: #1766680 - Fix HTML formatting and add missing end tags

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

Have not tested it, but code wise it looks 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/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
2index b1724ae..d1b1723 100644
3--- a/src/maasserver/static/partials/nodes-list.html
4+++ b/src/maasserver/static/partials/nodes-list.html
5@@ -127,8 +127,7 @@
6 <form class="p-form">
7 <div class="p-form__group ng-hide" data-ng-show="tabs[tab].actionOption.name === 'test'">
8 <div class="p-form__control u-clearfix">
9- <input id="{$ tab $}-enableSSH" type="checkbox"
10- data-ng-model="tabs[tab].commissionOptions.enableSSH">
11+ <input id="{$ tab $}-enableSSH" type="checkbox" data-ng-model="tabs[tab].commissionOptions.enableSSH"></input>
12 </div>
13 <label class="p-form__label" for="{$ tab $}-enableSSH">Allow SSH access and prevent machine powering off</label>
14 </div>
15@@ -143,57 +142,45 @@
16 <div class="p-form__group col-5 ng-hide" data-ng-show="tabs[tab].actionOption.name === 'set-zone'">
17 <label for="{$ tab $}-zone3" class="p-form__label">Select Zone</label>
18 <div class="p-form__control u-clearfix">
19- <select name="zone" id="{$ tab $}-zone3"
20- data-ng-model="tabs[tab].zoneSelection"
21- data-ng-options="zone as zone.name for zone in zones">
22+ <select name="zone" id="{$ tab $}-zone3" data-ng-model="tabs[tab].zoneSelection" data-ng-options="zone as zone.name for zone in zones">
23 <option value="" disabled="disabled">Choose a zone</option>
24 </select>
25 </div>
26 </div>
27 <div class="ng-hide" data-ng-show="MAAS_config.is_premium && tabs[tab].actionOption.name === 'set-pool'">
28- <div class="row">
29- <ul class="p-inline-list--settings u-no-margin--left u-no-padding--left">
30- <li class="p-inline-list__item col-3">
31- <input type="radio" name="pool-action" id="pool-select" data-ng-model="tabs[tab].poolAction" value="select-pool" checked="checked">
32- <label for="pool-select">Select pool</label>
33- </li>
34- <li class="p-inline-list__item">
35- <input type="radio" name="pool-action" id="pool-create" data-ng-model="tabs[tab].poolAction" value="create-pool">
36- <label for="pool-create">Create pool</label>
37- </li>
38- </ul>
39- </div>
40- <div class="row ng-hide" data-ng-show="tabs[tab].poolAction === 'select-pool'">
41- <div class="col-5 p-form__group">
42- <label for="{$ tab $}-pool3">Pool</label>
43- <select name="pool" id="{$ tab $}-pool3"
44- data-ng-model="tabs[tab].poolSelection"
45- data-ng-options="pool as pool.name for pool in pools">
46- <option value="" disabled="disabled">Select pool</option>
47- </select>
48- </div>
49- </div>
50- <div class="row ng-hide" data-ng-show="tabs[tab].poolAction === 'create-pool'">
51- <div class="col-5 p-form__group">
52- <label for="{$ tab $}-pool4">Pool name</label>
53- <input name="new-pool" id="{$ tab $}-pool4" data-ng-model="tabs[tab].newPool.name">
54- <label for="{$ tab $}-pool5">Users</label>
55- <span id="{$ tab $}-pool5"
56- data-maas-resource-pool-access="users"
57- data-ng-model="tabs[tab].newPool.users"
58- data-collection="users"
59- class="tags--inline">
60- </span>
61- <label for="{$ tab $}-pool6">Groups</label>
62- <span id="{$ tab $}-pool6"
63- data-maas-resource-pool-access="groups"
64- data-ng-model="tabs[tab].newPool.groups"
65- data-collection="groups"
66- class="tags--inline">
67- </span>
68+ <div class="row">
69+ <ul class="p-inline-list--settings u-no-margin--left u-no-padding--left">
70+ <li class="p-inline-list__item col-3">
71+ <input type="radio" name="pool-action" id="pool-select" data-ng-model="tabs[tab].poolAction" value="select-pool" checked="checked"></input>
72+ <label for="pool-select">Select pool</label>
73+ </li>
74+ <li class="p-inline-list__item">
75+ <input type="radio" name="pool-action" id="pool-create" data-ng-model="tabs[tab].poolAction" value="create-pool"></input>
76+ <label for="pool-create">Create pool</label>
77+ </li>
78+ </ul>
79+ </div>
80+ <div class="row ng-hide" data-ng-show="tabs[tab].poolAction === 'select-pool'">
81+ <div class="col-5 p-form__group">
82+ <label for="{$ tab $}-pool3">Pool</label>
83+ <select name="pool" id="{$ tab $}-pool3" data-ng-model="tabs[tab].poolSelection" data-ng-options="pool as pool.name for pool in pools">
84+ <option value="" disabled="disabled">Select pool</option>
85+ </select>
86+ </div>
87+ </div>
88+ <div class="row ng-hide" data-ng-show="tabs[tab].poolAction === 'create-pool'">
89+ <div class="col-5 p-form__group">
90+ <label for="{$ tab $}-pool4">Pool name</label>
91+ <input name="new-pool" id="{$ tab $}-pool4" data-ng-model="tabs[tab].newPool.name"></input>
92+ <label for="{$ tab $}-pool5">Users</label>
93+ <span id="{$ tab $}-pool5" data-maas-resource-pool-access="users" data-ng-model="tabs[tab].newPool.users" data-collection="users" class="tags--inline"></span>
94+ <label for="{$ tab $}-pool6">Groups</label>
95+ <span id="{$ tab $}-pool6" data-maas-resource-pool-access="groups" data-ng-model="tabs[tab].newPool.groups" data-collection="groups" class="tags--inline"></span>
96+ </div>
97+ </div>
98 </div>
99- </div>
100- </form>
101+ </form>
102+ </div>
103 </div>
104 <div class="row u-align--right" data-ng-if="tabs[tab].actionOption.name !== 'commission' && tabs[tab].actionOption.name !== 'test'">
105 <div class="col-12">

Subscribers

People subscribed via source and target branches