MAAS

Merge ~andreserl/maas:2.2_backport_f692d5f into maas:2.2

  1. Git
  2. lp:~andreserl/maas
  3. 2.2_backport_f692d5f
  4. Merge into 2.2
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 956ce708cdf0dc19dcc951d228b87d7af8ae7832
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:2.2_backport_f692d5f
Merge into: maas:2.2
Diff against target: 17 lines (+2/-2)
1 file modified
src/maasserver/static/partials/dashboard.html (+2/-2)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+326530@code.launchpad.net

Commit message

Backport f692d5f - LP: #1669744, #1680795 : Always show toggle and make sure tooltip is in between label and toggle.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b 2.2_backport_f692d5f lp:~andreserl/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED MERGE
LOG: http://ci.maas.io/job/maas/branch-lander/5559/console

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

LANDING
-b 2.2_backport_f692d5f lp:~andreserl/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED MERGE
LOG: http://ci.maas.io/job/maas/branch-lander/5559/console

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

LANDING
-b 2.2_backport_f692d5f lp:~andreserl/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://ci.maas.io/job/maas/branch-tester/30/console

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/dashboard.html b/src/maasserver/static/partials/dashboard.html
2index 6ed2abc..bbae03c 100644
3--- a/src/maasserver/static/partials/dashboard.html
4+++ b/src/maasserver/static/partials/dashboard.html
5@@ -2,10 +2,10 @@
6 <div class="wrapper--inner">
7 <h1 class="page-header__title">Device discovery</h1>
8 <p class="page-header__status">{$ discoveredDevices.length $} items discovered <span class="u-text--loading" data-ng-if="!loaded"><i class="icon icon--loading u-animation--spin"></i> Loading...</span></p>
9- <div class="page-header__controls" data-ng-if="networkDiscovery">
10+ <div class="page-header__controls">
11 <maas-obj-form obj="networkDiscovery" manager="configManager" inline="true">
12 <maas-obj-field type="onoffswitch" key="value" label="Discovery enabled"
13- on-value="enabled" off-value="disabled" subtle="true" label-left="true"
14+ on-value="enabled" off-value="disabled" subtle="true"
15 label-info="When enabled, MAAS will use passive techniques, such as listening to&#xa; ARP requests and DNS advertisements, to observe networks attached&#xa; to rack controllers. Active subnet mapping can also be enabled in the&#xa; Device Discovery section of the Settings page."></maas-obj-field>
16 </maas-obj-form>
17 </div>

Subscribers

People subscribed via source and target branches