Merge ~ya-bo-ng/maas:networking-space-masked into maas:master

Proposed by Anthony Dillon on 2018-12-06
Status: Merged
Approved by: Anthony Dillon on 2018-12-11
Approved revision: 949ed0875c38162bd8f70904963359a792cd2546
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:networking-space-masked
Merge into: maas:master
Diff against target: 184 lines (+51/-34)
4 files modified
src/maasserver/static/partials/pod-details.html (+22/-25)
src/maasserver/static/scss/_base_forms.scss (+7/-0)
src/maasserver/static/scss/_base_tables.scss (+16/-7)
src/maasserver/static/scss/_tables.scss (+6/-2)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) 2018-12-06 Approve on 2018-12-10
MAAS Lander Approve on 2018-12-06
Lilyana Videnova 2018-12-06 Approve on 2018-12-06
Review via email: mp+360167@code.launchpad.net

Commit message

LP: #1806686 - Pods networking configuration: fix "space" selector

Description of the change

Added some select table styling to make them uniform thought-out the application.

Screenshot: https://drive.google.com/file/d/1uiqgMt8rvhmoC2PU2ZqaK_FYCRM-vpHf/view

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

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7febc26496f04d4b6bb237c744f38c57678fc3de

review: Approve
73e1e71... by Anthony Dillon on 2018-12-06

Align the table elements

Martin Storey (cassiocassio) wrote :

Update the tour screenshot when these tweaks are done ? Non-urgent.

16d953a... by Anthony Dillon on 2018-12-06

Revert CSS

MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 73e1e71397f009b53585f9e4b2a63c5482b99124

review: Approve
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 16d953a39f6c4773de7e65b4e4ddc42d538b0af0

review: Approve
f1119e9... by Anthony Dillon on 2018-12-06

Fix small alignment in tables

MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4616/console
COMMIT: f1119e9e6058c8d5152b6470a7b340c7fc150537

review: Needs Fixing
Lilyana Videnova (lilyanavidenova) wrote :

LGTM, thanks Ant! :)

review: Approve
949ed08... by Anthony Dillon on 2018-12-06

Whitespace to kick off the Lander

MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 949ed0875c38162bd8f70904963359a792cd2546

review: Approve
Andres Rodriguez (andreserl) wrote :

lgtm!

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/pod-details.html b/src/maasserver/static/partials/pod-details.html
2index f2fedcc..a9396be 100644
3--- a/src/maasserver/static/partials/pod-details.html
4+++ b/src/maasserver/static/partials/pod-details.html
5@@ -139,7 +139,7 @@
6 </div>
7 </div>
8 </td>
9- <td class="u-vertically-center">
10+ <td class="p-table--action-cell">
11 <div data-ng-if="iface.name !== 'default'">
12 <div data-ng-if="spaces.length == 0">
13 (undefined)
14@@ -155,7 +155,7 @@
15 </select>
16 </div>
17 </td>
18- <td style="overflow: visible">
19+ <td class="p-table--action-cell">
20 <div data-ng-if="iface.name !== 'default'" class="form__group-input">
21 <div class="form__group-input">
22 <div class="p-option-selector" tabindex="0"
23@@ -240,36 +240,32 @@
24 </div>
25 </td>
26 <td>
27- <div data-ng-if="iface.name !== 'default'">
28+ <p class="u-min-margin--bottom" data-ng-if="iface.name !== 'default'">
29 {$ iface.fabric.name $}
30- </div>
31+ </p>
32 </td>
33 <td>
34- <div data-ng-if="iface.name !== 'default'">
35- <div ng-switch on="iface.vlan.vid">
36- <div ng-switch-when="0">untagged</div>
37- <div ng-switch-default>
38- <span>{$ iface.vlan.vid $}</span>
39- <span data-ng-if="iface.vlan.name">({$ iface.vlan.name $})</span>
40- </div>
41- </div>
42- </div>
43+ <p class="u-min-margin--bottom" ng-switch on="iface.vlan.vid" data-ng-if="iface.name !== 'default'">
44+ <span ng-switch-when="0">untagged</span>
45+ <span ng-switch-default>
46+ <span>{$ iface.vlan.vid $}</span>
47+ <span data-ng-if="iface.vlan.name">({$ iface.vlan.name $})</span>
48+ </span>
49+ </p>
50 </td>
51- <td class="u-vertically-center">
52- <div data-ng-if="iface.name !== 'default'">
53- <div ng-switch on="iface.pxe">
54- <div ng-switch-when="true">
55- <i class="p-icon--success"></i>
56- </div>
57- <div ng-switch-when="false">
58- <i class="p-icon--error"></i>
59- </div>
60- </div>
61- </div>
62+ <td>
63+ <p class="u-min-margin--bottom" data-ng-if="iface.name !== 'default'" ng-switch on="iface.pxe">
64+ <span ng-switch-when="true">
65+ <i class="p-icon--success"></i>
66+ </span>
67+ <span ng-switch-when="false">
68+ <i class="p-icon--error"></i>
69+ </span>
70+ </p>
71 </td>
72 </tr>
73 <tr data-ng-show="availableSubnets.length > 0">
74- <td colspan="7">
75+ <td colspan="8">
76 <button class="p-button--base u-td-outdent-focusable--left p-button--narrow" data-ng-click="composeAddInterface()">
77 <i class="p-icon--plus"></i>
78 <span class="u-off-screen">Add another interface</span>
79@@ -279,6 +275,7 @@
80 </tr>
81 </tbody>
82 </table>
83+
84 </div>
85 </div>
86 </div>
87diff --git a/src/maasserver/static/scss/_base_forms.scss b/src/maasserver/static/scss/_base_forms.scss
88index 96aba6d..9b1b0d7 100644
89--- a/src/maasserver/static/scss/_base_forms.scss
90+++ b/src/maasserver/static/scss/_base_forms.scss
91@@ -30,7 +30,10 @@
92 margin-bottom: $spv-inter--scaleable + $sp-unit - $spv-nudge * 2;
93 padding-bottom: $spv-nudge - $px;
94 padding-top: $spv-nudge - $px;
95+ min-height: 2.3rem;
96+ min-width: auto;
97 }
98+
99 .is-small & {
100 margin-bottom: $spv-nudge-compensation;
101 padding-bottom: $spv-nudge - $sp-unit * .5 - $px;
102@@ -42,6 +45,10 @@
103 }
104 }
105
106+ p.u-min-margin--bottom {
107+ margin-bottom: map-get($sp-after, default-text) - map-get($nudges, nudge--p);
108+ }
109+
110 // fix checkbox so it doesn't get misaligned when next to a label with a different padding-top than the default label
111 input[type="checkbox"] {
112 & + label {
113diff --git a/src/maasserver/static/scss/_base_tables.scss b/src/maasserver/static/scss/_base_tables.scss
114index 3371b10..155d4d3 100644
115--- a/src/maasserver/static/scss/_base_tables.scss
116+++ b/src/maasserver/static/scss/_base_tables.scss
117@@ -1,4 +1,14 @@
118 @mixin maas-tables {
119+
120+ %ellipse-text {
121+ @media (min-width: $breakpoint-small) {
122+ text-overflow: ellipsis;
123+ overflow-x: hidden;
124+ overflow-y: visible;
125+ white-space: nowrap;
126+ }
127+ }
128+
129 table {
130 overflow-x: visible;
131 input[type="radio"],
132@@ -25,17 +35,12 @@
133
134 th,
135 td {
136+ @extend %ellipse-text;
137 display: table-cell !important;
138 flex-basis: auto !important;
139 flex-grow: 0;
140 vertical-align: top;
141-
142- @media (min-width: $breakpoint-small) {
143- text-overflow: ellipsis;
144- overflow-x: hidden;
145- overflow-y: visible;
146- white-space: nowrap;
147- }
148+ padding-bottom: 0.05rem;
149
150 &:first-of-type {
151 padding-left: $sph-intra--condensed;
152@@ -45,6 +50,10 @@
153 padding-right: $sph-intra--condensed;
154 }
155 }
156+
157+ p {
158+ @extend %ellipse-text;
159+ }
160 }
161
162 tr {
163diff --git a/src/maasserver/static/scss/_tables.scss b/src/maasserver/static/scss/_tables.scss
164index ea3174d..bcdfbc6 100644
165--- a/src/maasserver/static/scss/_tables.scss
166+++ b/src/maasserver/static/scss/_tables.scss
167@@ -174,11 +174,15 @@
168 }
169
170 &:nth-child(6) {
171- width: 17%;
172+ width: 10%;
173 }
174
175 &:nth-child(7) {
176- width: 10%;
177+ width: 12%;
178+ }
179+
180+ &:nth-child(8) {
181+ width: 5%;
182 }
183 }
184 }

Subscribers

People subscribed via source and target branches