b7b5834831
- Added [GitHub's `relative-time` element](https://github.com/github/relative-time-element) - Converted all formatted timestamps to use this element - No more flashes of unstyled content around time elements - These elements are localized using the `lang` property of the HTML file - Relative (e.g. the activities in the dashboard) and duration (e.g. server uptime in the admin page) time elements are auto-updated to keep up with the current time without refreshing the page - Code that is not needed anymore such as `formatting.js` and parts of `since.go` have been deleted Replaces #21440 Follows #22861 ## Screenshots ### Localized ![image](https://user-images.githubusercontent.com/20454870/230775041-f0af4fda-8f6b-46d3-b8e3-d340c791a50c.png) ![image](https://user-images.githubusercontent.com/20454870/230673393-931415a9-5729-4ac3-9a89-c0fb5fbeeeb7.png) ### Tooltips #### Native for dates ![image](https://user-images.githubusercontent.com/20454870/230797525-1fa0a854-83e3-484c-9da5-9425ab6528a3.png) #### Interactive for relative ![image](https://user-images.githubusercontent.com/115237/230796860-51e1d640-c820-4a34-ba2e-39087020626a.png) ### Auto-update ![rec](https://user-images.githubusercontent.com/20454870/230672159-37480d8f-435a-43e9-a2b0-44073351c805.gif) --------- Signed-off-by: Yarden Shoham <git@yardenshoham.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: delvh <dev.lh@web.de>
197 lines
7.7 KiB
Handlebars
197 lines
7.7 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
|
|
{{template "admin/navbar" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
|
|
</h4>
|
|
<div class="ui attached table segment">
|
|
<table class="ui very basic striped table">
|
|
<thead>
|
|
<tr>
|
|
<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
|
|
<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
|
|
<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
|
|
<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
|
|
<th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
|
|
<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<tr>
|
|
<td>{{.Queue.Name}}</td>
|
|
<td>{{.Queue.Type}}</td>
|
|
<td>{{.Queue.ExemplarType}}</td>
|
|
<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
|
|
<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
|
|
<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{{if lt $sum 0}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.nopool.title"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
{{if eq .Queue.Type "wrapped"}}
|
|
<p>{{.locale.Tr "admin.monitor.queue.wrapped.desc"}}</p>
|
|
{{else if eq .Queue.Type "persistable-channel"}}
|
|
<p>{{.locale.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
|
|
{{else}}
|
|
<p>{{.locale.Tr "admin.monitor.queue.nopool.desc"}}</p>
|
|
{{end}}
|
|
</div>
|
|
{{else}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.settings.title"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>{{.locale.Tr "admin.monitor.queue.settings.desc"}}</p>
|
|
<form method="POST" action="{{.Link}}/set">
|
|
{{$.CsrfTokenHtml}}
|
|
<div class="ui form">
|
|
<div class="inline field">
|
|
<label for="max-number">{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers"}}</label>
|
|
<input name="max-number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers.placeholder" .Queue.MaxNumberOfWorkers}}">
|
|
</div>
|
|
<div class="inline field">
|
|
<label for="timeout">{{.locale.Tr "admin.monitor.queue.settings.timeout"}}</label>
|
|
<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout}}">
|
|
</div>
|
|
<div class="inline field">
|
|
<label for="number">{{.locale.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
|
|
<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.numberworkers.placeholder" .Queue.BoostWorkers}}">
|
|
</div>
|
|
<div class="inline field">
|
|
<label>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout"}}</label>
|
|
<span>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout.value" .Queue.BlockTimeout}}</span>
|
|
</div>
|
|
<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.settings.submit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.pool.addworkers.title"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>{{.locale.Tr "admin.monitor.queue.pool.addworkers.desc"}}</p>
|
|
<form method="POST" action="{{.Link}}/add">
|
|
{{$.CsrfTokenHtml}}
|
|
<div class="ui form">
|
|
<div class="fields">
|
|
<div class="field">
|
|
<label>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</label>
|
|
<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.numberworkers.placeholder"}}">
|
|
</div>
|
|
<div class="field">
|
|
<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
|
|
<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
|
|
</div>
|
|
</div>
|
|
<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.addworkers.submit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
{{if .Queue.Pausable}}
|
|
{{if .Queue.IsPaused}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.pool.resume.title"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>{{.locale.Tr "admin.monitor.queue.pool.resume.desc"}}</p>
|
|
<form method="POST" action="{{.Link}}/resume">
|
|
{{$.CsrfTokenHtml}}
|
|
<div class="ui form">
|
|
<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.resume.submit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
{{else}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.pool.pause.title"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>{{.locale.Tr "admin.monitor.queue.pool.pause.desc"}}</p>
|
|
<form method="POST" action="{{.Link}}/pause">
|
|
{{$.CsrfTokenHtml}}
|
|
<div class="ui form">
|
|
<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.pause.submit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.pool.flush.title"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>{{.locale.Tr "admin.monitor.queue.pool.flush.desc"}}</p>
|
|
<form method="POST" action="{{.Link}}/flush">
|
|
{{$.CsrfTokenHtml}}
|
|
<div class="ui form">
|
|
<div class="fields">
|
|
<div class="field">
|
|
<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
|
|
<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
|
|
</div>
|
|
</div>
|
|
<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.flush.submit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.pool.workers.title"}}
|
|
</h4>
|
|
<div class="ui attached table segment">
|
|
<table class="ui very basic striped table">
|
|
<thead>
|
|
<tr>
|
|
<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
|
|
<th>{{.locale.Tr "admin.monitor.start"}}</th>
|
|
<th>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</th>
|
|
<th></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{{range .Queue.Workers}}
|
|
<tr>
|
|
<td>{{.Workers}}{{if .IsFlusher}}<span title="{{$.locale.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
|
|
<td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Start) "Fallback" (DateFmtLong .Start) )}}</td>
|
|
<td>{{if .HasTimeout}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Timeout) "Fallback" (DateFmtLong .Timeout) )}}{{else}}-{{end}}</td>
|
|
<td>
|
|
<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}" title="{{$.locale.Tr "remove"}}">{{svg "octicon-trash"}}</a>
|
|
</td>
|
|
</tr>
|
|
{{else}}
|
|
<tr>
|
|
<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none"}}
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{{end}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.monitor.queue.configuration"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<pre>{{.Queue.Configuration | JsonPrettyPrint}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui small basic delete modal">
|
|
<div class="ui icon header">
|
|
{{svg "octicon-x" 16 "close inside"}}
|
|
{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
|
|
<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
|
|
</div>
|
|
{{template "base/delete_modal_actions" .}}
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|