Merge ~blr/maas:pod-configuration-type-styling-lp1773387 into maas:master

Proposed by Kit Randel
Status: Merged
Approved by: Blake Rouse
Approved revision: a303a5b62612df1e05991de23d7bfdd8eaed23da
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~blr/maas:pod-configuration-type-styling-lp1773387
Merge into: maas:master
Diff against target: 66 lines (+25/-25)
1 file modified
src/maasserver/static/partials/pod-details.html (+25/-25)
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
MAAS Lander Approve
MAAS Maintainers Pending
Review via email: mp+347487@code.launchpad.net

Commit message

LP: #1773387 - Improve styling of Pod Configuration form.

Description of the change

Pods always have one 'Type', hence the value can be rendered in a disabled input, rather than a list. This branch also makes a few tweaks to the form to improve the rendering of the leftmost label column (previously too small, and wrapping).

# Screenshots
https://drive.google.com/open?id=1-EGIMxjzqzgCHsOZglfHHIO-A_zYpK3l (default state)
https://drive.google.com/open?id=1F1rSZnGrT_mYoa4JYlaZDHxu7PQVFngA (edit state)

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

UNIT TESTS
-b pod-configuration-type-styling-lp1773387 lp:~blr/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: a303a5b62612df1e05991de23d7bfdd8eaed23da

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

Look good +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/static/partials/pod-details.html b/src/maasserver/static/partials/pod-details.html
index a6a7167..4e07590 100644
--- a/src/maasserver/static/partials/pod-details.html
+++ b/src/maasserver/static/partials/pod-details.html
@@ -212,36 +212,36 @@
212 </div>212 </div>
213 </section>213 </section>
214 <section class="p-strip" data-ng-if="pod && section.area === 'configuration'">214 <section class="p-strip" data-ng-if="pod && section.area === 'configuration'">
215 <div class="row">215 <div class="row">
216 <div class="col-10">216 <div class="col-10">
217 <h2>Pod configuration</h2>217 <h2>Pod configuration</h2>
218 </div>218 </div>
219 <div class="col-2">219 <div class="col-2">
220 <button class="p-button--neutral u-float--right"220 <button class="p-button--neutral u-float--right"
221 data-ng-if="canEdit() && !editing"221 data-ng-if="canEdit() && !editing"
222 data-ng-click="editPodConfiguration()">Edit</button>222 data-ng-click="editPodConfiguration()">Edit</button>
223 </div>
223 </div>224 </div>
224 </div>225 <div class="row">
225 <div class="row">
226 <maas-obj-form obj="pod" manager="podManager" manager-method="updateItem"226 <maas-obj-form obj="pod" manager="podManager" manager-method="updateItem"
227 table-form="true" save-on-blur="false" after-save="exitEditPodConfiguration" data-ng-disabled="!editing">227 table-form="true" save-on-blur="false" after-save="exitEditPodConfiguration" data-ng-disabled="!editing">
228 <div class="col-6">228 <div class="col-6">
229 <div class="col-6">229 <div class="p-form__group">
230 <dl>230 <label for="type" class="p-form__label col-2">Type</label>
231 <dt>Type</dt>231 <div class="p-form__control u-no-margin--top col-5">
232 <dd>{$ getPodTypeTitle() $}</dd>232 <input type="text" id="type" disabled="disabled" value="{$ getPodTypeTitle() $}" />
233 </dl>233 </div>
234 <maas-obj-field type="options" key="zone" label="Zone"
235 subtle="false" placeholder="Choose a zone"
236 options="zone.id as zone.name for zone in zones"></maas-obj-field>
237 <maas-obj-field type="options" key="default_pool"
238 label="Resource pool" subtle="false"
239 placeholder="Choose a pool"
240 options="pool.id as pool.name for pool in pools"></maas-obj-field>
241 <maas-obj-field type="tags" key="tags" label="Tags"
242 label-width="2" input-width="5"
243 disable-label="false" placeholder="Add a tag"></maas-obj-field>
244 </div>234 </div>
235 <maas-obj-field type="options" key="zone" label="Zone"
236 subtle="false" placeholder="Choose a zone"
237 options="zone.id as zone.name for zone in zones"></maas-obj-field>
238 <maas-obj-field type="options" key="default_pool"
239 label="Resource pool" subtle="false"
240 placeholder="Choose a pool"
241 options="pool.id as pool.name for pool in pools"></maas-obj-field>
242 <maas-obj-field type="tags" key="tags" label="Tags"
243 label-width="2" input-width="5"
244 disable-label="false" placeholder="Add a tag"></maas-obj-field>
245 </div>245 </div>
246 <div class="col-6">246 <div class="col-6">
247 <maas-pod-parameters hide-type="true"></maas-pod-parameters>247 <maas-pod-parameters hide-type="true"></maas-pod-parameters>

Subscribers

People subscribed via source and target branches