From b758241f28bb980c8c812e29bcdc4d8d2943e8d1 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Wed, 23 Apr 2025 23:34:18 +0800
Subject: [PATCH] Fix runner list tmpl (#34270)
Fix #34269
And fix some layout problems.
---
templates/shared/actions/runner_list.tmpl | 18 +++++++-----------
web_src/css/actions.css | 8 --------
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index b8f31de43b..43321a8dc5 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -64,27 +64,23 @@
</tr>
</thead>
<tbody>
- {{if .Runners}}
- {{range .Runners}}
+ {{range .Runners}}
<tr>
- <td>
- <span class="ui {{if .IsOnline}}green{{end}} label">{{.StatusLocaleName ctx.Locale}}</span>
- </td>
+ <td><span class="ui label {{if .IsOnline}}green{{end}}">{{.StatusLocaleName ctx.Locale}}</span></td>
<td>{{.ID}}</td>
<td><p data-tooltip-content="{{.Description}}">{{.Name}}</p></td>
<td>{{if .Version}}{{.Version}}{{else}}{{ctx.Locale.Tr "unknown"}}{{end}}</td>
<td><span data-tooltip-content="{{.BelongsToOwnerName}}">{{.BelongsToOwnerType.LocaleString ctx.Locale}}</span></td>
- <td class="tw-flex tw-flex-wrap tw-gap-2 runner-tags">
- {{range .AgentLabels}}<span class="ui label">{{.}}</span>{{end}}
+ <td>
+ <span class="flex-text-inline">{{range .AgentLabels}}<span class="ui label">{{.}}</span>{{end}}</span>
</td>
<td>{{if .LastOnline}}{{DateUtils.TimeSince .LastOnline}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}</td>
- <td class="runner-ops">
- {{if .Editable $.RunnerOwnerID $.RunnerRepoID}}
- <a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a>
+ <td>
+ {{if .EditableInContext $.RunnerOwnerID $.RunnerRepoID}}
+ <a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a>
{{end}}
</td>
</tr>
- {{end}}
{{else}}
<tr>
<td class="tw-text-center" colspan="8">{{ctx.Locale.Tr "actions.runners.none"}}</td>
diff --git a/web_src/css/actions.css b/web_src/css/actions.css
index 0ab09f537a..665893a287 100644
--- a/web_src/css/actions.css
+++ b/web_src/css/actions.css
@@ -6,14 +6,6 @@
overflow-x: auto;
}
-.runner-container .runner-ops > a {
- margin-left: 0.5em;
-}
-
-.runner-container .runner-ops-delete {
- color: var(--color-red-light);
-}
-
.runner-container .runner-new-text {
color: var(--color-white);
}