Merge ~andreserl/maas:zones_tab_remove_subtitle into maas:master

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 53668415103d5f94e255ce9510f0f2c1ee0415e8
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:zones_tab_remove_subtitle
Merge into: maas:master
Diff against target: 37 lines (+7/-12)
1 file modified
src/maasserver/static/partials/zones-list.html (+7/-12)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+342441@code.launchpad.net

Commit message

Remove the subtitle as it is redundant and doesn't match patterns.

Also properly add the loading text on the top header, as all other pages, and move the tooltip to the top header.

To post a comment you must log in.
3fab351... by Andres Rodriguez

Correctly add the loading text

e37b0e0... by Andres Rodriguez

Update tooltip

5366841... by Andres Rodriguez

Remove unnecessary whitespaces

Revision history for this message
Andres Rodriguez (andreserl) wrote :

Selfie, as this is fairly straightforward.

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/zones-list.html b/src/maasserver/static/partials/zones-list.html
2index 446136b..997e36d 100755
3--- a/src/maasserver/static/partials/zones-list.html
4+++ b/src/maasserver/static/partials/zones-list.html
5@@ -2,6 +2,13 @@
6 <div class="row">
7 <div class="col-8">
8 <h1 class="page-header__title">Availability zones</h1>
9+ <span class="page-header__status p-tooltip p-tooltip--btm-left">
10+ <i class="p-icon--help">Help:</i>
11+ <span class="p-tooltip__message" role="tooltip">A representation of a grouping of nodes, typically by physical location.</span>
12+ </span>
13+ <p class="page-header__status" data-ng-show="loading">
14+ <i class="p-icon--spinner u-animation--spin"></i> Loading...
15+ </p>
16 <p class="page-header__status" data-ng-show="!loading"><ng-pluralize data-ng-hide="loading" count="zones.length"
17 when="{'one': '{$ zones.length $} AZ available', 'other': '{$ zones.length $} AZs available '}"></ng-pluralize></p>
18 </div>
19@@ -34,18 +41,6 @@
20 </header>
21 <section class="p-strip">
22 <div class="row">
23- <div class="col-12 ng-hide u-equal-height" data-ng-show="!loading">
24- <h2 class="u-float--left">Availability zones</h2>&nbsp;&nbsp;
25-
26- <span class="u-vertically-center u-no-margin--top">
27- <span class="p-tooltip p-tooltip--btm-left">
28- <i class="p-icon--help u-hide u-show--large u-no-margin--right">Help:</i>
29- <span class="p-tooltip__message" role="tooltip">A representation of a grouping of nodes, typically by physical location.</span>
30- </span>
31- </span>
32- </div>
33- </div>
34- <div class="row">
35 <!-- Spaces grouped table -->
36 <table class="table-listing">
37 <thead>

Subscribers

People subscribed via source and target branches