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
diff --git a/src/maasserver/static/partials/intro-user.html b/src/maasserver/static/partials/intro-user.html
index 3e0384e..6110b93 100644
--- a/src/maasserver/static/partials/intro-user.html
+++ b/src/maasserver/static/partials/intro-user.html
@@ -13,7 +13,7 @@
13 </div>13 </div>
14 </div>14 </div>
15 <div class="row">15 <div class="row">
16 <div class="p-card--highlighted col-6" data-ng-if="isSuperUser()" data-ng-class="{'u-muted': !canContinue()}">16 <div class="p-card--highlighted col-12" data-ng-if="isSuperUser()" data-ng-class="{'u-muted': !canContinue()}">
17 <h2 class="p-card__title">17 <h2 class="p-card__title">
18 MAAS has been successfully set up18 MAAS has been successfully set up
19 </h2>19 </h2>
diff --git a/src/maasserver/static/partials/intro.html b/src/maasserver/static/partials/intro.html
index 8a9b323..0729252 100644
--- a/src/maasserver/static/partials/intro.html
+++ b/src/maasserver/static/partials/intro.html
@@ -1,6 +1,6 @@
1<section class="p-strip" data-ng-if="!loading">1<section class="p-strip" data-ng-if="!loading">
2 <div class="row">2 <div class="row">
3 <div class="col-10">3 <div class="col-12">
4 <div class="p-card--highlighted">4 <div class="p-card--highlighted">
5 <h2 class="p-card__title">5 <h2 class="p-card__title">
6 <i data-ng-class="{ 'p-icon--success': !welcomeInError(), 'p-icon--error': welcomeInError() }"></i>6 <i data-ng-class="{ 'p-icon--success': !welcomeInError(), 'p-icon--error': welcomeInError() }"></i>
@@ -19,7 +19,7 @@
19 </div>19 </div>
20 </div>20 </div>
21 <div class="row">21 <div class="row">
22 <div class="col-10">22 <div class="col-12">
23 <div class="p-card--highlighted">23 <div class="p-card--highlighted">
24 <h2 class="p-card__title u-vertically-center">24 <h2 class="p-card__title u-vertically-center">
25 <i data-ng-class="{ 'p-icon--success': !networkInError(), 'p-icon--error': networkInError() }"></i>&nbsp;Connectivity25 <i data-ng-class="{ 'p-icon--success': !networkInError(), 'p-icon--error': networkInError() }"></i>&nbsp;Connectivity
@@ -61,7 +61,7 @@
61 <maas-boot-images design="'card'"></maas-boot-images>61 <maas-boot-images design="'card'"></maas-boot-images>
62 </div>62 </div>
63 <div class="row">63 <div class="row">
64 <div class="col-10">64 <div class="col-12">
65 <button class="p-button--positive" data-ng-disabled="!canContinue()" data-ng-click="clickContinue()">Continue</button>65 <button class="p-button--positive" data-ng-disabled="!canContinue()" data-ng-click="clickContinue()">Continue</button>
66 </div>66 </div>
67 </div>67 </div>
diff --git a/src/maasserver/static/partials/ssh-keys.html b/src/maasserver/static/partials/ssh-keys.html
index 910bdfb..b3dfd96 100644
--- a/src/maasserver/static/partials/ssh-keys.html
+++ b/src/maasserver/static/partials/ssh-keys.html
@@ -1,6 +1,6 @@
1<div class="row">1<div class="row">
2 <div class="col-12">2 <div class="col-12">
3 <table class="p-table-expanding">3 <table class="p-table-expanding" data-ng-if="groupedKeys.length">
4 <thead>4 <thead>
5 <tr>5 <tr>
6 <th class="col-4">Source</th>6 <th class="col-4">Source</th>

Subscribers

People subscribed via source and target branches