MAAS

Merge ~ya-bo-ng/maas:align-node-header-actions into maas:master

  1. Git
  2. lp:~ya-bo-ng/maas
  3. align-node-header-actions
  4. Merge into master
Proposed by Anthony Dillon
Status: Merged
Approved by: Karl Williams
Approved revision: aee573471de15584b4f40560b56736cd2c54a5e0
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:align-node-header-actions
Merge into: maas:master
Diff against target: 99 lines (+29/-29)
1 file modified
src/maasserver/static/partials/node-details.html (+29/-29)
Reviewer Review Type Date Requested Status
Karl Williams (community) Approve
MAAS Lander Approve
MAAS Maintainers Pending
Review via email: mp+347351@code.launchpad.net

Commit message

LP: #1681783 - Align the message and buttons in the machine header

To post a comment you must log in.
~ya-bo-ng/maas:align-node-header-actions updated
aee5734... by Anthony Dillon

Convert notifications to iconed message

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

Aligned the action button on the right of the message. Also, converted from a notification to a message with an icon.

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b align-node-header-actions lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 9b5c895bfc0e771fc948fd56fb0b9e95e87a2656

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b align-node-header-actions lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: aee573471de15584b4f40560b56736cd2c54a5e0

review: Approve
Revision history for this message
Karl Williams (deadlight) wrote :

Looks 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/node-details.html b/src/maasserver/static/partials/node-details.html
index 97ba740..69f4fb9 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -172,65 +172,65 @@
172 </form>172 </form>
173 </div>173 </div>
174 </div>174 </div>
175 <div class="row ng-hide" data-ng-show="action.showing_confirmation && action.option.name === 'test'">175 <div class="row u-equal-height ng-hide" data-ng-show="action.showing_confirmation && action.option.name === 'test'">
176 <div class="col-12">176 <div class="col-9 u-vertically-center">
177 <p>177 <p class="u-remove-max-width">
178 <i class="p-icon--warning">Warning:</i> Node is currently deployed. Are you sure you want to continue to test hardware?178 <i class="p-icon--warning">Warning:</i> Node is currently deployed. Are you sure you want to continue to test hardware?
179 </p>179 </p>
180 </div>
181 <div class="col-3">
180 <div class="u-align--right">182 <div class="u-align--right">
181 <button class="p-button--base" data-ng-click="actionCancel()">No</button>183 <button class="p-button--base" data-ng-click="actionCancel()">No</button>
182 <button class="p-button--neutral" data-ng-click="actionGo()">Yes</button>184 <button class="p-button--neutral" data-ng-click="actionGo()">Yes</button>
183 </div>185 </div>
184 </div>186 </div>
185 </div>187 </div>
186 <div class="row ng-hide" data-ng-show="isActionError()">188 <div class="row u-equal-height ng-hide" data-ng-show="isActionError()">
187 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->189 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
188 <div class="col-12">190 <div class="col-9 u-vertically-center">
189 <div class="p-notification--negative">191 <p class="u-remove-max-width">
190 <p class="p-notification__response">192 <i class="p-icon--error">Error:</i> Node failed to be {$ action.option.sentence $}, because of the following error: {$ action.error $}
191 <span class="p-notification__status">Error:</span>Node failed to be {$ action.option.sentence $}, because of the following error: {$ action.error $}193 </p>
192 </p>194 </div>
193 </div>195 <div class="col-3">
194 <div class="u-align--right">196 <div class="u-align--right">
195 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>197 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
196 <button class="p-button--neutral" data-ng-click="actionGo()">Retry</button>198 <button class="p-button--neutral" data-ng-click="actionGo()">Retry</button>
197 </div>199 </div>
198 </div>200 </div>
199 </div>201 </div>
200 <div class="row ng-hide" data-ng-show="isDeployError()">202 <div class="row u-equal-height ng-hide" data-ng-show="isDeployError()">
201 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->203 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
202 <div class="col-8">204 <div class="col-9 u-vertically-center">
203 <div class="p-notification--negative">205 <p class="u-remove-max-width">
204 <p class="p-notification__response">206 <i class="p-icon--error">Error:</i> Node cannot be {$ action.option.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="images/">images page</a>.
205 <span class="p-notification__status">Error:</span> Node cannot be {$ action.option.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="images/">images page</a>.207 </p>
206 </p>
207 </div>
208 </div>208 </div>
209 <div class="col-4">209 <div class="col-3">
210 <div class="u-align--right">210 <div class="u-align--right">
211 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>211 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
212 </div>212 </div>
213 </div>213 </div>
214 </div>214 </div>
215 <div class="row ng-hide" data-ng-show="hasActionPowerError(action.option.name)">215 <div class="row u-equal-height ng-hide" data-ng-show="hasActionPowerError(action.option.name)">
216 <div class="col-8">216 <div class="col-9 u-vertically-center">
217 <div class="p-notification--negative">217 <p class="u-remove-max-width">
218 <p class="p-notification__response">218 <i class="p-icon--error">Error:</i> Node cannot be {$ action.option.sentence $}, because power control software for the node is missing from its rack controller. To proceed, install the {$ getPowerErrors() $} on the rack controller.
219 <span class="p-notification__status">Error:</span> Node cannot be {$ action.option.sentence $}, because power control software for the node is missing from its rack controller. To proceed, install the {$ getPowerErrors() $} on the rack controller.219 </p>
220 </p>
221 </div>
222 </div>220 </div>
223 <div class="col-4">221 <div class="col-3">
224 <div class="u-align--right">222 <div class="u-align--right">
225 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>223 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
226 </div>224 </div>
227 </div>225 </div>
228 </div>226 </div>
229 <div class="row ng-hide" data-ng-show="!isDeployError() && isSSHKeyError()">227 <div class="row u-equal-height ng-hide" data-ng-show="!isDeployError() && isSSHKeyError()">
230 <div class="col-12">228 <div class="col-9 u-vertically-center">
231 <p>229 <p class="u-remove-max-width">
232 <i class="p-icon--error">Error:</i> Node cannot be {$ action.option.sentence $}, because an SSH key has not been added to your account. To add an SSH key, visit <a href="account/prefs/">your account page</a>.230 <i class="p-icon--error">Error:</i> Node cannot be {$ action.option.sentence $}, because an SSH key has not been added to your account. To add an SSH key, visit <a href="account/prefs/">your account page</a>.
233 </p>231 </p>
232 </div>
233 <div class="col-3">
234 <div class="u-align--right">234 <div class="u-align--right">
235 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>235 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
236 </div>236 </div>

Subscribers

People subscribed via source and target branches