Merge ~deadlight/maas:expanding-tables into ~ya-bo-ng/maas:vanilla

Proposed by Karl Williams
Status: Merged
Merged at revision: 31b8bd95ea0bbcfbc8e179cff8e74f4e0043d478
Proposed branch: ~deadlight/maas:expanding-tables
Merge into: ~ya-bo-ng/maas:vanilla
Diff against target: 195 lines (+19/-19)
6 files modified
src/maasserver/static/partials/boot-images.html (+3/-3)
src/maasserver/static/partials/ipranges.html (+3/-3)
src/maasserver/static/partials/pods-list.html (+2/-2)
src/maasserver/static/partials/settings.html (+6/-6)
src/maasserver/static/partials/ssh-keys.html (+1/-1)
src/maasserver/static/partials/subnet-details.html (+4/-4)
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Review via email: mp+337788@code.launchpad.net

Description of the change

Added col-12 to all of the expanding table cells to force them to be full width

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Looks good, thanks.

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/boot-images.html b/src/maasserver/static/partials/boot-images.html
2index 4139539..9fe1ad3 100644
3--- a/src/maasserver/static/partials/boot-images.html
4+++ b/src/maasserver/static/partials/boot-images.html
5@@ -143,7 +143,7 @@
6 <td class="u-align--right">
7 <button data-ng-if="(isSuperUser() && canBeRemoved(image))" class="p-button--negative" aria-label="Remove" data-ng-click="deleteImage(image)">Remove</button>
8 </td>
9- <td colspan="6" class="p-table-expanding__panel" data-ng-if="canBeRemoved(image) && ubuntuDeleteId === image.resourceId">
10+ <td colspan="6" class="p-table-expanding__panel col-12" data-ng-if="canBeRemoved(image) && ubuntuDeleteId === image.resourceId">
11 <p><i class="p-icon--warning">Warning:</i> Are you sure you want to remove this image?</p>
12 <button class="p-button--neutral is-inline" data-ng-click="deleteImage()">Cancel</button>
13 <button class="p-button--negative" data-ng-click="confirmDeleteImage()">Remove</button>
14@@ -285,7 +285,7 @@
15 <td class="u-align--right">
16 <button class="p-button--negative" aria-label="Remove" data-ng-click="quickRemove(image)">Remove image</button>
17 </td>
18- <td class="p-table-expanding__panel" data-ng-if="isShowingDeleteConfirm(image)">
19+ <td class="p-table-expanding__panel col-12" data-ng-if="isShowingDeleteConfirm(image)">
20 <h2 data-ng-click="cancelRemove()" class="u-float--left">Remove image</h2>
21 <p><i class="p-icon--warning">Warning: </i> Are you sure you want to remove this image?</p>
22 <div class="u-float--right">
23@@ -330,7 +330,7 @@
24 <td class="u-align--right">
25 <a aria-label="Remove" data-ng-click="toggleMenu(); quickRemove(image)">Remove image</a>
26 </td>
27- <td class="p-table-expanding__panel" data-ng-if="isShowingDeleteConfirm(image)">
28+ <td class="p-table-expanding__panel col-12" data-ng-if="isShowingDeleteConfirm(image)">
29 <h2 data-ng-click="cancelRemove()">Remove image</h2>
30 <p><i class="p-icon--warning">Warning: </i> Are you sure you want to remove this image?</p>
31 <button class="p-button--neutral is-inline" type="button" data-ng-click="cancelRemove()">Cancel</button>
32diff --git a/src/maasserver/static/partials/ipranges.html b/src/maasserver/static/partials/ipranges.html
33index b81bcf9..af2d826 100755
34--- a/src/maasserver/static/partials/ipranges.html
35+++ b/src/maasserver/static/partials/ipranges.html
36@@ -26,7 +26,7 @@
37 data-ng-click="toggleMenu(); ipRangeEnterDeleteMode(iprange)">Remove</button>
38 </div>
39 </td>
40- <td class="is-active p-table-expanding__panel" col-span="6" data-ng-if="isIPRangeInDeleteMode(iprange)">
41+ <td class="is-active p-table-expanding__panel col-12" col-span="6" data-ng-if="isIPRangeInDeleteMode(iprange)">
42 <hr />
43 <div class="row u-no-margin--top">
44 <div class="col-6">
45@@ -38,7 +38,7 @@
46 </div>
47 </div>
48 </td>
49- <td class="is-active p-table-expanding__panel" col-span="6" data-ng-if="isIPRangeInEditMode(iprange)">
50+ <td class="is-active p-table-expanding__panel col-12" col-span="6" data-ng-if="isIPRangeInEditMode(iprange)">
51 <hr />
52 <maas-obj-form obj="iprange" manager="iprangeManager" table-form="true"
53 save-on-blur="false" after-save="ipRangeClearEditMode">
54@@ -82,7 +82,7 @@
55 <tr data-ng-if="subnetIPRanges.length === 0 && !newRange">
56 <td class="col-12">No IP ranges have been reserved for this subnet.</td>
57 </tr>
58- <tr class="p-table-expanding__panel" data-ng-if="newRange">
59+ <tr class="p-table-expanding__panel col-12" data-ng-if="newRange">
60 <td class="p-form p-form--inline ">
61 <maas-obj-form obj="newRange" manager="iprangeManager" manager-method="createItem"
62 table-form="true" save-on-blur="false" after-save="cancelAddRange">
63diff --git a/src/maasserver/static/partials/pods-list.html b/src/maasserver/static/partials/pods-list.html
64index dc9ee52..75bb6bd 100644
65--- a/src/maasserver/static/partials/pods-list.html
66+++ b/src/maasserver/static/partials/pods-list.html
67@@ -149,7 +149,7 @@
68 <tr data-ng-repeat="pod in filteredItems = (pods | nodesFilter:search | orderBy:predicate:reverse) track by pod.id" data-ng-class="{ selected: pod.$selected, 'is-active': pod.$selected && pod.action_failed }">
69 <td class="col-1" data-ng-if="isSuperUser()" aria-label="Select pod">
70 <input type="checkbox" class="checkbox" data-ng-click="toggleChecked(pod)" data-ng-checked="pod.$selected" id="{$ pod.id $}" data-ng-disabled="add.open || hasActionsInProgress()"/>
71- <label for="{$ pod.id $}" class="checkbox-label"></label>
72+ <label for="{$ pod.id $}" class="checkbox-label"></label>
73 </td>
74 <td class="col-2" aria-label="Name">
75 <a href="#/pod/{$ pod.id $}">{$ pod.name $}</a>
76@@ -172,7 +172,7 @@
77 <td class="col-2 u-align--right" aria-label="Composed machines">
78 {$ pod.composed_machines_count $}
79 </td>
80- <td class="p-table-expanding__panel" data-ng-if="pod.$selected && pod.action_failed">
81+ <td class="p-table-expanding__panel col-12" data-ng-if="pod.$selected && pod.action_failed">
82 <div aria-label="label" class="table__data">
83 <p><i class="p-icon--error">Error:</i> {$ pod.action_error $}</p>
84 </div>
85diff --git a/src/maasserver/static/partials/settings.html b/src/maasserver/static/partials/settings.html
86index daaf940..aef8ea3 100644
87--- a/src/maasserver/static/partials/settings.html
88+++ b/src/maasserver/static/partials/settings.html
89@@ -36,7 +36,7 @@
90 <thead>
91 <tr>
92 <th class="col-2">Name</th>
93- <th class="col-2">Type</th>
94+ <th class="col-2">Type</th>
95 <th class="col-4">Applies to</th>
96 <th class="col-1">Enabled</th>
97 <th class="col-3">Actions</th>
98@@ -73,7 +73,7 @@
99 <button aria-label="Remove {$ snippet.name $}"
100 data-ng-click="toggleMenu(); snippetEnterRemove(snippet)">Remove</button>
101 </td>
102- <td class="p-table-expanding__panel" data-ng-if="editSnippet === snippet">
103+ <td class="p-table-expanding__panel col-12" data-ng-if="editSnippet === snippet">
104 <maas-obj-form obj="editSnippet" manager="snippetsManager" manager-method="updateItem"
105 table-form="true" save-on-blur="false" after-save="snippetExitEdit">
106 <div class="row u-equal-height">
107@@ -138,7 +138,7 @@
108 </div>
109 </maas-obj-form>
110 </td>
111- <td class="p-table-expanding__panel u-no-margin--left" data-ng-if="deleteSnippet === snippet">
112+ <td class="p-table-expanding__panel col-12 u-no-margin--left" data-ng-if="deleteSnippet === snippet">
113 <div class="row u-hide u-show--small">
114 <h2 data-ng-click="snippetExitRemove(snippet)" class="u-float--left">Removing {$ snippet.name $}</h2>
115 <button data-ng-click="snippetExitRemove(snippet)" class="p-icon--close u-float--right"></button>
116@@ -155,7 +155,7 @@
117 </td>
118 </tr>
119 <tr class="is-active" data-ng-if="newSnippet">
120- <td class="p-table-expanding__panel" col-span="5">
121+ <td class="p-table-expanding__panel col-12" col-span="5">
122 <maas-obj-form obj="newSnippet" manager="snippetsManager" manager-method="createItem"
123 table-form="true" save-on-blur="false" after-save="snippetAddCancel">
124 <div class="row u-hide u-show--small">
125@@ -374,7 +374,7 @@
126 data-ng-click="toggleMenu(); repositoryEnterRemove(repository)">Remove</button>
127 </div>
128 </td>
129- <td class="is-active p-table-expanding__panel" col-span="5" data-ng-if="editRepository === repository">
130+ <td class="is-active p-table-expanding__panel col-12" col-span="5" data-ng-if="editRepository === repository">
131 <maas-obj-form obj="editRepository" manager="packageRepositoriesManager" manager-method="updateItem"
132 table-form="true" save-on-blur="false" after-save="repositoryExitEdit">
133 <div class="row u-equal-height">
134@@ -477,7 +477,7 @@
135 </td>
136 </tr>
137 <tr class="is-active" data-ng-if="newRepository">
138- <td class="p-table-expanding__panel" col-span="5">
139+ <td class="p-table-expanding__panel col-12" col-span="5">
140 <maas-obj-form obj="newRepository" manager="packageRepositoriesManager" manager-method="createItem"
141 table-form="true" save-on-blur="false" after-save="repositoryAddCancel">
142 <div class="row u-equal-height">
143diff --git a/src/maasserver/static/partials/ssh-keys.html b/src/maasserver/static/partials/ssh-keys.html
144index 31f1096..910bdfb 100644
145--- a/src/maasserver/static/partials/ssh-keys.html
146+++ b/src/maasserver/static/partials/ssh-keys.html
147@@ -27,7 +27,7 @@
148 <li data-ng-repeat="key in group.keys" data-ng-bind-html="trustAsHtml(key.display)"></li>
149 </ul>
150 </td>
151- <td class="p-table-expanding__panel" data-ng-class="{ 'u-hide': group.id !== openRow || rowMode !== 'delete' }">
152+ <td class="p-table-expanding__panel col-12" data-ng-class="{ 'u-hide': group.id !== openRow || rowMode !== 'delete' }">
153 <div class="row u-equal-height">
154 <div class="col-8 u-vertically-center">
155 <span data-ng-if="group.source !== 'upload'"><span class="p-icon p-icon--warning">Warning:</span> Are you sure you want to remove this key source?</span>
156diff --git a/src/maasserver/static/partials/subnet-details.html b/src/maasserver/static/partials/subnet-details.html
157index fa5b560..505a546 100755
158--- a/src/maasserver/static/partials/subnet-details.html
159+++ b/src/maasserver/static/partials/subnet-details.html
160@@ -132,7 +132,7 @@
161 <i class="p-icon--information">Help:</i>
162 <span class="p-tooltip__message" role="tooltip">MAAS allocates IP addresses only from&#xa;the reserved ranges on this subnet.</span>
163 </span>
164-
165+
166 <span data-ng-if="subnet.managed == true" class="p-tooltip p-tooltip--btm-right">
167 <i class="p-icon--information">Help:</i>
168 <span class="p-tooltip__message" role="tooltip">MAAS allocates IP addresses from&#xa;this subnet, excluding the reserved&#xa;and dynamic ranges.</span>
169@@ -296,7 +296,7 @@
170 data-ng-click="toggleMenu(); staticRouteEnterDeleteMode(staticRoute)"
171 data-ng-if="!isStaticRouteInDeleteMode(staticRoute) && !isStaticRouteInEditMode(staticRoute)">Remove</button>
172 </td>
173- <td class="p-table-expanding__panel" data-ng-if="isStaticRouteInDeleteMode(staticRoute)">
174+ <td class="p-table-expanding__panel col-12" data-ng-if="isStaticRouteInDeleteMode(staticRoute)">
175 <div data-ng-if="windowWidth <= 768">
176 <h2 data-ng-click="staticRouteCancelDelete()" class="u-float--left">Remove {$ staticRoute.gateway_ip $}</h2>
177 <i data-ng-click="staticRouteCancelDelete()" class="p-icon--close u-float--right"></i>
178@@ -312,7 +312,7 @@
179 </div>
180 </div>
181 </td>
182- <td class="p-table-expanding__panel" data-ng-if="isStaticRouteInEditMode(staticRoute)">
183+ <td class="p-table-expanding__panel col-12" data-ng-if="isStaticRouteInEditMode(staticRoute)">
184 <maas-obj-form obj="staticRoute" manager="staticRoutesManager" table-form="true"
185 save-on-blur="false" after-save="ipRangeClearEditMode">
186 <div data-ng-if="windowWidth <= 768">
187@@ -352,7 +352,7 @@
188 <td col-span="6">No static routes have been added to this subnet.</td>
189 </tr>
190 <tr class="is-active" data-ng-if="newStaticRoute">
191- <td class="p-table-expanding__panel">
192+ <td class="p-table-expanding__panel col-12">
193 <maas-obj-form obj="newStaticRoute" manager="staticRoutesManager" manager-method="createItem"
194 table-form="true" save-on-blur="false" after-save="cancelAddStaticRoute">
195 <div data-ng-if="windowWidth <= 768">

Subscribers

People subscribed via source and target branches

to all changes: