476a043a5f
Co-Author: @wxiaoguang
This PR is to fix
https://github.com/go-gitea/gitea/issues/23318#issuecomment-1506275446 .
The way to fix this in this PR is to use `delete_modal_actions.tmpl`
here both to fix this issue and keep ui consistency (as suggested by
[TODO
here](4299c3b7db/templates/projects/view.tmpl (L161)))
And this PR also refactors `delete_modal_actions.tmpl` and its related
styles, and use the template for more modal actions:
1. Added template attributes:
* locale
* ModalButtonStyle: "yes" (default) or "confirm"
* ModalButtonCancelText
* ModalButtonOkText
2. Rename `delete_modal_actions.tmpl` template to
`modal_actions_confirm.tmpl` because it is not only used for action
modals deletion now.
3. Refactored css related to modals into `web_src/css/modules/modal.css`
and improved the styles.
4. Also use the template for PR deletion modal and remove issue
dependency modal.
5. Some modals should also use the template, but not sure how to open
them, so mark these modal actions by `{{/* TODO: Convert to
base/modal_actions_confirm */}}`
After (Also tested on arc green):
Hovering on the left buttons
<img width="711" alt="Screen Shot 2023-04-23 at 15 17 12"
src="https://user-images.githubusercontent.com/17645053/233825650-76307e65-9255-44bb-80e8-7062f58ead1b.png">
<img width="786" alt="Screen Shot 2023-04-23 at 15 17 21"
src="https://user-images.githubusercontent.com/17645053/233825652-4dc6f7d1-a180-49fb-a468-d60950eaee0d.png">
Test for functionalities:
https://user-images.githubusercontent.com/17645053/233826857-76376fda-022c-42d0-b0f3-339c17ca4e59.mov
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
103 lines
3.8 KiB
Handlebars
103 lines
3.8 KiB
Handlebars
<div class="runner-container">
|
|
{{template "base/alert" .}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "actions.runners.runner_title"}} {{.Runner.ID}} {{.Runner.Name}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<form class="ui form" method="post">
|
|
{{template "base/disable_form_autofill"}}
|
|
{{.CsrfTokenHtml}}
|
|
<div class="runner-basic-info">
|
|
<div class="field gt-dib gt-mr-4 disabled">
|
|
<label>{{.locale.Tr "actions.runners.status"}}</label>
|
|
<span class="runner-status-{{if .Runner.IsOnline}}online{{else}}offline{{end}}">{{.Runner.StatusLocaleName $.locale}}</span>
|
|
</div>
|
|
<div class="field gt-dib gt-mr-4 disabled">
|
|
<label>{{.locale.Tr "actions.runners.last_online"}}</label>
|
|
<span>{{TimeSinceUnix .Runner.LastOnline $.locale}}</span>
|
|
</div>
|
|
<div class="field gt-dib gt-mr-4 disabled">
|
|
<label>{{.locale.Tr "actions.runners.agent_labels"}}</label>
|
|
<span>
|
|
{{range .Runner.AgentLabels}}
|
|
<span>{{.}}</span>
|
|
{{end}}
|
|
</span>
|
|
</div>
|
|
<div class="field gt-dib gt-mr-4 disabled">
|
|
<label>{{.locale.Tr "actions.runners.owner_type"}}</label>
|
|
<span>{{.Runner.OwnType}}</span>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
<div class="field">
|
|
<label for="description">{{.locale.Tr "actions.runners.description"}}</label>
|
|
<input id="description" name="description" value="{{.Runner.Description}}">
|
|
</div>
|
|
<div class="field" data-tooltip-content="Labels are comma-separated. Whitespace at the beginning, end, and around the commas are ignored.">
|
|
<label for="custom_labels">{{.locale.Tr "actions.runners.custom_labels"}}</label>
|
|
<input id="custom_labels" name="custom_labels" value="{{Join .Runner.CustomLabels `,`}}">
|
|
<p class="help">{{.locale.Tr "actions.runners.custom_labels_helper"}}</p>
|
|
</div>
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
<div class="field">
|
|
<button class="ui green button" data-url="{{.Link}}">{{.locale.Tr "actions.runners.update_runner"}}</button>
|
|
<button class="ui red button delete-button show-modal" data-url="{{.Link}}/delete" data-modal="#runner-delete-modal">
|
|
{{.locale.Tr "actions.runners.delete_runner"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "actions.runners.task_list"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<table class="ui very basic striped table unstackable">
|
|
<thead>
|
|
<tr>
|
|
<th>{{.locale.Tr "actions.runners.task_list.run"}}</th>
|
|
<th>{{.locale.Tr "actions.runners.task_list.status"}}</th>
|
|
<th>{{.locale.Tr "actions.runners.task_list.repository"}}</th>
|
|
<th>{{.locale.Tr "actions.runners.task_list.commit"}}</th>
|
|
<th>{{.locale.Tr "actions.runners.task_list.done_at"}}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{{range .Tasks}}
|
|
<tr>
|
|
<td><a href="{{.GetRunLink}}" target="_blank">{{.ID}}</a></td>
|
|
<td><span class="ui label task-status-{{.Status.String}}">{{.Status.LocaleString $.locale}}</span></td>
|
|
<td><a href="{{.GetRepoLink}}" target="_blank">{{.GetRepoName}}</a></td>
|
|
<td>
|
|
<strong><a href="{{.GetCommitLink}}" target="_blank">{{ShortSha .CommitSHA}}</a></strong>
|
|
</td>
|
|
<td>{{if .IsStopped}}
|
|
<span>{{TimeSinceUnix .Stopped $.locale}}</span>
|
|
{{else}}-{{end}}</td>
|
|
</tr>
|
|
{{end}}
|
|
{{if not .Tasks}}
|
|
<tr>
|
|
<td colspan="5">{{.locale.Tr "runners.task_list.no_tasks"}}</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
{{template "base/paginate" .}}
|
|
</div>
|
|
<div class="ui gitea-confirm-modal delete modal" id="runner-delete-modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "actions.runners.delete_runner_header"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "actions.runners.delete_runner_notice" | Safe}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
</div>
|