mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

submit-queue.tmpl: fix accordion, remove "Current Queue"

Browse source 
The Current Queue in fact is just the latest log element.
This commit is contained in:
Florian Klink 2019-11-27 19:18:02 +01:00
parent 917db9e9fd
commit fdfcf7967a
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
public/submit-queue.tmpl.html
View file

@ -48,7 +48,7 @@
<th scope="row">Currently running:</th> <th scope="row">Currently running:</th>
<td> <td>
{{ if .currentlyRunning }} {{ if .currentlyRunning }}
started at {{ .currentlyRunning.Format "Jan 02, 2006 15:04:05 UTC" }} started at {{ .currentlyRunning.Format "2006-01-02 15:04:05 UTC" }}
{{ else }} {{ else }}
<span class="text-secondary">Not currently running</span> <span class="text-secondary">Not currently running</span>
{{ end }} {{ end }}
@ -56,24 +56,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<h2 id="region-queue">Current Queue</h2> <h2 id="region-log">Log</h2>
{{ block "series" .series }}{{ end }}
<h2 id="region-log">History</h2>
<div id="history-accordion"> <div id="history-accordion">
{{ range $i, $result := .results }} {{ range $i, $result := .results }}
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h5 class="mb-0"> <h5>
<button class="btn btn-link" data-toggle="collapse" data-target="history-collapse-{{ $i }}"> <button class="btn btn-link" data-toggle="collapse" data-target="#history-collapse-{{ $i }}">
Result Item {{ $i }}, {{ $result.StartTime.Format "Jan 02, 2006 15:04:05 UTC"}} - {{ $result.EndTime.Format "Jan 02, 2006 15:04:05 UTC"}} Result Item {{ $i }}, {{ $result.StartTime.Format "2006-01-02 15:04:05 UTC"}} - {{ $result.EndTime.Format "2006-01-02 15:04:05 UTC"}}
</button> </button>
</h5> </h5>
</div> </div>
<div id="history-collapse-{{ $i }}" class="collapse show" data-parent="#history-accordion"> <div id="history-collapse-{{ $i }}" class="collapse {{ if eq $i 0 }} show{{ end }}" data-parent="#history-accordion">
<div class="card-body"> <div class="card-body">
<!--// TODO: currentlyRunning, HEAD--> <!--// TODO: HEAD-->
{{ if $result.Error }} {{ if $result.Error }}
<div class="text-danger">{{ $result.Error }}</div> <div class="text-danger">{{ $result.Error }}</div>
{{ end }} {{ end }}