Merge ~mpontillo/maas:dns-header-cleanup--bug-1727392 into maas:master

Proposed by Mike Pontillo on 2018-04-23
Status: Merged
Approved by: Mike Pontillo on 2018-04-24
Approved revision: 52e64da91b44734caf8c02f62dce5b072942c9f5
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~mpontillo/maas:dns-header-cleanup--bug-1727392
Merge into: maas:master
Diff against target: 28 lines (+8/-5)
1 file modified
src/maasserver/static/partials/domain-details.html (+8/-5)
Reviewer Review Type Date Requested Status
Newell Jensen 2018-04-23 Approve on 2018-04-24
MAAS Lander Needs Fixing on 2018-04-23
Review via email: mp+343860@code.launchpad.net

Commit message

LP: #1727392 - Make domain details page header consistent.

To post a comment you must log in.
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b dns-header-cleanup--bug-1727392 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2575/console
COMMIT: 52e64da91b44734caf8c02f62dce5b072942c9f5

review: Needs Fixing
Newell Jensen (newell-jensen) wrote :

+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/domain-details.html b/src/maasserver/static/partials/domain-details.html
2index 083ee82..039ab74 100644
3--- a/src/maasserver/static/partials/domain-details.html
4+++ b/src/maasserver/static/partials/domain-details.html
5@@ -2,15 +2,18 @@
6 <div class="row">
7 <div class="col-8">
8 <h1 class="page-header__title">
9- {$ domain.displayname $}:
10- <ng-pluralize data-ng-hide="loading" count="domain.hosts"
11- when="{'one': '{$ domain.hosts $} host,', 'other': '{$ domain.hosts $} hosts,'}"></ng-pluralize>
12- <ng-pluralize data-ng-hide="loading" count="domain.resource_count"
13- when="{'one': ' {$ domain.resource_count $} record total', 'other': ' {$ domain.resource_count $} records total'}"></ng-pluralize>
14+ {$ domain.name $}
15 </h1>
16 <p class="page-header__status" data-ng-show="loading">
17 <i class="p-icon--spinner u-animation--spin"></i> Loading...
18 </p>
19+ <p class="page-header__status" data-ng-show="!loading">
20+ <span data-ng-if="isDefaultDomain()">Default domain.</span>
21+ <ng-pluralize data-ng-hide="loading" count="domain.hosts"
22+ when="{'0': '', 'one': '{$ domain.hosts $} host;', 'other': '{$ domain.hosts $} hosts;'}"></ng-pluralize>
23+ <ng-pluralize data-ng-hide="loading" count="domain.resource_count"
24+ when="{'0': 'No resource records', 'one': ' {$ domain.resource_count $} resource record', 'other': ' {$ domain.resource_count $} resource records'}"></ng-pluralize>
25+ </p>
26 </div>
27 <div class="col-4">
28 <div class="page-header__controls ng-hide" data-ng-show="isSuperUser() && !loading">

Subscribers

People subscribed via source and target branches

to all changes: