MAAS

Merge ~ltrager/maas:lp1760702_1757155 into maas:master

  1. Git
  2. lp:~ltrager/maas
  3. lp1760702_1757155
  4. Merge into master
Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: 1a38d1df3f106b7f8a032ec23ed392416e6e6789
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:lp1760702_1757155
Merge into: maas:master
Diff against target: 34 lines (+3/-3)
2 files modified
src/maasserver/static/partials/cards/cpu.html (+1/-1)
src/maasserver/static/partials/node-details.html (+2/-2)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
MAAS Lander unittests Pending
Review via email: mp+342698@code.launchpad.net

Commit message

LP: #1760702, #1757155 - Fix spelling of firmware and duplicate 'cores' in UI

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

+1

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/cards/cpu.html b/src/maasserver/static/partials/cards/cpu.html
2index 4e1bf65..1e29b90 100644
3--- a/src/maasserver/static/partials/cards/cpu.html
4+++ b/src/maasserver/static/partials/cards/cpu.html
5@@ -1,6 +1,6 @@
6 <header class="p-card__header">
7 <h2 class="p-heading--four">CPU</h2>
8- <h3 class="p-heading--three" data-ng-if="node.cpu_count > 0"><strong>{$ getCPUSubtext() $} cores</strong> <span class="p-heading--six">({$ node.architecture $})</span></h3>
9+ <h3 class="p-heading--three" data-ng-if="node.cpu_count > 0"><strong>{$ getCPUSubtext() $}</strong> <span class="p-heading--six">({$ node.architecture $})</span></h3>
10 <h3 class="p-heading--three" data-ng-if="node.cpu_count === 0"><strong>Unknown</strong> <span class="p-heading--six">({$ node.architecture $})</span></h3>
11 </header>
12 <div data-ng-controller="NodeResultsController">
13diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
14index 81e8e49..ec52551 100755
15--- a/src/maasserver/static/partials/node-details.html
16+++ b/src/maasserver/static/partials/node-details.html
17@@ -1761,7 +1761,7 @@
18 <span class="divide"> | </span>
19 <a data-ng-click="tableInfo.column = 'serial'" data-ng-class="{'p-link--soft': tableInfo.column === 'serial'}">Serial</a>
20 </th>
21- <th class="col-2">Fireware version</th>
22+ <th class="col-2">Firmware version</th>
23 <th class="col-1"><div class="u-align--center">Boot</div></th>
24 <th class="col-1">Size</th>
25 <th class="col-1">Device Type</th>
26@@ -2582,7 +2582,7 @@
27 <span class="divide"> | </span>
28 <a data-ng-click="tableInfo.column = 'serial'" data-ng-class="{'p-link--soft': tableInfo.column === 'serial'}">Serial</a>
29 </th>
30- <th class="col-2">Fireware version</th>
31+ <th class="col-2">Firmware version</th>
32 <th class="col-1"><div class="u-align--center">Boot</div></th>
33 <th class="col-2">Device type</th>
34 <th class="col-3">Used for</th>

Subscribers

People subscribed via source and target branches