Merge ~ya-bo-ng/maas:form-improves-labels into maas:master
- Git
- lp:~ya-bo-ng/maas
- form-improves-labels
- Merge into master
Proposed by
Anthony Dillon
| Status: | Merged |
|---|---|
| Approved by: | Anthony Dillon |
| Approved revision: | 95c7d97bc20494eb3f12dd00f04653af9d7ea033 |
| Merge reported by: | MAAS Lander |
| Merged at revision: | not available |
| Proposed branch: | ~ya-bo-ng/maas:form-improves-labels |
| Merge into: | maas:master |
| Diff against target: |
879 lines (+187/-164) 13 files modified
src/maasserver/static/js/angular/directives/power_parameters.js (+39/-38) src/maasserver/static/js/angular/directives/tests/test_power_parameters.js (+3/-3) src/maasserver/static/js/angular/factories/tests/test_zones.js (+0/-1) src/maasserver/static/partials/dashboard.html (+7/-7) src/maasserver/static/partials/domain-details.html (+6/-6) src/maasserver/static/partials/fabric-details.html (+9/-9) src/maasserver/static/partials/node-details.html (+14/-5) src/maasserver/static/partials/node-result.html (+6/-6) src/maasserver/static/partials/subnet-details.html (+46/-42) src/maasserver/static/partials/vlan-details.html (+30/-28) src/maasserver/static/partials/zone-details.html (+8/-14) src/maasserver/static/scss/_patterns_forms.scss (+14/-0) src/maasserver/templates/maasserver/user_view.html (+5/-5) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| MAAS Lander | Approve | ||
| Lilyana Videnova (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Muted uneditable form labels
Description of the change
Slightly mute the styling of form field labels when they are not editable to make the data more clear.
Uneditable:
https:/
Editable:
https:/
To post a comment you must log in.
- d8467c4... by Anthony Dillon
-
Catch a few missing labels
Revision history for this message
| MAAS Lander (maas-lander) wrote : | # |
UNIT TESTS
-b form-improves-
STATUS: FAILED
LOG: http://
COMMIT: fbae2bdc1ba6381
review:
Needs Fixing
Revision history for this message
| MAAS Lander (maas-lander) wrote : | # |
UNIT TESTS
-b form-improves-
STATUS: FAILED
LOG: http://
COMMIT: 405503ae3003708
review:
Needs Fixing
Revision history for this message
| MAAS Lander (maas-lander) wrote : | # |
UNIT TESTS
-b form-improves-
STATUS: SUCCESS
COMMIT: 18ac912d64ebb64
review:
Approve
Revision history for this message
| Lilyana Videnova (lilyanavidenova) wrote : | # |
lgtm!
review:
Approve
Revision history for this message
| MAAS Lander (maas-lander) wrote : | # |
UNIT TESTS
-b form-improves-
STATUS: FAILED
LOG: http://
COMMIT: dd6bd32b4154323
review:
Needs Fixing
Revision history for this message
| MAAS Lander (maas-lander) wrote : | # |
UNIT TESTS
-b form-improves-
STATUS: FAILED
LOG: http://
COMMIT: d8467c4b401cfa9
review:
Needs Fixing
- 95c7d97... by Anthony Dillon
-
Test CI again
Revision history for this message
| MAAS Lander (maas-lander) wrote : | # |
UNIT TESTS
-b form-improves-
STATUS: SUCCESS
COMMIT: 95c7d97bc20494e
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | diff --git a/src/maasserver/static/js/angular/directives/power_parameters.js b/src/maasserver/static/js/angular/directives/power_parameters.js | |||
| 2 | index 435b5ed..21ad17f 100644 | |||
| 3 | --- a/src/maasserver/static/js/angular/directives/power_parameters.js | |||
| 4 | +++ b/src/maasserver/static/js/angular/directives/power_parameters.js | |||
| 5 | @@ -6,44 +6,45 @@ | |||
| 6 | 6 | 6 | ||
| 7 | 7 | angular.module('MAAS').run(['$templateCache', function ($templateCache) { | 7 | angular.module('MAAS').run(['$templateCache', function ($templateCache) { |
| 8 | 8 | // Inject the power-parameters.html into the template cache. | 8 | // Inject the power-parameters.html into the template cache. |
| 47 | 9 | $templateCache.put('directive/templates/power-parameters.html', [ | 9 | $templateCache.put('directive/templates/power-parameters.html', |
| 48 | 10 | '<div class="p-form__group u-clearfix">', | 10 | `<div class="p-form__group u-clearfix"> |
| 49 | 11 | '<label for="power-type" ', | 11 | <label for="power-type" |
| 50 | 12 | 'class="p-form__label col-2 mobile-col-2 tablet-col-2">', | 12 | class="p-form__label col-2 mobile-col-2 tablet-col-2" |
| 51 | 13 | 'Power type', | 13 | data-ng-class="{'is-disabled': !ngModel.editing }"> |
| 52 | 14 | '</label>', | 14 | Power type |
| 53 | 15 | '<div class="p-form__control col-3 mobile-col-2 tablet-col-3">', | 15 | </label> |
| 54 | 16 | '<select name="power-type" id="power-type" ', | 16 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 55 | 17 | 'data-ng-disabled="ngDisabled || ngModel.in_pod" ', | 17 | <select name="power-type" id="power-type" |
| 56 | 18 | 'data-ng-class="{ invalid: !ngModel.type }" ', | 18 | data-ng-disabled="ngDisabled || ngModel.in_pod" |
| 57 | 19 | 'data-ng-model="ngModel.type" ', | 19 | data-ng-class="{ invalid: !ngModel.type }" |
| 58 | 20 | 'data-ng-options="', | 20 | data-ng-model="ngModel.type" |
| 59 | 21 | 'type as type.description ', | 21 | data-ng-options="type as type.description |
| 60 | 22 | 'for type in maasPowerParameters track by type.name">', | 22 | for type in maasPowerParameters track by type.name"> |
| 61 | 23 | '<option value="" disabled selected>', | 23 | <option value="" disabled selected> |
| 62 | 24 | 'Select your power type', | 24 | Select your power type |
| 63 | 25 | '</option>', | 25 | </option> |
| 64 | 26 | '</select>', | 26 | </select> |
| 65 | 27 | '</div>', | 27 | </div> |
| 66 | 28 | '</div>', | 28 | </div> |
| 67 | 29 | '<div class="p-form__group u-clearfix" ', | 29 | <div class="p-form__group u-clearfix" |
| 68 | 30 | 'data-ng-repeat="field in ngModel.type.fields">', | 30 | data-ng-repeat="field in ngModel.type.fields"> |
| 69 | 31 | '<label for="{$ field.name $}" ', | 31 | <label for="{$ field.name $}" |
| 70 | 32 | 'class="p-form__label col-2 mobile-col-2 tablet-col-2" ', | 32 | class="p-form__label col-2 mobile-col-2 tablet-col-2" |
| 71 | 33 | 'data-ng-if="field.name !== ' + "'default_storage_pool' && ", | 33 | data-ng-class="{'is-disabled': !ngModel.editing }" |
| 72 | 34 | "(field.scope !== 'bmc' || !ngModel.in_pod)" + '">', | 34 | data-ng-if="field.name !== 'default_storage_pool' && |
| 73 | 35 | '{$ field.label $}', | 35 | (field.scope !== 'bmc' || !ngModel.in_pod)"> |
| 74 | 36 | '</label>', | 36 | {$ field.label $} |
| 75 | 37 | '<div class="p-form__control col-3 mobile-col-2 tablet-col-3">', | 37 | </label> |
| 76 | 38 | '<maas-power-input field="field" ', | 38 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 77 | 39 | 'data-ng-disabled="ngDisabled || (field.scope === ', | 39 | <maas-power-input field="field" |
| 78 | 40 | "'bmc' && ngModel.in_pod)" + '" ', | 40 | data-ng-disabled="ngDisabled || |
| 79 | 41 | 'data-ng-if="field.name !== ' + "'default_storage_pool' ", | 41 | (field.scope === 'bmc' && ngModel.in_pod)" |
| 80 | 42 | "&& (field.scope !== 'bmc' || !ngModel.in_pod)" + '" ', | 42 | data-ng-if="field.name !== 'default_storage_pool' |
| 81 | 43 | 'data-ng-model="ngModel.parameters[field.name]">', | 43 | && (field.scope !== 'bmc' || !ngModel.in_pod)" |
| 82 | 44 | '</div>', | 44 | data-ng-model="ngModel.parameters[field.name]"> |
| 83 | 45 | '</div>' | 45 | </div> |
| 84 | 46 | ].join('')); | 46 | </div>` |
| 85 | 47 | ); | ||
| 86 | 47 | }]); | 48 | }]); |
| 87 | 48 | 49 | ||
| 88 | 49 | angular.module('MAAS').directive('maasPowerInput', ['$compile', | 50 | angular.module('MAAS').directive('maasPowerInput', ['$compile', |
| 89 | diff --git a/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js b/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js | |||
| 90 | index d760a12..fc1e39e 100644 | |||
| 91 | --- a/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js | |||
| 92 | +++ b/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js | |||
| 93 | @@ -195,9 +195,9 @@ describe("maasPowerParameters", function() { | |||
| 94 | 195 | var directive = compileDirective("powerTypes", "value"); | 195 | var directive = compileDirective("powerTypes", "value"); |
| 95 | 196 | var select = directive.find("select"); | 196 | var select = directive.find("select"); |
| 96 | 197 | expect(select.attr("data-ng-model")).toBe("ngModel.type"); | 197 | expect(select.attr("data-ng-model")).toBe("ngModel.type"); |
| 100 | 198 | expect(select.attr("data-ng-options")).toBe("type as " + | 198 | expect(select.attr("data-ng-options")).toBe( |
| 101 | 199 | "type.description for type " + | 199 | `type as type.description |
| 102 | 200 | "in maasPowerParameters track by type.name"); | 200 | for type in maasPowerParameters track by type.name`); |
| 103 | 201 | expect(select.attr("data-ng-disabled")).toBe( | 201 | expect(select.attr("data-ng-disabled")).toBe( |
| 104 | 202 | "ngDisabled || ngModel.in_pod"); | 202 | "ngDisabled || ngModel.in_pod"); |
| 105 | 203 | }); | 203 | }); |
| 106 | diff --git a/src/maasserver/static/js/angular/factories/tests/test_zones.js b/src/maasserver/static/js/angular/factories/tests/test_zones.js | |||
| 107 | index dc5a8de..0cd424a 100644 | |||
| 108 | --- a/src/maasserver/static/js/angular/factories/tests/test_zones.js | |||
| 109 | +++ b/src/maasserver/static/js/angular/factories/tests/test_zones.js | |||
| 110 | @@ -60,7 +60,6 @@ describe("ZonesManager", function() { | |||
| 111 | 60 | for(i=0;i<3;i++) { | 60 | for(i=0;i<3;i++) { |
| 112 | 61 | ZonesManager._items.push(makeZone()); | 61 | ZonesManager._items.push(makeZone()); |
| 113 | 62 | } | 62 | } |
| 114 | 63 | |||
| 115 | 64 | expect(ZonesManager.getDefaultZone({ | 63 | expect(ZonesManager.getDefaultZone({ |
| 116 | 65 | zone: ZonesManager._items[2].id | 64 | zone: ZonesManager._items[2].id |
| 117 | 66 | })).toBe( | 65 | })).toBe( |
| 118 | diff --git a/src/maasserver/static/partials/dashboard.html b/src/maasserver/static/partials/dashboard.html | |||
| 119 | index c9d6eed..b0b36b7 100644 | |||
| 120 | --- a/src/maasserver/static/partials/dashboard.html | |||
| 121 | +++ b/src/maasserver/static/partials/dashboard.html | |||
| 122 | @@ -115,7 +115,7 @@ | |||
| 123 | 115 | <div class="row is-active"> | 115 | <div class="row is-active"> |
| 124 | 116 | <div class="col-6"> | 116 | <div class="col-6"> |
| 125 | 117 | <div class="p-form__group u-clearfix"> | 117 | <div class="p-form__group u-clearfix"> |
| 127 | 118 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2"><strong>Mac</strong></label> | 118 | <label class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2">Mac</label> |
| 128 | 119 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 119 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 129 | 120 | <span class="p-control-text"> | 120 | <span class="p-control-text"> |
| 130 | 121 | {$ discovery.mac_address $} | 121 | {$ discovery.mac_address $} |
| 131 | @@ -123,7 +123,7 @@ | |||
| 132 | 123 | </div> | 123 | </div> |
| 133 | 124 | </div> | 124 | </div> |
| 134 | 125 | <div class="p-form__group u-clearfix"> | 125 | <div class="p-form__group u-clearfix"> |
| 136 | 126 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2"><strong>IP</strong></label> | 126 | <label class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2">IP</label> |
| 137 | 127 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 127 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 138 | 128 | <span class="p-control-text"> | 128 | <span class="p-control-text"> |
| 139 | 129 | {$ discovery.ip $} | 129 | {$ discovery.ip $} |
| 140 | @@ -131,7 +131,7 @@ | |||
| 141 | 131 | </div> | 131 | </div> |
| 142 | 132 | </div> | 132 | </div> |
| 143 | 133 | <div class="p-form__group u-clearfix"> | 133 | <div class="p-form__group u-clearfix"> |
| 145 | 134 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2"><strong>Rack</strong></label> | 134 | <label class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2">Rack</label> |
| 146 | 135 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 135 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 147 | 136 | <span class="p-control-text"> | 136 | <span class="p-control-text"> |
| 148 | 137 | {$ discovery.observer_hostname $} | 137 | {$ discovery.observer_hostname $} |
| 149 | @@ -139,7 +139,7 @@ | |||
| 150 | 139 | </div> | 139 | </div> |
| 151 | 140 | </div> | 140 | </div> |
| 152 | 141 | <div class="p-form__group u-clearfix"> | 141 | <div class="p-form__group u-clearfix"> |
| 154 | 142 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2"><strong>Last seen</strong></label> | 142 | <label class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2">Last seen</label> |
| 155 | 143 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 143 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 156 | 144 | <span class="p-control-text"> | 144 | <span class="p-control-text"> |
| 157 | 145 | {$ discovery.last_seen $} | 145 | {$ discovery.last_seen $} |
| 158 | @@ -149,7 +149,7 @@ | |||
| 159 | 149 | </div> | 149 | </div> |
| 160 | 150 | <div class="col-6"> | 150 | <div class="col-6"> |
| 161 | 151 | <div class="p-form__group u-clearfix"> | 151 | <div class="p-form__group u-clearfix"> |
| 163 | 152 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2"><strong>Fabric</strong></label> | 152 | <label class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2">Fabric</label> |
| 164 | 153 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 153 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 165 | 154 | <span class="p-control-text"> | 154 | <span class="p-control-text"> |
| 166 | 155 | {$ discovery.fabric_name $} | 155 | {$ discovery.fabric_name $} |
| 167 | @@ -157,7 +157,7 @@ | |||
| 168 | 157 | </div> | 157 | </div> |
| 169 | 158 | </div> | 158 | </div> |
| 170 | 159 | <div class="p-form__group u-clearfix"> | 159 | <div class="p-form__group u-clearfix"> |
| 172 | 160 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2"><strong>VLAN</strong></label> | 160 | <label class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2">VLAN</label> |
| 173 | 161 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 161 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 174 | 162 | <span class="p-control-text"> | 162 | <span class="p-control-text"> |
| 175 | 163 | {$ getVLANName(discovery.vlan) $} | 163 | {$ getVLANName(discovery.vlan) $} |
| 176 | @@ -165,7 +165,7 @@ | |||
| 177 | 165 | </div> | 165 | </div> |
| 178 | 166 | </div> | 166 | </div> |
| 179 | 167 | <div class="p-form__group u-clearfix"> | 167 | <div class="p-form__group u-clearfix"> |
| 181 | 168 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2"><strong>Subnet</strong></label> | 168 | <label class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2">Subnet</label> |
| 182 | 169 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 169 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 183 | 170 | <a href="#/subnet/{$ discovery.subnet $}" class="p-control-text">{$ getSubnetName(discovery.subnet) $}</a> | 170 | <a href="#/subnet/{$ discovery.subnet $}" class="p-control-text">{$ getSubnetName(discovery.subnet) $}</a> |
| 184 | 171 | </div> | 171 | </div> |
| 185 | diff --git a/src/maasserver/static/partials/domain-details.html b/src/maasserver/static/partials/domain-details.html | |||
| 186 | index 4240de3..2104073 100644 | |||
| 187 | --- a/src/maasserver/static/partials/domain-details.html | |||
| 188 | +++ b/src/maasserver/static/partials/domain-details.html | |||
| 189 | @@ -133,16 +133,16 @@ | |||
| 190 | 133 | <div class="form p-form--stacked row" data-ng-if="editSummary != true"> | 133 | <div class="form p-form--stacked row" data-ng-if="editSummary != true"> |
| 191 | 134 | <div class="col-6"> | 134 | <div class="col-6"> |
| 192 | 135 | <div class="p-form__group"> | 135 | <div class="p-form__group"> |
| 195 | 136 | <div class="p-form__label"> | 136 | <div class="p-form__label is-disabled"> |
| 196 | 137 | <p><strong>Name</strong></p> | 137 | <p>Name</p> |
| 197 | 138 | </div> | 138 | </div> |
| 198 | 139 | <div class="p-form__control"> | 139 | <div class="p-form__control"> |
| 199 | 140 | <p>{$ domain.name $}</p> | 140 | <p>{$ domain.name $}</p> |
| 200 | 141 | </div> | 141 | </div> |
| 201 | 142 | </div> | 142 | </div> |
| 202 | 143 | <div class="p-form__group"> | 143 | <div class="p-form__group"> |
| 205 | 144 | <div class="p-form__label"> | 144 | <div class="p-form__label is-disabled"> |
| 206 | 145 | <p><strong>TTL</strong></p> | 145 | <p>TTL</p> |
| 207 | 146 | </div> | 146 | </div> |
| 208 | 147 | <div class="p-form__control"> | 147 | <div class="p-form__control"> |
| 209 | 148 | <p data-ng-if="domain.ttl">{$ domain.ttl $}</p> | 148 | <p data-ng-if="domain.ttl">{$ domain.ttl $}</p> |
| 210 | @@ -152,8 +152,8 @@ | |||
| 211 | 152 | </div> | 152 | </div> |
| 212 | 153 | <div class="col-6"> | 153 | <div class="col-6"> |
| 213 | 154 | <div class="p-form__group"> | 154 | <div class="p-form__group"> |
| 216 | 155 | <div class="p-form__label"> | 155 | <div class="p-form__label is-disabled"> |
| 217 | 156 | <p><strong>Authoritative</strong></p> | 156 | <p>Authoritative</p> |
| 218 | 157 | </div> | 157 | </div> |
| 219 | 158 | <div class="p-form__control"> | 158 | <div class="p-form__control"> |
| 220 | 159 | <span data-ng-if="domain.authoritative == false">No</span> | 159 | <span data-ng-if="domain.authoritative == false">No</span> |
| 221 | diff --git a/src/maasserver/static/partials/fabric-details.html b/src/maasserver/static/partials/fabric-details.html | |||
| 222 | index b6d51d9..a64c43a 100644 | |||
| 223 | --- a/src/maasserver/static/partials/fabric-details.html | |||
| 224 | +++ b/src/maasserver/static/partials/fabric-details.html | |||
| 225 | @@ -83,16 +83,16 @@ | |||
| 226 | 83 | <div class="form p-form--stacked row" data-ng-if="editSummary != true"> | 83 | <div class="form p-form--stacked row" data-ng-if="editSummary != true"> |
| 227 | 84 | <div class="col-6"> | 84 | <div class="col-6"> |
| 228 | 85 | <div class="p-form__group"> | 85 | <div class="p-form__group"> |
| 231 | 86 | <div class="p-form__label col-2 tablet-col-2"> | 86 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 232 | 87 | <div><strong>Name:</strong></div> | 87 | <div>Name</div> |
| 233 | 88 | </div> | 88 | </div> |
| 234 | 89 | <div class="p-form__control col-3 tablet-col-4"> | 89 | <div class="p-form__control col-3 tablet-col-4"> |
| 235 | 90 | <p>{$ fabric.name $}</p> | 90 | <p>{$ fabric.name $}</p> |
| 236 | 91 | </div> | 91 | </div> |
| 237 | 92 | </div> | 92 | </div> |
| 238 | 93 | <div class="p-form__group"> | 93 | <div class="p-form__group"> |
| 241 | 94 | <div class="p-form__label col-2 tablet-col-2"> | 94 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 242 | 95 | <div><strong>Description:</strong></div> | 95 | <div>Description</div> |
| 243 | 96 | </div> | 96 | </div> |
| 244 | 97 | <div class="p-form__control col-4 tablet-col-4"> | 97 | <div class="p-form__control col-4 tablet-col-4"> |
| 245 | 98 | <p>{$ fabric.description $}</p> | 98 | <p>{$ fabric.description $}</p> |
| 246 | @@ -101,12 +101,12 @@ | |||
| 247 | 101 | </div> | 101 | </div> |
| 248 | 102 | <div class="col-6"> | 102 | <div class="col-6"> |
| 249 | 103 | <div class="p-form__group"> | 103 | <div class="p-form__group"> |
| 252 | 104 | <div class="p-form__label col-2 tablet-col-2"> | 104 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 253 | 105 | <div><strong>Rack controllers</strong></div> | 105 | <div>Rack controllers</div> |
| 254 | 106 | </div> | 106 | </div> |
| 255 | 107 | <div class="p-form__control col-3 tablet-col-4"> | 107 | <div class="p-form__control col-3 tablet-col-4"> |
| 256 | 108 | <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"> |
| 258 | 109 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>, | 109 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a><span ng-show="!$last">,</span> |
| 259 | 110 | </span> | 110 | </span> |
| 260 | 111 | </div> | 111 | </div> |
| 261 | 112 | </div> | 112 | </div> |
| 262 | @@ -122,12 +122,12 @@ | |||
| 263 | 122 | </div> | 122 | </div> |
| 264 | 123 | <div class="col-6"> | 123 | <div class="col-6"> |
| 265 | 124 | <div class="p-form__group"> | 124 | <div class="p-form__group"> |
| 267 | 125 | <div class="p-form__label col-2 tablet-col-2"> | 125 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 268 | 126 | <p>Rack controllers</p> | 126 | <p>Rack controllers</p> |
| 269 | 127 | </div> | 127 | </div> |
| 270 | 128 | <div class="p-form__control col-3 tablet-col-4"> | 128 | <div class="p-form__control col-3 tablet-col-4"> |
| 271 | 129 | <span data-ng-repeat="rack in racks | orderBy:'hostname' track by rack.system_id"> | 129 | <span data-ng-repeat="rack in racks | orderBy:'hostname' track by rack.system_id"> |
| 273 | 130 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>, | 130 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a><span ng-show="!$last">,</span> |
| 274 | 131 | </span> | 131 | </span> |
| 275 | 132 | </div> | 132 | </div> |
| 276 | 133 | </div> | 133 | </div> |
| 277 | diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html | |||
| 278 | index 77fc542..6411386 100755 | |||
| 279 | --- a/src/maasserver/static/partials/node-details.html | |||
| 280 | +++ b/src/maasserver/static/partials/node-details.html | |||
| 281 | @@ -527,7 +527,9 @@ | |||
| 282 | 527 | <div class="col-6"> | 527 | <div class="col-6"> |
| 283 | 528 | <div class="p-form__group u-clearfix" data-ng-if="!isDevice && !isController" | 528 | <div class="p-form__group u-clearfix" data-ng-if="!isDevice && !isController" |
| 284 | 529 | data-ng-class="{ 'is-error': invalidArchitecture() }"> | 529 | data-ng-class="{ 'is-error': invalidArchitecture() }"> |
| 286 | 530 | <label for="architecture" class="p-form__label col-2 mobile-col-2 tablet-col-2">Architecture</label> | 530 | <label for="architecture" |
| 287 | 531 | class="p-form__label col-2 mobile-col-2 tablet-col-2" | ||
| 288 | 532 | data-ng-class="{'is-disabled': !summary.editing }">Architecture</label> | ||
| 289 | 531 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 533 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 290 | 532 | <select name="architecture" id="architecture" class="p-form-validation__input" | 534 | <select name="architecture" id="architecture" class="p-form-validation__input" |
| 291 | 533 | data-ng-disabled="!summary.editing" | 535 | data-ng-disabled="!summary.editing" |
| 292 | @@ -538,7 +540,9 @@ | |||
| 293 | 538 | </div> | 540 | </div> |
| 294 | 539 | </div> | 541 | </div> |
| 295 | 540 | <div class="p-form__group u-clearfix" data-ng-if="!isDevice && !isController"> | 542 | <div class="p-form__group u-clearfix" data-ng-if="!isDevice && !isController"> |
| 297 | 541 | <label for="min_hwe_kernel" class="p-form__label col-2 mobile-col-2 tablet-col-2">Minimum Kernel</label> | 543 | <label for="min_hwe_kernel" |
| 298 | 544 | class="p-form__label col-2 mobile-col-2 tablet-col-2" | ||
| 299 | 545 | data-ng-class="{'is-disabled': !summary.editing }">Minimum Kernel</label> | ||
| 300 | 542 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 546 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 301 | 543 | <select name="min_hwe_kernel" id="min_hwe_kernel" | 547 | <select name="min_hwe_kernel" id="min_hwe_kernel" |
| 302 | 544 | data-ng-disabled="!summary.editing" | 548 | data-ng-disabled="!summary.editing" |
| 303 | @@ -549,7 +553,9 @@ | |||
| 304 | 549 | </div> | 553 | </div> |
| 305 | 550 | </div> | 554 | </div> |
| 306 | 551 | <div class="p-form__group u-clearfix"> | 555 | <div class="p-form__group u-clearfix"> |
| 308 | 552 | <label for="zone" class="p-form__label col-2 mobile-col-2 tablet-col-2">Zone</label> | 556 | <label for="zone" |
| 309 | 557 | class="p-form__label col-2 mobile-col-2 tablet-col-2" | ||
| 310 | 558 | data-ng-class="{'is-disabled': !summary.editing }">Zone</label> | ||
| 311 | 553 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 559 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 312 | 554 | <select name="zone" id="zone" | 560 | <select name="zone" id="zone" |
| 313 | 555 | data-ng-disabled="!summary.editing" | 561 | data-ng-disabled="!summary.editing" |
| 314 | @@ -560,7 +566,9 @@ | |||
| 315 | 560 | </div> | 566 | </div> |
| 316 | 561 | </div> | 567 | </div> |
| 317 | 562 | <div class="p-form__group u-clearfix" data-ng-if="!isDevice && !isController"> | 568 | <div class="p-form__group u-clearfix" data-ng-if="!isDevice && !isController"> |
| 319 | 563 | <label for="pool" class="p-form__label col-2 mobile-col-2 tablet-col-2">Resource pool</label> | 569 | <label for="pool" |
| 320 | 570 | class="p-form__label col-2 mobile-col-2 tablet-col-2" | ||
| 321 | 571 | data-ng-class="{'is-disabled': !summary.editing }">Resource pool</label> | ||
| 322 | 564 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 572 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 323 | 565 | <select name="pool" id="pool" | 573 | <select name="pool" id="pool" |
| 324 | 566 | data-ng-disabled="!summary.editing" | 574 | data-ng-disabled="!summary.editing" |
| 325 | @@ -571,7 +579,8 @@ | |||
| 326 | 571 | </div> | 579 | </div> |
| 327 | 572 | </div> | 580 | </div> |
| 328 | 573 | <div class="p-form__group u-clearfix"> | 581 | <div class="p-form__group u-clearfix"> |
| 330 | 574 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2">Tags</label> | 582 | <label class="p-form__label col-2 mobile-col-2 tablet-col-2" |
| 331 | 583 | data-ng-class="{'is-disabled': !summary.editing }">Tags</label> | ||
| 332 | 575 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3 tags--inline"> | 584 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3 tags--inline"> |
| 333 | 576 | <span data-ng-repeat="tag in node.tags" data-ng-hide="summary.editing"> | 585 | <span data-ng-repeat="tag in node.tags" data-ng-hide="summary.editing"> |
| 334 | 577 | <a href="#/machines/?query=tags:({$ tag $})">{$ tag $}</a> | 586 | <a href="#/machines/?query=tags:({$ tag $})">{$ tag $}</a> |
| 335 | diff --git a/src/maasserver/static/partials/node-result.html b/src/maasserver/static/partials/node-result.html | |||
| 336 | index 4acabb1..d5f427e 100644 | |||
| 337 | --- a/src/maasserver/static/partials/node-result.html | |||
| 338 | +++ b/src/maasserver/static/partials/node-result.html | |||
| 339 | @@ -24,7 +24,7 @@ | |||
| 340 | 24 | <div class="col-6"> | 24 | <div class="col-6"> |
| 341 | 25 | <div class="p-form__group"> | 25 | <div class="p-form__group"> |
| 342 | 26 | <div class="p-form__label"> | 26 | <div class="p-form__label"> |
| 344 | 27 | <strong>Status</strong> | 27 | Status |
| 345 | 28 | </div> | 28 | </div> |
| 346 | 29 | <div class="p-form__control"> | 29 | <div class="p-form__control"> |
| 347 | 30 | <p class="ng-binding u-no-padding--top"> | 30 | <p class="ng-binding u-no-padding--top"> |
| 348 | @@ -34,7 +34,7 @@ | |||
| 349 | 34 | </div> | 34 | </div> |
| 350 | 35 | <div class="p-form__group"> | 35 | <div class="p-form__group"> |
| 351 | 36 | <div class="p-form__label"> | 36 | <div class="p-form__label"> |
| 353 | 37 | <strong>Exit Status</strong> | 37 | Exit Status |
| 354 | 38 | </div> | 38 | </div> |
| 355 | 39 | <div class="p-form__control"> | 39 | <div class="p-form__control"> |
| 356 | 40 | <p class="ng-binding u-no-padding--top" data-ng-if="result.exit_status || result.exit_status === 0">{$ result.exit_status $}</p> | 40 | <p class="ng-binding u-no-padding--top" data-ng-if="result.exit_status || result.exit_status === 0">{$ result.exit_status $}</p> |
| 357 | @@ -43,7 +43,7 @@ | |||
| 358 | 43 | </div> | 43 | </div> |
| 359 | 44 | <div class="p-form__group"> | 44 | <div class="p-form__group"> |
| 360 | 45 | <div class="p-form__label"> | 45 | <div class="p-form__label"> |
| 362 | 46 | <strong>Tags</strong> | 46 | Tags |
| 363 | 47 | </div> | 47 | </div> |
| 364 | 48 | <div class="p-form__control"> | 48 | <div class="p-form__control"> |
| 365 | 49 | <p class="ng-binding u-no-padding--top" data-ng-if="result.tags">{$ result.tags $}</p> | 49 | <p class="ng-binding u-no-padding--top" data-ng-if="result.tags">{$ result.tags $}</p> |
| 366 | @@ -54,7 +54,7 @@ | |||
| 367 | 54 | <div class="col-6"> | 54 | <div class="col-6"> |
| 368 | 55 | <div class="p-form__group"> | 55 | <div class="p-form__group"> |
| 369 | 56 | <div class="p-form__label"> | 56 | <div class="p-form__label"> |
| 371 | 57 | <strong>Start Time</strong> | 57 | Start Time |
| 372 | 58 | </div> | 58 | </div> |
| 373 | 59 | <div class="p-form__control"> | 59 | <div class="p-form__control"> |
| 374 | 60 | <p class="ng-binding u-no-padding--top" data-ng-if="result.started">{$ result.started $}</p> | 60 | <p class="ng-binding u-no-padding--top" data-ng-if="result.started">{$ result.started $}</p> |
| 375 | @@ -63,7 +63,7 @@ | |||
| 376 | 63 | </div> | 63 | </div> |
| 377 | 64 | <div class="p-form__group"> | 64 | <div class="p-form__group"> |
| 378 | 65 | <div class="p-form__label"> | 65 | <div class="p-form__label"> |
| 380 | 66 | <strong>End Time</strong> | 66 | End Time |
| 381 | 67 | </div> | 67 | </div> |
| 382 | 68 | <div class="p-form__control"> | 68 | <div class="p-form__control"> |
| 383 | 69 | <p class="ng-binding u-no-padding--top" data-ng-if="result.ended">{$ result.ended $}</p> | 69 | <p class="ng-binding u-no-padding--top" data-ng-if="result.ended">{$ result.ended $}</p> |
| 384 | @@ -72,7 +72,7 @@ | |||
| 385 | 72 | </div> | 72 | </div> |
| 386 | 73 | <div class="p-form__group"> | 73 | <div class="p-form__group"> |
| 387 | 74 | <div class="p-form__label"> | 74 | <div class="p-form__label"> |
| 389 | 75 | <strong>Runtime</strong> | 75 | Runtime |
| 390 | 76 | </div> | 76 | </div> |
| 391 | 77 | <div class="p-form__control"> | 77 | <div class="p-form__control"> |
| 392 | 78 | <p class="ng-binding u-no-padding--top" data-ng-if="result.runtime">{$ result.runtime $}</p> | 78 | <p class="ng-binding u-no-padding--top" data-ng-if="result.runtime">{$ result.runtime $}</p> |
| 393 | diff --git a/src/maasserver/static/partials/subnet-details.html b/src/maasserver/static/partials/subnet-details.html | |||
| 394 | index e449d35..3d884dd 100755 | |||
| 395 | --- a/src/maasserver/static/partials/subnet-details.html | |||
| 396 | +++ b/src/maasserver/static/partials/subnet-details.html | |||
| 397 | @@ -84,24 +84,24 @@ | |||
| 398 | 84 | <div class="form p-form--stacked row" data-ng-if="editSummary != true"> | 84 | <div class="form p-form--stacked row" data-ng-if="editSummary != true"> |
| 399 | 85 | <div class="col-6"> | 85 | <div class="col-6"> |
| 400 | 86 | <div class="p-form__group"> | 86 | <div class="p-form__group"> |
| 403 | 87 | <div class="p-form__label col-2 tablet-col-2"> | 87 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 404 | 88 | <p><strong>Name</strong></p> | 88 | <p>Name</p> |
| 405 | 89 | </div> | 89 | </div> |
| 406 | 90 | <div class="p-form__control col-4 tablet-col-3"> | 90 | <div class="p-form__control col-4 tablet-col-3"> |
| 407 | 91 | <p>{$ subnet.name $}</p> | 91 | <p>{$ subnet.name $}</p> |
| 408 | 92 | </div> | 92 | </div> |
| 409 | 93 | </div> | 93 | </div> |
| 410 | 94 | <div class="p-form__group"> | 94 | <div class="p-form__group"> |
| 413 | 95 | <div class="p-form__label col-2 tablet-col-2"> | 95 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 414 | 96 | <p><strong>CIDR</strong></p> | 96 | <p>CIDR</p> |
| 415 | 97 | </div> | 97 | </div> |
| 416 | 98 | <div class="p-form__control col-4 tablet-col-3"> | 98 | <div class="p-form__control col-4 tablet-col-3"> |
| 417 | 99 | <p>{$ subnet.cidr $}</span> | 99 | <p>{$ subnet.cidr $}</span> |
| 418 | 100 | </div> | 100 | </div> |
| 419 | 101 | </div> | 101 | </div> |
| 420 | 102 | <div class="p-form__group"> | 102 | <div class="p-form__group"> |
| 423 | 103 | <div class="p-form__label col-2 tablet-col-2"> | 103 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 424 | 104 | <p><strong>Gateway IP</strong></p> | 104 | <p>Gateway IP</p> |
| 425 | 105 | </div> | 105 | </div> |
| 426 | 106 | <div class="p-form__control col-4 tablet-col-3"> | 106 | <div class="p-form__control col-4 tablet-col-3"> |
| 427 | 107 | <p data-ng-if="subnet.gateway_ip">{$ subnet.gateway_ip $}</p> | 107 | <p data-ng-if="subnet.gateway_ip">{$ subnet.gateway_ip $}</p> |
| 428 | @@ -109,8 +109,8 @@ | |||
| 429 | 109 | </div> | 109 | </div> |
| 430 | 110 | </div> | 110 | </div> |
| 431 | 111 | <div class="p-form__group"> | 111 | <div class="p-form__group"> |
| 434 | 112 | <div class="p-form__label col-2 tablet-col-2"> | 112 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 435 | 113 | <p><strong>DNS</strong></p> | 113 | <p>DNS</p> |
| 436 | 114 | </div> | 114 | </div> |
| 437 | 115 | <div class="p-form__control col-4 tablet-col-3"> | 115 | <div class="p-form__control col-4 tablet-col-3"> |
| 438 | 116 | <p data-ng-if="subnet.dns_servers">{$ subnet.dns_servers $}</p> | 116 | <p data-ng-if="subnet.dns_servers">{$ subnet.dns_servers $}</p> |
| 439 | @@ -118,8 +118,8 @@ | |||
| 440 | 118 | </div> | 118 | </div> |
| 441 | 119 | </div> | 119 | </div> |
| 442 | 120 | <div class="p-form__group"> | 120 | <div class="p-form__group"> |
| 445 | 121 | <div class="p-form__label col-2 tablet-col-2"> | 121 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 446 | 122 | <p><strong>Description</strong></p> | 122 | <p>Description</p> |
| 447 | 123 | </div> | 123 | </div> |
| 448 | 124 | <div class="p-form__control col-4 tablet-col-3"> | 124 | <div class="p-form__control col-4 tablet-col-3"> |
| 449 | 125 | <p data-ng-if="subnet.description">{$ subnet.description $}</p> | 125 | <p data-ng-if="subnet.description">{$ subnet.description $}</p> |
| 450 | @@ -129,9 +129,9 @@ | |||
| 451 | 129 | </div> | 129 | </div> |
| 452 | 130 | <div class="col-6"> | 130 | <div class="col-6"> |
| 453 | 131 | <div class="p-form__group"> | 131 | <div class="p-form__group"> |
| 455 | 132 | <div class="p-form__label col-2 tablet-col-2"> | 132 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 456 | 133 | <p> | 133 | <p> |
| 458 | 134 | <strong>Managed allocation</strong> | 134 | Managed allocation |
| 459 | 135 | <span data-ng-if="subnet.managed == false" class="p-tooltip p-tooltip--btm-right"> | 135 | <span data-ng-if="subnet.managed == false" class="p-tooltip p-tooltip--btm-right"> |
| 460 | 136 | <i class="p-icon--information">Help:</i> | 136 | <i class="p-icon--information">Help:</i> |
| 461 | 137 | <span class="p-tooltip__message" role="tooltip">MAAS allocates IP addresses only from
the reserved ranges on this subnet.</span> | 137 | <span class="p-tooltip__message" role="tooltip">MAAS allocates IP addresses only from
the reserved ranges on this subnet.</span> |
| 462 | @@ -149,9 +149,9 @@ | |||
| 463 | 149 | </div> | 149 | </div> |
| 464 | 150 | </div> | 150 | </div> |
| 465 | 151 | <div class="p-form__group"> | 151 | <div class="p-form__group"> |
| 467 | 152 | <div class="p-form__label col-2 tablet-col-2"> | 152 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 468 | 153 | <p> | 153 | <p> |
| 470 | 154 | <strong>Active discovery</strong> | 154 | Active discovery |
| 471 | 155 | <span data-ng-if="subnet.managed == true" class="p-tooltip p-tooltip--btm-right"> | 155 | <span data-ng-if="subnet.managed == true" class="p-tooltip p-tooltip--btm-right"> |
| 472 | 156 | <i class="p-icon--information u-no-margin--right">Help:</i> | 156 | <i class="p-icon--information u-no-margin--right">Help:</i> |
| 473 | 157 | <span class="p-tooltip__message" role="tooltip">When enabled, MAAS will scan this subnet {$ active_discovery_interval | lowercase $}
to discover hosts that have not been discovered passively.</span> | 157 | <span class="p-tooltip__message" role="tooltip">When enabled, MAAS will scan this subnet {$ active_discovery_interval | lowercase $}
to discover hosts that have not been discovered passively.</span> |
| 474 | @@ -164,9 +164,9 @@ | |||
| 475 | 164 | </div> | 164 | </div> |
| 476 | 165 | </div> | 165 | </div> |
| 477 | 166 | <div class="p-form__group"> | 166 | <div class="p-form__group"> |
| 479 | 167 | <div class="p-form__label col-2 tablet-col-2"> | 167 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 480 | 168 | <p> | 168 | <p> |
| 482 | 169 | <strong>Proxy access</strong> | 169 | Proxy access |
| 483 | 170 | <span data-ng-if="subnet.allow_proxy == false" class="p-tooltip p-tooltip--btm-right"> | 170 | <span data-ng-if="subnet.allow_proxy == false" class="p-tooltip p-tooltip--btm-right"> |
| 484 | 171 | <i class="p-icon--information">Help:</i> | 171 | <i class="p-icon--information">Help:</i> |
| 485 | 172 | <span class="p-tooltip__message" role="tooltip">MAAS will not allow clients from this
subnet to access the MAAS proxy.</span> | 172 | <span class="p-tooltip__message" role="tooltip">MAAS will not allow clients from this
subnet to access the MAAS proxy.</span> |
| 486 | @@ -184,9 +184,9 @@ | |||
| 487 | 184 | </div> | 184 | </div> |
| 488 | 185 | </div> | 185 | </div> |
| 489 | 186 | <div class="p-form__group"> | 186 | <div class="p-form__group"> |
| 491 | 187 | <div class="p-form__label col-2 tablet-col-2"> | 187 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 492 | 188 | <p> | 188 | <p> |
| 494 | 189 | <strong>Allow DNS resolution</strong> | 189 | Allow DNS resolution |
| 495 | 190 | <span data-ng-if="subnet.allow_dns == false" class="p-tooltip p-tooltip--btm-right"> | 190 | <span data-ng-if="subnet.allow_dns == false" class="p-tooltip p-tooltip--btm-right"> |
| 496 | 191 | <i class="p-icon--information">Help:</i> | 191 | <i class="p-icon--information">Help:</i> |
| 497 | 192 | <span class="p-tooltip__message" role="tooltip">MAAS will not allow clients from this
subnet to use MAAS for DNS resolution.</span> | 192 | <span class="p-tooltip__message" role="tooltip">MAAS will not allow clients from this
subnet to use MAAS for DNS resolution.</span> |
| 498 | @@ -204,34 +204,36 @@ | |||
| 499 | 204 | </div> | 204 | </div> |
| 500 | 205 | </div> | 205 | </div> |
| 501 | 206 | <div class="p-form__group"> | 206 | <div class="p-form__group"> |
| 504 | 207 | <div class="p-form__label col-2 tablet-col-2"> | 207 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 505 | 208 | <p><strong>Fabric</strong></p> | 208 | <p>Fabric</p> |
| 506 | 209 | </div> | 209 | </div> |
| 507 | 210 | <div class="p-form__control col-4 tablet-col-3"> | 210 | <div class="p-form__control col-4 tablet-col-3"> |
| 508 | 211 | <p>{$ subnet.fabric_name $}</p> | 211 | <p>{$ subnet.fabric_name $}</p> |
| 509 | 212 | </div> | 212 | </div> |
| 510 | 213 | </div> | 213 | </div> |
| 511 | 214 | <div class="p-form__group"> | 214 | <div class="p-form__group"> |
| 514 | 215 | <div class="p-form__label col-2 tablet-col-2"> | 215 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 515 | 216 | <p><strong>VLAN</strong></p> | 216 | <p>VLAN</p> |
| 516 | 217 | </div> | 217 | </div> |
| 517 | 218 | <div class="p-form__control col-4 tablet-col-3"> | 218 | <div class="p-form__control col-4 tablet-col-3"> |
| 518 | 219 | <p>{$ subnet.vlan_name $}</p> | 219 | <p>{$ subnet.vlan_name $}</p> |
| 519 | 220 | </div> | 220 | </div> |
| 520 | 221 | </div> | 221 | </div> |
| 521 | 222 | <div class="p-form__group"> | 222 | <div class="p-form__group"> |
| 524 | 223 | <div class="p-form__label col-2 tablet-col-2"> | 223 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 525 | 224 | <p><strong>Space</strong></p> | 224 | <p>Space</p> |
| 526 | 225 | </div> | 225 | </div> |
| 527 | 226 | <div class="p-form__control col-4 tablet-col-3"> | 226 | <div class="p-form__control col-4 tablet-col-3"> |
| 534 | 227 | <a data-ng-if="space !== null" href="#/space/{$ space.id $}">{$ space.name $}</a> | 227 | <p> |
| 535 | 228 | <span data-ng-if="space === null"> | 228 | <a data-ng-if="space !== null" href="#/space/{$ space.id $}">{$ space.name $}</a> |
| 536 | 229 | (undefined) | 229 | <span data-ng-if="space === null"> |
| 537 | 230 | <span class="p-tooltip p-tooltip--top-center"> | 230 | (undefined) |
| 538 | 231 | <i class="p-icon--warning">Warning:</i> | 231 | <span class="p-tooltip p-tooltip--top-center"> |
| 539 | 232 | <span class="p-tooltip__message" role="tooltip">This subnet does not belong to a space.
MAAS integrations require a space in order to determine the purpose of a network.</span> | 232 | <i class="p-icon--warning">Warning:</i> |
| 540 | 233 | <span class="p-tooltip__message" role="tooltip">This subnet does not belong to a space.
MAAS integrations require a space in order to determine the purpose of a network.</span> | ||
| 541 | 234 | </span> | ||
| 542 | 233 | </span> | 235 | </span> |
| 544 | 234 | </span> | 236 | </p> |
| 545 | 235 | </div> | 237 | </div> |
| 546 | 236 | </div> | 238 | </div> |
| 547 | 237 | </div> | 239 | </div> |
| 548 | @@ -286,18 +288,20 @@ | |||
| 549 | 286 | options="v.id as getVLANName(v) for v in vlans | filterByFabric:subnet.$maasForm.getValue('fabric')" | 288 | options="v.id as getVLANName(v) for v in vlans | filterByFabric:subnet.$maasForm.getValue('fabric')" |
| 550 | 287 | label-width="2" label-width-tablet="2" input-width="3" input-width-tablet="4"></maas-obj-field> | 289 | label-width="2" label-width-tablet="2" input-width="3" input-width-tablet="4"></maas-obj-field> |
| 551 | 288 | <div class="p-form__group"> | 290 | <div class="p-form__group"> |
| 553 | 289 | <div class="p-form__label col-2 tablet-col-2"> | 291 | <div class="p-form__label is-disabled col-2 tablet-col-2"> |
| 554 | 290 | <p>Space</p> | 292 | <p>Space</p> |
| 555 | 291 | </div> | 293 | </div> |
| 556 | 292 | <div class="p-form__control col-4 tablet-col-3"> | 294 | <div class="p-form__control col-4 tablet-col-3"> |
| 563 | 293 | <a data-ng-if="space !== null" href="#/space/{$ space.id $}">{$ space.name $}</a> | 295 | <p> |
| 564 | 294 | <span data-ng-if="space === null"> | 296 | <a data-ng-if="space !== null" href="#/space/{$ space.id $}">{$ space.name $}</a> |
| 565 | 295 | (undefined) | 297 | <span data-ng-if="space === null"> |
| 566 | 296 | <span class="p-tooltip p-tooltip--top-center"> | 298 | (undefined) |
| 567 | 297 | <i class="p-icon--warning">Warning:</i> | 299 | <span class="p-tooltip p-tooltip--top-center"> |
| 568 | 298 | <span class="p-tooltip__message" role="tooltip">This subnet does not belong to a space.
MAAS integrations require a space in order to determine the purpose of a network.</span> | 300 | <i class="p-icon--warning">Warning:</i> |
| 569 | 301 | <span class="p-tooltip__message" role="tooltip">This subnet does not belong to a space.
MAAS integrations require a space in order to determine the purpose of a network.</span> | ||
| 570 | 302 | </span> | ||
| 571 | 299 | </span> | 303 | </span> |
| 573 | 300 | </span> | 304 | </p> |
| 574 | 301 | </div> | 305 | </div> |
| 575 | 302 | </div> | 306 | </div> |
| 576 | 303 | </div> | 307 | </div> |
| 577 | @@ -477,7 +481,7 @@ | |||
| 578 | 477 | <div class="col-6"> | 481 | <div class="col-6"> |
| 579 | 478 | <div class="row"> | 482 | <div class="row"> |
| 580 | 479 | <div class="col-2"> | 483 | <div class="col-2"> |
| 582 | 480 | <p><strong>Subnet addresses</strong></p> | 484 | <p class="p-form__label is-disabled">Subnet addresses</p> |
| 583 | 481 | </div> | 485 | </div> |
| 584 | 482 | <div class="col-4"> | 486 | <div class="col-4"> |
| 585 | 483 | <p>{$ subnet.statistics.total_addresses $}</p> | 487 | <p>{$ subnet.statistics.total_addresses $}</p> |
| 586 | @@ -486,7 +490,7 @@ | |||
| 587 | 486 | 490 | ||
| 588 | 487 | <div class="row"> | 491 | <div class="row"> |
| 589 | 488 | <div class="col-2"> | 492 | <div class="col-2"> |
| 591 | 489 | <p><strong>Availability</strong></p> | 493 | <p class="p-form__label is-disabled">Availability</p> |
| 592 | 490 | </div> | 494 | </div> |
| 593 | 491 | <div class="col-4"> | 495 | <div class="col-4"> |
| 594 | 492 | <p>{$ subnet.statistics.num_available $} ({$ subnet.statistics.available_string $})</p> | 496 | <p>{$ subnet.statistics.num_available $} ({$ subnet.statistics.available_string $})</p> |
| 595 | @@ -499,7 +503,7 @@ | |||
| 596 | 499 | <!-- <dt class="u-hide ng-hide">Reserved</dt> | 503 | <!-- <dt class="u-hide ng-hide">Reserved</dt> |
| 597 | 500 | <dd class="u-hide ng-hide">10%</dd> --> | 504 | <dd class="u-hide ng-hide">10%</dd> --> |
| 598 | 501 | <div class="col-2"> | 505 | <div class="col-2"> |
| 600 | 502 | <p><strong>Used</strong></p> | 506 | <p class="p-form__label is-disabled">Used</p> |
| 601 | 503 | </div> | 507 | </div> |
| 602 | 504 | <div class="col-4"> | 508 | <div class="col-4"> |
| 603 | 505 | <p>{$ subnet.statistics.usage_string $}</p> | 509 | <p>{$ subnet.statistics.usage_string $}</p> |
| 604 | diff --git a/src/maasserver/static/partials/vlan-details.html b/src/maasserver/static/partials/vlan-details.html | |||
| 605 | index b363f0f..22d97dd 100644 | |||
| 606 | --- a/src/maasserver/static/partials/vlan-details.html | |||
| 607 | +++ b/src/maasserver/static/partials/vlan-details.html | |||
| 608 | @@ -240,40 +240,40 @@ | |||
| 609 | 240 | <div class="p-form p-form--stacked row" data-ng-if="!vlanDetails.editSummary"> | 240 | <div class="p-form p-form--stacked row" data-ng-if="!vlanDetails.editSummary"> |
| 610 | 241 | <div class="col-6"> | 241 | <div class="col-6"> |
| 611 | 242 | <div class="p-form__group"> | 242 | <div class="p-form__group"> |
| 614 | 243 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 243 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 615 | 244 | <p><strong>VID</strong></p> | 244 | <p>VID</p> |
| 616 | 245 | </div> | 245 | </div> |
| 617 | 246 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 246 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 618 | 247 | <p>{$ vlanDetails.vlan.vid $}</p> | 247 | <p>{$ vlanDetails.vlan.vid $}</p> |
| 619 | 248 | </div> | 248 | </div> |
| 620 | 249 | </div> | 249 | </div> |
| 621 | 250 | <div class="p-form__group"> | 250 | <div class="p-form__group"> |
| 624 | 251 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 251 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 625 | 252 | <p><strong>Name</strong></p> | 252 | <p>Name</p> |
| 626 | 253 | </div> | 253 | </div> |
| 627 | 254 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 254 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 628 | 255 | <p>{$ vlanDetails.vlan.name $}</p> | 255 | <p>{$ vlanDetails.vlan.name $}</p> |
| 629 | 256 | </div> | 256 | </div> |
| 630 | 257 | </div> | 257 | </div> |
| 631 | 258 | <div class="p-form__group"> | 258 | <div class="p-form__group"> |
| 634 | 259 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 259 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 635 | 260 | <p><strong>MTU</strong></p> | 260 | <p>MTU</p> |
| 636 | 261 | </div> | 261 | </div> |
| 637 | 262 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 262 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 638 | 263 | <p>{$ vlanDetails.vlan.mtu $}</p> | 263 | <p>{$ vlanDetails.vlan.mtu $}</p> |
| 639 | 264 | </div> | 264 | </div> |
| 640 | 265 | </div> | 265 | </div> |
| 641 | 266 | <div class="p-form__group"> | 266 | <div class="p-form__group"> |
| 644 | 267 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 267 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 645 | 268 | <p><strong>Space</strong></p> | 268 | <p>Space</p> |
| 646 | 269 | </div> | 269 | </div> |
| 647 | 270 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 270 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 648 | 271 | <p>{$ vlanDetails.getSpaceName() $}</p> | 271 | <p>{$ vlanDetails.getSpaceName() $}</p> |
| 649 | 272 | </div> | 272 | </div> |
| 650 | 273 | </div> | 273 | </div> |
| 651 | 274 | <div class="p-form__group"> | 274 | <div class="p-form__group"> |
| 654 | 275 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 275 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 655 | 276 | <p><strong>Description</strong></p> | 276 | <p>Description</p> |
| 656 | 277 | </div> | 277 | </div> |
| 657 | 278 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 278 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 658 | 279 | <p>{$ vlanDetails.vlan.description $}</p> | 279 | <p>{$ vlanDetails.vlan.description $}</p> |
| 659 | @@ -282,16 +282,16 @@ | |||
| 660 | 282 | </div> | 282 | </div> |
| 661 | 283 | <div class="col-6"> | 283 | <div class="col-6"> |
| 662 | 284 | <div class="p-form__group"> | 284 | <div class="p-form__group"> |
| 665 | 285 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 285 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 666 | 286 | <p><strong>Fabric</strong></p> | 286 | <p>Fabric</p> |
| 667 | 287 | </div> | 287 | </div> |
| 668 | 288 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 288 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 669 | 289 | <p><a href="#/fabric/{$ vlanDetails.fabric.id $}">{$ vlanDetails.fabric.name $}</a></p> | 289 | <p><a href="#/fabric/{$ vlanDetails.fabric.id $}">{$ vlanDetails.fabric.name $}</a></p> |
| 670 | 290 | </div> | 290 | </div> |
| 671 | 291 | </div> | 291 | </div> |
| 672 | 292 | <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers"> | 292 | <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers"> |
| 675 | 293 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 293 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 676 | 294 | <p><strong>Rack controllers</strong> | 294 | <p>Rack controllers |
| 677 | 295 | <span class="p-tooltip p-tooltip--top-center"> | 295 | <span class="p-tooltip p-tooltip--top-center"> |
| 678 | 296 | <i class="p-icon--information">Help:</i> | 296 | <i class="p-icon--information">Help:</i> |
| 679 | 297 | <span class="p-tooltip__message" role="tooltip">A rack controller controls hosts and images and runs network services
like DHCP for connected VLANs.</span> | 297 | <span class="p-tooltip__message" role="tooltip">A rack controller controls hosts and images and runs network services
like DHCP for connected VLANs.</span> |
| 680 | @@ -299,7 +299,7 @@ | |||
| 681 | 299 | </div> | 299 | </div> |
| 682 | 300 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 300 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 683 | 301 | <span data-ng-repeat="rack in vlanDetails.relatedControllers"> | 301 | <span data-ng-repeat="rack in vlanDetails.relatedControllers"> |
| 685 | 302 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>, | 302 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a><span ng-show="!$last">,</span> |
| 686 | 303 | </span> | 303 | </span> |
| 687 | 304 | </div> | 304 | </div> |
| 688 | 305 | </div> | 305 | </div> |
| 689 | @@ -326,17 +326,19 @@ | |||
| 690 | 326 | <maas-obj-field type="options" key="fabric" label="Fabric" | 326 | <maas-obj-field type="options" key="fabric" label="Fabric" |
| 691 | 327 | options="fabric.id as fabric.name for fabric in vlanDetails.fabrics" label-width="2" label-width-tablet="2" input-width="3" input-width-tablet="4"></maas-obj-field> | 327 | options="fabric.id as fabric.name for fabric in vlanDetails.fabrics" label-width="2" label-width-tablet="2" input-width="3" input-width-tablet="4"></maas-obj-field> |
| 692 | 328 | <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers"> | 328 | <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers"> |
| 695 | 329 | <div class="p-form__label col-2 mobile-col-2 tablet-col-2"> | 329 | <div class="p-form__label is-disabled col-2 mobile-col-2 tablet-col-2"> |
| 696 | 330 | <p><strong>Rack controllers</strong> | 330 | <p>Rack controllers |
| 697 | 331 | <span class="p-tooltip p-tooltip--top-center"> | 331 | <span class="p-tooltip p-tooltip--top-center"> |
| 698 | 332 | <i class="p-icon--information">Help:</i> | 332 | <i class="p-icon--information">Help:</i> |
| 699 | 333 | <span class="p-tooltip__message" role="tooltip">A rack controller controls hosts and images and runs network services
like DHCP for connected VLANs.</span> | 333 | <span class="p-tooltip__message" role="tooltip">A rack controller controls hosts and images and runs network services
like DHCP for connected VLANs.</span> |
| 700 | 334 | </span></p> | 334 | </span></p> |
| 701 | 335 | </div> | 335 | </div> |
| 702 | 336 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> | 336 | <div class="p-form__control col-3 mobile-col-2 tablet-col-3"> |
| 706 | 337 | <span data-ng-repeat="rack in vlanDetails.relatedControllers"> | 337 | <p> |
| 707 | 338 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a>, | 338 | <span data-ng-repeat="rack in vlanDetails.relatedControllers"> |
| 708 | 339 | </span> | 339 | <a href="#/controller/{$ rack.system_id $}">{$ rack.hostname $}</a><span ng-show="!$last">,</span> |
| 709 | 340 | </span> | ||
| 710 | 341 | </p> | ||
| 711 | 340 | </div> | 342 | </div> |
| 712 | 341 | </div> | 343 | </div> |
| 713 | 342 | </div> | 344 | </div> |
| 714 | @@ -365,8 +367,8 @@ | |||
| 715 | 365 | <div class="p-form p-form--stacked row"> | 367 | <div class="p-form p-form--stacked row"> |
| 716 | 366 | <div class="col-8"> | 368 | <div class="col-8"> |
| 717 | 367 | <div class="p-form__group"> | 369 | <div class="p-form__group"> |
| 720 | 368 | <div class="p-form__label"> | 370 | <div class="p-form__label is-disabled"> |
| 721 | 369 | <p><strong>Status</strong></p> | 371 | <p>Status</p> |
| 722 | 370 | </div> | 372 | </div> |
| 723 | 371 | <div class="p-form__control"> | 373 | <div class="p-form__control"> |
| 724 | 372 | <p>{$ vlanDetails.getDHCPStatus() $}</p> | 374 | <p>{$ vlanDetails.getDHCPStatus() $}</p> |
| 725 | @@ -374,8 +376,8 @@ | |||
| 726 | 374 | </div> | 376 | </div> |
| 727 | 375 | 377 | ||
| 728 | 376 | <div class="p-form__group" data-ng-if="vlanDetails.vlan.external_dhcp"> | 378 | <div class="p-form__group" data-ng-if="vlanDetails.vlan.external_dhcp"> |
| 731 | 377 | <div class="p-form__label"> | 379 | <div class="p-form__label is-disabled"> |
| 732 | 378 | <p><strong>External DHCP</strong></p> | 380 | <p>External DHCP</p> |
| 733 | 379 | </div> | 381 | </div> |
| 734 | 380 | <div class="p-form__control"> | 382 | <div class="p-form__control"> |
| 735 | 381 | <p> | 383 | <p> |
| 736 | @@ -388,9 +390,9 @@ | |||
| 737 | 388 | </div> | 390 | </div> |
| 738 | 389 | </div> | 391 | </div> |
| 739 | 390 | <div class="p-form__group" data-ng-if="vlanDetails.primaryRack"> | 392 | <div class="p-form__group" data-ng-if="vlanDetails.primaryRack"> |
| 741 | 391 | <div class="p-form__label"> | 393 | <div class="p-form__label is-disabled"> |
| 742 | 392 | <p> | 394 | <p> |
| 744 | 393 | <strong>Primary controller</strong> | 395 | Primary controller |
| 745 | 394 | <span class="p-tooltip p-tooltip--top-center"> | 396 | <span class="p-tooltip p-tooltip--top-center"> |
| 746 | 395 | <i class="p-icon--help">Help:</i> | 397 | <i class="p-icon--help">Help:</i> |
| 747 | 396 | <span class="p-tooltip__message" role="tooltip">The rack controller where DHCP service runs on.</span> | 398 | <span class="p-tooltip__message" role="tooltip">The rack controller where DHCP service runs on.</span> |
| 748 | @@ -402,9 +404,9 @@ | |||
| 749 | 402 | </div> | 404 | </div> |
| 750 | 403 | </div> | 405 | </div> |
| 751 | 404 | <div class="p-form__group" data-ng-if="vlanDetails.secondaryRack"> | 406 | <div class="p-form__group" data-ng-if="vlanDetails.secondaryRack"> |
| 753 | 405 | <div class="p-form__label"> | 407 | <div class="p-form__label is-disabled"> |
| 754 | 406 | <p> | 408 | <p> |
| 756 | 407 | <strong>Secondary controller</strong> | 409 | Secondary controller |
| 757 | 408 | <span class="p-tooltip p-tooltip--top-center"> | 410 | <span class="p-tooltip p-tooltip--top-center"> |
| 758 | 409 | <i class="p-icon--help">Help:</i> | 411 | <i class="p-icon--help">Help:</i> |
| 759 | 410 | <span class="p-tooltip__message" role="tooltip">The rack controller that will take over DHCP services if the primary fails.</span> | 412 | <span class="p-tooltip__message" role="tooltip">The rack controller that will take over DHCP services if the primary fails.</span> |
| 760 | diff --git a/src/maasserver/static/partials/zone-details.html b/src/maasserver/static/partials/zone-details.html | |||
| 761 | index 2a81b5e..cb5d7e7 100644 | |||
| 762 | --- a/src/maasserver/static/partials/zone-details.html | |||
| 763 | +++ b/src/maasserver/static/partials/zone-details.html | |||
| 764 | @@ -70,25 +70,19 @@ | |||
| 765 | 70 | <div class="row form p-form--stacked" data-ng-if="editSummary != true"> | 70 | <div class="row form p-form--stacked" data-ng-if="editSummary != true"> |
| 766 | 71 | <div class="col-6"> | 71 | <div class="col-6"> |
| 767 | 72 | <div class="p-form__group"> | 72 | <div class="p-form__group"> |
| 771 | 73 | <div class="p-form__label"> | 73 | <p class="p-form__label is-disabled">Name</p> |
| 769 | 74 | <p><strong>Name</strong></p> | ||
| 770 | 75 | </div> | ||
| 772 | 76 | <div class="p-form__control"> | 74 | <div class="p-form__control"> |
| 773 | 77 | <p>{$ zone.name $}</p> | 75 | <p>{$ zone.name $}</p> |
| 774 | 78 | </div> | 76 | </div> |
| 775 | 79 | </div> | 77 | </div> |
| 776 | 80 | <div class="p-form__group"> | 78 | <div class="p-form__group"> |
| 780 | 81 | <div class="p-form__label"> | 79 | <p class="p-form__label is-disabled">Description</p> |
| 778 | 82 | <p><strong>Description</strong></p> | ||
| 779 | 83 | </div> | ||
| 781 | 84 | <div class="p-form__control"> | 80 | <div class="p-form__control"> |
| 782 | 85 | <p>{$ zone.description $}</p> | 81 | <p>{$ zone.description $}</p> |
| 783 | 86 | </div> | 82 | </div> |
| 784 | 87 | </div> | 83 | </div> |
| 785 | 88 | <div class="p-form__group"> | 84 | <div class="p-form__group"> |
| 789 | 89 | <div class="p-form__label"> | 85 | <p class="p-form__label is-disabled">Machines</p> |
| 787 | 90 | <p><strong>Machines</strong></p> | ||
| 788 | 91 | </div> | ||
| 790 | 92 | <div class="p-form__control"> | 86 | <div class="p-form__control"> |
| 791 | 93 | <p>{$ zone.machines_count $}</p> | 87 | <p>{$ zone.machines_count $}</p> |
| 792 | 94 | </div> | 88 | </div> |
| 793 | @@ -103,12 +97,12 @@ | |||
| 794 | 103 | label-width="2" input-width="4" blur-on-enter="true"></maas-obj-field> | 97 | label-width="2" input-width="4" blur-on-enter="true"></maas-obj-field> |
| 795 | 104 | <maas-obj-field type="textarea" key="description" label="Description" placeholder="Zone description" | 98 | <maas-obj-field type="textarea" key="description" label="Description" placeholder="Zone description" |
| 796 | 105 | label-width="2" input-width="4" blur-on-enter="true"></maas-obj-field> | 99 | label-width="2" input-width="4" blur-on-enter="true"></maas-obj-field> |
| 800 | 106 | <dl> | 100 | <div class="p-form__group"> |
| 801 | 107 | <dt class="col-2">Machines</dt> | 101 | <p class="p-form__label is-disabled">Machines</p> |
| 802 | 108 | <dd class="col-4"> | 102 | <div class="p-form__control"> |
| 803 | 109 | <a href="#/machines&query=zone:({$ zone.name $})">{$ zone.machines_count $}</a> | 103 | <a href="#/machines&query=zone:({$ zone.name $})">{$ zone.machines_count $}</a> |
| 806 | 110 | </dd> | 104 | </div> |
| 807 | 111 | </dl> | 105 | </div> |
| 808 | 112 | </div> | 106 | </div> |
| 809 | 113 | </div> | 107 | </div> |
| 810 | 114 | <div class="row"> | 108 | <div class="row"> |
| 811 | diff --git a/src/maasserver/static/scss/_patterns_forms.scss b/src/maasserver/static/scss/_patterns_forms.scss | |||
| 812 | index 812e66f..276b6d8 100644 | |||
| 813 | --- a/src/maasserver/static/scss/_patterns_forms.scss | |||
| 814 | +++ b/src/maasserver/static/scss/_patterns_forms.scss | |||
| 815 | @@ -14,6 +14,20 @@ | |||
| 816 | 14 | padding-right: $sp-x-large; | 14 | padding-right: $sp-x-large; |
| 817 | 15 | } | 15 | } |
| 818 | 16 | } | 16 | } |
| 819 | 17 | |||
| 820 | 18 | .p-form__label { | ||
| 821 | 19 | color: $color-dark; | ||
| 822 | 20 | |||
| 823 | 21 | &.is-disabled { | ||
| 824 | 22 | color: $color-mid-dark; | ||
| 825 | 23 | } | ||
| 826 | 24 | } | ||
| 827 | 25 | |||
| 828 | 26 | maas-obj-form[disabled="disabled"] { | ||
| 829 | 27 | .p-form__label { | ||
| 830 | 28 | color: $color-mid-dark; | ||
| 831 | 29 | } | ||
| 832 | 30 | } | ||
| 833 | 17 | } | 31 | } |
| 834 | 18 | 32 | ||
| 835 | 19 | @mixin maas-p-form-stacked { | 33 | @mixin maas-p-form-stacked { |
| 836 | diff --git a/src/maasserver/templates/maasserver/user_view.html b/src/maasserver/templates/maasserver/user_view.html | |||
| 837 | index 5028a4e..1d6cf98 100644 | |||
| 838 | --- a/src/maasserver/templates/maasserver/user_view.html | |||
| 839 | +++ b/src/maasserver/templates/maasserver/user_view.html | |||
| 840 | @@ -11,19 +11,19 @@ | |||
| 841 | 11 | <div class="row"> | 11 | <div class="row"> |
| 842 | 12 | <div class="col-6"> | 12 | <div class="col-6"> |
| 843 | 13 | <div class="p-form__group"> | 13 | <div class="p-form__group"> |
| 845 | 14 | <p class="p-form__label col-2 tablet-col-2"><strong>Username</strong></p> | 14 | <p class="p-form__label col-2 tablet-col-2">Username</p> |
| 846 | 15 | <div class="p-form__control col-4 tablet-col-3"> | 15 | <div class="p-form__control col-4 tablet-col-3"> |
| 847 | 16 | <p>{{ view_user.username }}</p> | 16 | <p>{{ view_user.username }}</p> |
| 848 | 17 | </div> | 17 | </div> |
| 849 | 18 | </div> | 18 | </div> |
| 850 | 19 | <div class="p-form__group"> | 19 | <div class="p-form__group"> |
| 852 | 20 | <p class="p-form__label col-2 tablet-col-2"><strong>Full name</strong></p> | 20 | <p class="p-form__label col-2 tablet-col-2">Full name</p> |
| 853 | 21 | <div class="p-form__control col-4 tablet-col-3"> | 21 | <div class="p-form__control col-4 tablet-col-3"> |
| 854 | 22 | <p>{{ view_user.last_name }}</p> | 22 | <p>{{ view_user.last_name }}</p> |
| 855 | 23 | </div> | 23 | </div> |
| 856 | 24 | </div> | 24 | </div> |
| 857 | 25 | <div class="p-form__group"> | 25 | <div class="p-form__group"> |
| 859 | 26 | <p class="p-form__label col-2 tablet-col-2"><strong>Email address</strong></p> | 26 | <p class="p-form__label col-2 tablet-col-2">Email address</p> |
| 860 | 27 | <div class="p-form__control col-4 tablet-col-3"> | 27 | <div class="p-form__control col-4 tablet-col-3"> |
| 861 | 28 | <p>{{ view_user.email }}</p> | 28 | <p>{{ view_user.email }}</p> |
| 862 | 29 | </div> | 29 | </div> |
| 863 | @@ -31,14 +31,14 @@ | |||
| 864 | 31 | </div> | 31 | </div> |
| 865 | 32 | <div class="col-6"> | 32 | <div class="col-6"> |
| 866 | 33 | <div class="p-form__group"> | 33 | <div class="p-form__group"> |
| 868 | 34 | <p class="p-form__label col-2 tablet-col-2"><strong>MAAS Keys</strong></p> | 34 | <p class="p-form__label col-2 tablet-col-2">MAAS Keys</p> |
| 869 | 35 | <div class="p-form__control col-4 tablet-col-3"> | 35 | <div class="p-form__control col-4 tablet-col-3"> |
| 870 | 36 | <p>{{ user.userprofile.get_authorisation_tokens.count }} | 36 | <p>{{ user.userprofile.get_authorisation_tokens.count }} |
| 871 | 37 | key{{ user.userprofile.get_authorisation_tokens.count|pluralize }}</p> | 37 | key{{ user.userprofile.get_authorisation_tokens.count|pluralize }}</p> |
| 872 | 38 | </div> | 38 | </div> |
| 873 | 39 | </div> | 39 | </div> |
| 874 | 40 | <div class="p-form__group"> | 40 | <div class="p-form__group"> |
| 876 | 41 | <p class="p-form__label col-2 tablet-col-2"><strong>MAAS Administrator</strong></p> | 41 | <p class="p-form__label col-2 tablet-col-2">MAAS Administrator</p> |
| 877 | 42 | <div class="p-form__control col-4 tablet-col-3"> | 42 | <div class="p-form__control col-4 tablet-col-3"> |
| 878 | 43 | <p>{{ view_user.is_superuser }}</p> | 43 | <p>{{ view_user.is_superuser }}</p> |
| 879 | 44 | </div> | 44 | </div> |
UNIT TESTS
-b form-improves-
STATUS: FAILED
LOG: http://
COMMIT: fa36611341fb5b5