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
1diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
2index 97ba740..69f4fb9 100755
3--- a/src/maasserver/static/partials/node-details.html
4+++ b/src/maasserver/static/partials/node-details.html
5@@ -172,65 +172,65 @@
6 </form>
7 </div>
8 </div>
9- <div class="row ng-hide" data-ng-show="action.showing_confirmation && action.option.name === 'test'">
10- <div class="col-12">
11- <p>
12+ <div class="row u-equal-height ng-hide" data-ng-show="action.showing_confirmation && action.option.name === 'test'">
13+ <div class="col-9 u-vertically-center">
14+ <p class="u-remove-max-width">
15 <i class="p-icon--warning">Warning:</i> Node is currently deployed. Are you sure you want to continue to test hardware?
16 </p>
17+ </div>
18+ <div class="col-3">
19 <div class="u-align--right">
20 <button class="p-button--base" data-ng-click="actionCancel()">No</button>
21 <button class="p-button--neutral" data-ng-click="actionGo()">Yes</button>
22 </div>
23 </div>
24 </div>
25- <div class="row ng-hide" data-ng-show="isActionError()">
26+ <div class="row u-equal-height ng-hide" data-ng-show="isActionError()">
27 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
28- <div class="col-12">
29- <div class="p-notification--negative">
30- <p class="p-notification__response">
31- <span class="p-notification__status">Error:</span>Node failed to be {$ action.option.sentence $}, because of the following error: {$ action.error $}
32- </p>
33- </div>
34+ <div class="col-9 u-vertically-center">
35+ <p class="u-remove-max-width">
36+ <i class="p-icon--error">Error:</i> Node failed to be {$ action.option.sentence $}, because of the following error: {$ action.error $}
37+ </p>
38+ </div>
39+ <div class="col-3">
40 <div class="u-align--right">
41 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
42 <button class="p-button--neutral" data-ng-click="actionGo()">Retry</button>
43 </div>
44 </div>
45 </div>
46- <div class="row ng-hide" data-ng-show="isDeployError()">
47+ <div class="row u-equal-height ng-hide" data-ng-show="isDeployError()">
48 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
49- <div class="col-8">
50- <div class="p-notification--negative">
51- <p class="p-notification__response">
52- <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>.
53- </p>
54- </div>
55+ <div class="col-9 u-vertically-center">
56+ <p class="u-remove-max-width">
57+ <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>.
58+ </p>
59 </div>
60- <div class="col-4">
61+ <div class="col-3">
62 <div class="u-align--right">
63 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
64 </div>
65 </div>
66 </div>
67- <div class="row ng-hide" data-ng-show="hasActionPowerError(action.option.name)">
68- <div class="col-8">
69- <div class="p-notification--negative">
70- <p class="p-notification__response">
71- <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.
72- </p>
73- </div>
74+ <div class="row u-equal-height ng-hide" data-ng-show="hasActionPowerError(action.option.name)">
75+ <div class="col-9 u-vertically-center">
76+ <p class="u-remove-max-width">
77+ <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.
78+ </p>
79 </div>
80- <div class="col-4">
81+ <div class="col-3">
82 <div class="u-align--right">
83 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
84 </div>
85 </div>
86 </div>
87- <div class="row ng-hide" data-ng-show="!isDeployError() && isSSHKeyError()">
88- <div class="col-12">
89- <p>
90+ <div class="row u-equal-height ng-hide" data-ng-show="!isDeployError() && isSSHKeyError()">
91+ <div class="col-9 u-vertically-center">
92+ <p class="u-remove-max-width">
93 <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>.
94 </p>
95+ </div>
96+ <div class="col-3">
97 <div class="u-align--right">
98 <button class="p-button--base" data-ng-click="actionCancel()">Cancel</button>
99 </div>

Subscribers

People subscribed via source and target branches