diff options
author | Denys Konovalov <kontakt@denyskon.de> | 2023-09-24 20:12:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-24 14:12:21 -0400 |
commit | 63b25e816db6862bad9ad14ab272901b5570f48b (patch) | |
tree | 8372a736b2e9c9b04461127f876e8ceba4d1183d /templates | |
parent | efd51762781d4ba57c459190846a26636aef6564 (diff) | |
download | gitea-63b25e816db6862bad9ad14ab272901b5570f48b.tar.gz gitea-63b25e816db6862bad9ad14ab272901b5570f48b.zip |
fix issues on action runners page (#27226)
- switch from some weird status badge to label
- translate untranslated `Reset registration token` string
- change documentation link from act_runner README to Gitea Docs site
- fix "No runners available" message width
- use `ctx.Locale.Tr` where possible
![grafik](https://github.com/go-gitea/gitea/assets/47871822/65547228-f9ed-4f80-9cfd-df5e55513a44)
Diffstat (limited to 'templates')
-rw-r--r-- | templates/shared/actions/runner_edit.tmpl | 2 | ||||
-rw-r--r-- | templates/shared/actions/runner_list.tmpl | 37 |
2 files changed, 19 insertions, 20 deletions
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index ec3c25ab87..46bd981999 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -9,7 +9,7 @@ <div class="runner-basic-info"> <div class="field gt-dib gt-mr-4"> <label>{{.locale.Tr "actions.runners.status"}}</label> - <span class="runner-status-{{if .Runner.IsOnline}}online{{else}}offline{{end}}">{{.Runner.StatusLocaleName $.locale}}</span> + <span class="ui {{if .Runner.IsOnline}}green{{else}}basic{{end}} label">{{.Runner.StatusLocaleName $.locale}}</span> </div> <div class="field gt-dib gt-mr-4"> <label>{{.locale.Tr "actions.runners.last_online"}}</label> diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index ead260f128..8c01766edd 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -1,17 +1,16 @@ <div class="runner-container"> <h4 class="ui top attached header"> - {{.locale.Tr "actions.runners.runner_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) + {{ctx.Locale.Tr "actions.runners.runner_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) <div class="ui right"> <div class="ui top right pointing dropdown"> <button class="ui primary tiny button"> - {{.locale.Tr "actions.runners.new"}} + {{ctx.Locale.Tr "actions.runners.new"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} </button> <div class="menu"> <div class="item"> - {{/* TODO: replece the document link when there's a better one than the README of act_runner */}} - <a href="https://gitea.com/gitea/act_runner/src/branch/main/README.md">{{.locale.Tr "actions.runners.new_notice"}}</a> + <a href="https://docs.gitea.com/usage/actions/act-runner">{{ctx.Locale.Tr "actions.runners.new_notice"}}</a> </div> <div class="divider"></div> <div class="header"> @@ -19,13 +18,13 @@ </div> <div class="ui input"> <input type="text" value="{{.RegistrationToken}}"> - <button class="ui basic label button" aria-label="{{.locale.Tr "copy"}}" data-clipboard-text="{{.RegistrationToken}}"> + <button class="ui basic label button" aria-label="{{ctx.Locale.Tr "copy"}}" data-clipboard-text="{{.RegistrationToken}}"> {{svg "octicon-copy" 14}} </button> </div> <div class="divider"></div> <div class="item"> - <a href="{{$.Link}}/reset_registration_token">Reset registration token</a> + <a href="{{$.Link}}/reset_registration_token">{{ctx.Locale.Tr "actions.runners.reset_registration_token"}}</a> </div> </div> </div> @@ -37,7 +36,7 @@ <!-- Search Text --> <div class="ui fluid action input"> {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} - <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> + <button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button> </div> </form> </div> @@ -46,22 +45,22 @@ <thead> <tr> <th data-sortt-asc="online" data-sortt-desc="offline"> - {{.locale.Tr "actions.runners.status"}} + {{ctx.Locale.Tr "actions.runners.status"}} {{SortArrow "online" "offline" .SortType false}} </th> <th data-sortt-asc="newest" data-sortt-desc="oldest"> - {{.locale.Tr "actions.runners.id"}} + {{ctx.Locale.Tr "actions.runners.id"}} {{SortArrow "oldest" "newest" .SortType false}} </th> <th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically"> - {{.locale.Tr "actions.runners.name"}} + {{ctx.Locale.Tr "actions.runners.name"}} {{SortArrow "alphabetically" "reversealphabetically" .SortType false}} </th> - <th>{{.locale.Tr "actions.runners.version"}}</th> - <th>{{.locale.Tr "actions.runners.owner_type"}}</th> - <th>{{.locale.Tr "actions.runners.labels"}}</th> - <th>{{.locale.Tr "actions.runners.last_online"}}</th> - <th>{{.locale.Tr "edit"}}</th> + <th>{{ctx.Locale.Tr "actions.runners.version"}}</th> + <th>{{ctx.Locale.Tr "actions.runners.owner_type"}}</th> + <th>{{ctx.Locale.Tr "actions.runners.labels"}}</th> + <th>{{ctx.Locale.Tr "actions.runners.last_online"}}</th> + <th>{{ctx.Locale.Tr "edit"}}</th> </tr> </thead> <tbody> @@ -69,16 +68,16 @@ {{range .Runners}} <tr> <td> - <span class="runner-status-{{if .IsOnline}}online{{else}}offline{{end}}">{{.StatusLocaleName $.locale}}</span> + <span class="ui {{if .IsOnline}}green{{else}}basic{{end}} label">{{.StatusLocaleName $.locale}}</span> </td> <td>{{.ID}}</td> <td><p data-tooltip-content="{{.Description}}">{{.Name}}</p></td> - <td>{{if .Version}}{{.Version}}{{else}}{{$.locale.Tr "unknown"}}{{end}}</td> + <td>{{if .Version}}{{.Version}}{{else}}{{ctx.Locale.Tr "unknown"}}{{end}}</td> <td><span data-tooltip-content="{{.BelongsToOwnerName}}">{{.BelongsToOwnerType.LocaleString $.locale}}</span></td> <td class="runner-tags"> {{range .AgentLabels}}<span class="ui label">{{.}}</span>{{end}} </td> - <td>{{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}}</td> + <td>{{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}</td> <td class="runner-ops"> {{if .Editable $.RunnerOwnerID $.RunnerRepoID}} <a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a> @@ -88,7 +87,7 @@ {{end}} {{else}} <tr> - <td class="center aligned" colspan="6">{{.locale.Tr "actions.runners.none"}}</td> + <td class="center aligned" colspan="8">{{ctx.Locale.Tr "actions.runners.none"}}</td> </tr> {{end}} </tbody> |