Merge ~ya-bo-ng/maas:fix-up-FUJ into maas:master

Proposed by Anthony Dillon
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 379d3aa6c5b1d953414c27accd2c82c4601804e3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:fix-up-FUJ
Merge into: maas:master
Diff against target: 55 lines (+5/-5)
3 files modified
src/maasserver/static/partials/intro-user.html (+1/-1)
src/maasserver/static/partials/intro.html (+3/-3)
src/maasserver/static/partials/ssh-keys.html (+1/-1)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+338595@code.launchpad.net

Commit message

LP: #1749871 - Fix the layout of the first user journey

Description of the change

## Done
- Made all the boxes/tables in the FUJ the same width
- Added a conditional to only display the keys table if there are keys

## QA
- Create a new user
- Login using a different or private window
- Check that the shh keys table is not visible but becomes visible when you add keys
- See that all the boxes are full width

Fixes https://bugs.launchpad.net/maas/+bug/1749871

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/intro-user.html b/src/maasserver/static/partials/intro-user.html
2index 3e0384e..6110b93 100644
3--- a/src/maasserver/static/partials/intro-user.html
4+++ b/src/maasserver/static/partials/intro-user.html
5@@ -13,7 +13,7 @@
6 </div>
7 </div>
8 <div class="row">
9- <div class="p-card--highlighted col-6" data-ng-if="isSuperUser()" data-ng-class="{'u-muted': !canContinue()}">
10+ <div class="p-card--highlighted col-12" data-ng-if="isSuperUser()" data-ng-class="{'u-muted': !canContinue()}">
11 <h2 class="p-card__title">
12 MAAS has been successfully set up
13 </h2>
14diff --git a/src/maasserver/static/partials/intro.html b/src/maasserver/static/partials/intro.html
15index 8a9b323..0729252 100644
16--- a/src/maasserver/static/partials/intro.html
17+++ b/src/maasserver/static/partials/intro.html
18@@ -1,6 +1,6 @@
19 <section class="p-strip" data-ng-if="!loading">
20 <div class="row">
21- <div class="col-10">
22+ <div class="col-12">
23 <div class="p-card--highlighted">
24 <h2 class="p-card__title">
25 <i data-ng-class="{ 'p-icon--success': !welcomeInError(), 'p-icon--error': welcomeInError() }"></i>
26@@ -19,7 +19,7 @@
27 </div>
28 </div>
29 <div class="row">
30- <div class="col-10">
31+ <div class="col-12">
32 <div class="p-card--highlighted">
33 <h2 class="p-card__title u-vertically-center">
34 <i data-ng-class="{ 'p-icon--success': !networkInError(), 'p-icon--error': networkInError() }"></i>&nbsp;Connectivity
35@@ -61,7 +61,7 @@
36 <maas-boot-images design="'card'"></maas-boot-images>
37 </div>
38 <div class="row">
39- <div class="col-10">
40+ <div class="col-12">
41 <button class="p-button--positive" data-ng-disabled="!canContinue()" data-ng-click="clickContinue()">Continue</button>
42 </div>
43 </div>
44diff --git a/src/maasserver/static/partials/ssh-keys.html b/src/maasserver/static/partials/ssh-keys.html
45index 910bdfb..b3dfd96 100644
46--- a/src/maasserver/static/partials/ssh-keys.html
47+++ b/src/maasserver/static/partials/ssh-keys.html
48@@ -1,6 +1,6 @@
49 <div class="row">
50 <div class="col-12">
51- <table class="p-table-expanding">
52+ <table class="p-table-expanding" data-ng-if="groupedKeys.length">
53 <thead>
54 <tr>
55 <th class="col-4">Source</th>

Subscribers

People subscribed via source and target branches