Merge ~ltrager/maas:lp1721105 into maas:master

Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: 615274e1c8e84028a8841da114f5f70b244d3859
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:lp1721105
Merge into: maas:master
Diff against target: 23 lines (+3/-3)
1 file modified
src/maasserver/static/partials/machines-table.html (+3/-3)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+331800@code.launchpad.net

Commit message

LP: #1721105 - Remove green status icon from listing page.

To post a comment you must log in.
Revision history for this message
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/machines-table.html b/src/maasserver/static/partials/machines-table.html
2index ef9203c..6192241 100644
3--- a/src/maasserver/static/partials/machines-table.html
4+++ b/src/maasserver/static/partials/machines-table.html
5@@ -61,15 +61,15 @@
6 <td class="status u-text--truncate" aria-label="{$ node.status_tooltip $}">{$ getStatusText(node) $} <span class="u-display--mobile"><i data-ng-if="showSpinner(node)" class="icon icon--loading u-animation--spin u-margin--left-tiny"></i></span></td>
7 <td class="table-col--10" aria-label="Owner">{$ node.owner $}</td>
8 <td class="u-align--right u-display--desktop" aria-label="CPU">
9- <span class="tooltip" data-maas-script-status="script-status" data-script-status="node.cpu_test_status" aria-label="{$ node.cpu_test_status_tooltip $}"></span>
10+ <span class="tooltip" data-maas-script-status="script-status" data-script-status="node.cpu_test_status" aria-label="{$ node.cpu_test_status_tooltip $}" data-ng-if="node.cpu_test_status !== 2"></span>
11 {$ node.cpu_count $}
12 </td>
13 <td class="u-align--right u-display--desktop" aria-label="Memory">
14- <span class="tooltip" data-maas-script-status="script-status" data-script-status="node.memory_test_status" aria-label="{$ node.memory_test_status_tooltip $}"></span>
15+ <span class="tooltip" data-maas-script-status="script-status" data-script-status="node.memory_test_status" aria-label="{$ node.memory_test_status_tooltip $}" data-ng-if="node.memory_test_status !== 2"></span>
16 {$ node.memory $}
17 </td>
18 <td class="u-align--right u-display--desktop" aria-label="Disks">
19- <span class="tooltip" data-maas-script-status="script-status" data-script-status="node.storage_test_status" aria-label="{$ node.storage_test_status_tooltip $}"></span>
20+ <span class="tooltip" data-maas-script-status="script-status" data-script-status="node.storage_test_status" aria-label="{$ node.storage_test_status_tooltip $}" data-ng-if="node.storage_test_status !== 2"></span>
21 {$ node.physical_disk_count $}</td>
22 <td class="u-align--right u-display--desktop" aria-label="Storage">
23 {$ node.storage $}

Subscribers

People subscribed via source and target branches