Skip to content

Commit dd44238

Browse files
smortexsmortex
committed
Improve consistency in status ordering
We have stats and reports by status, but the order of these status is not consistent across the summary table on top of the page, each status section in the body of the page and the progress-bar at the bottom of the page. Reorder each bit to have consistent ordering: * queued (not shown in the progress-bar as it is the full bar) * fetched * ignored * skipped * inspected * failed * built * remaining Section in the body are listed in reverse order (as before).
1 parent dc94305 commit dd44238

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

‎src/share/poudriere/html/assets/poudriere.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,12 @@ function update_canvas(stats) {
220220
context.lineWidth = 1;
221221
context.strokeStyle = "black";
222222
context.stroke();
223-
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-success-border-subtle'), queued, built);
224-
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-danger-border-subtle'), queued, failed);
223+
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-primary-border-subtle'), queued, fetched);
224+
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-warning-border-subtle'), queued, ignored);
225225
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-info-border-subtle'), queued, skipped);
226226
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-warning-border-subtle'), queued, inspected);
227-
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-warning-border-subtle'), queued, ignored);
228-
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-primary-border-subtle'), queued, fetched);
227+
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-danger-border-subtle'), queued, failed);
228+
x += minidraw(x, height, width, context, getComputedStyle(document.documentElement).getPropertyValue('--bs-success-border-subtle'), queued, built);
229229

230230
pctdone = ((queued - remaining) * 100) / queued;
231231
if (isNaN(pctdone)) {

‎src/share/poudriere/html/build.html‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,23 @@
101101
Results
102102
</button>
103103
<ul class="dropdown-menu">
104+
<li class="disabled" id="nav_remaining">
105+
<a href="#remaining_div" class="dropdown-item nav-link"
106+
>Remaining</a
107+
>
108+
</li>
104109
<li class="disabled" id="nav_built">
105110
<a href="#built_div" class="dropdown-item nav-link">Built</a>
106111
</li>
107112
<li class="disabled" id="nav_failed">
108113
<a href="#failed_div" class="dropdown-item nav-link">Failed</a>
109114
</li>
110-
<li class="disabled" id="nav_skipped">
111-
<a href="#skipped_div" class="dropdown-item nav-link">Skipped</a>
112-
</li>
113115
<li class="disabled" id="nav_inspected">
114116
<a href="#inspected_div" class="dropdown-item nav-link">Inspected</a>
115117
</li>
118+
<li class="disabled" id="nav_skipped">
119+
<a href="#skipped_div" class="dropdown-item nav-link">Skipped</a>
120+
</li>
116121
<li class="disabled" id="nav_ignored">
117122
<a href="#ignored_div" class="dropdown-item nav-link">Ignored</a>
118123
</li>
@@ -122,11 +127,6 @@
122127
<li class="disabled" id="nav_queued">
123128
<a href="#queued_div" class="dropdown-item nav-link">Queued</a>
124129
</li>
125-
<li class="disabled" id="nav_remaining">
126-
<a href="#remaining_div" class="dropdown-item nav-link"
127-
>Remaining</a
128-
>
129-
</li>
130130
</ul>
131131
</li>
132132
<li class="nav-item dropdown ms-2">
@@ -228,23 +228,23 @@
228228
<thead>
229229
<tr>
230230
<th class="text-center table-secondary">Queued</th>
231-
<th class="text-center table-success">Built</th>
232-
<th class="text-center table-danger">Failed</th>
231+
<th class="text-center table-primary">Fetched</th>
232+
<th class="text-center table-warning">Ignored</th>
233233
<th class="text-center table-info">Skipped</th>
234234
<th class="text-center table-warning">Inspected</th>
235-
<th class="text-center table-warning">Ignored</th>
236-
<th class="text-center table-primary">Fetched</th>
235+
<th class="text-center table-danger">Failed</th>
236+
<th class="text-center table-success">Built</th>
237237
<th class="text-center">Remaining</th>
238238
</tr>
239239
</thead>
240240
<tr>
241241
<td id="stats_queued" class="queued text-center"></td>
242-
<td id="stats_built" class="built text-center"></td>
243-
<td id="stats_failed" class="failed text-center"></td>
242+
<td id="stats_fetched" class="text-center"></td>
243+
<td id="stats_ignored" class="text-center"></td>
244244
<td id="stats_skipped" class="text-center"></td>
245245
<td id="stats_inspected" class="text-center"></td>
246-
<td id="stats_ignored" class="text-center"></td>
247-
<td id="stats_fetched" class="text-center"></td>
246+
<td id="stats_failed" class="failed text-center"></td>
247+
<td id="stats_built" class="built text-center"></td>
248248
<td id="stats_remaining" class="text-center"></td>
249249
</tr>
250250
</table>
@@ -302,6 +302,22 @@
302302
<!-- /container -->
303303
<div class="row">
304304
<div class="col-md-12">
305+
<div id="remaining_div" style="display: none">
306+
<div class="card my-3 bg-dark text-white fs-5">
307+
<div class="card-body fs-5">Remaining Ports</div>
308+
</div>
309+
<table class="table table-striped" id="remaining_table">
310+
<thead>
311+
<tr>
312+
<th>#</th>
313+
<th>Package</th>
314+
<th>Status</th>
315+
</tr>
316+
</thead>
317+
<tbody id="remaining_body"></tbody>
318+
</table>
319+
</div>
320+
<!-- #remaining -->
305321
<div id="built_div" style="display: none">
306322
<div class="card my-3 bg-dark text-white fs-5">
307323
<div class="card-body fs-5">Built Ports</div>
@@ -338,11 +354,11 @@ <h2 id="failed">Failed ports</h2>
338354
</table>
339355
</div>
340356
<!-- #failed -->
341-
<div id="skipped_div" style="display: none">
357+
<div id="inspected_div" style="display: none">
342358
<div class="card my-3 bg-dark text-white fs-5">
343-
<div class="card-body fs-5">Skipped Ports</div>
359+
<div class="card-body fs-5">Inspected Ports</div>
344360
</div>
345-
<table class="table table-striped" id="skipped_table">
361+
<table class="table table-striped" id="inspected_table">
346362
<thead>
347363
<tr>
348364
<th>#</th>
@@ -351,15 +367,15 @@ <h2 id="failed">Failed ports</h2>
351367
<th>Reason</th>
352368
</tr>
353369
</thead>
354-
<tbody id="skipped_body"></tbody>
370+
<tbody id="inspected_body"></tbody>
355371
</table>
356372
</div>
357-
<!-- #skipped -->
358-
<div id="inspected_div" style="display: none">
373+
<!-- #inspected -->
374+
<div id="skipped_div" style="display: none">
359375
<div class="card my-3 bg-dark text-white fs-5">
360-
<div class="card-body fs-5">Inspected Ports</div>
376+
<div class="card-body fs-5">Skipped Ports</div>
361377
</div>
362-
<table class="table table-striped" id="inspected_table">
378+
<table class="table table-striped" id="skipped_table">
363379
<thead>
364380
<tr>
365381
<th>#</th>
@@ -368,10 +384,10 @@ <h2 id="failed">Failed ports</h2>
368384
<th>Reason</th>
369385
</tr>
370386
</thead>
371-
<tbody id="inspected_body"></tbody>
387+
<tbody id="skipped_body"></tbody>
372388
</table>
373389
</div>
374-
<!-- #inspected -->
390+
<!-- #skipped -->
375391
<div id="ignored_div" style="display: none">
376392
<div class="card my-3 bg-dark text-white fs-5">
377393
<div class="card-body fs-5">Ignored Ports</div>
@@ -423,22 +439,6 @@ <h2 id="failed">Failed ports</h2>
423439
</table>
424440
</div>
425441
<!-- #queued -->
426-
<div id="remaining_div" style="display: none">
427-
<div class="card my-3 bg-dark text-white fs-5">
428-
<div class="card-body fs-5">Remaining Ports</div>
429-
</div>
430-
<table class="table table-striped" id="remaining_table">
431-
<thead>
432-
<tr>
433-
<th>#</th>
434-
<th>Package</th>
435-
<th>Status</th>
436-
</tr>
437-
</thead>
438-
<tbody id="remaining_body"></tbody>
439-
</table>
440-
</div>
441-
<!-- #remaining -->
442442
</div>
443443
<!-- /col -->
444444
</div>

0 commit comments

Comments
 (0)