Skip to content

Commit 491f36d

Browse files
silverwindGiteaBot
silverwind
and
GiteaBot
authored
Actions list enhancements (go-gitea#25601) (go-gitea#25678)
Backport go-gitea#25601 to 1.20. Various small enhancements to the actions list. Before and after: <img width="1264" alt="Screenshot 2023-06-30 at 00 11 40" src="https://github.com/go-gitea/gitea/assets/115237/bb4162ee-cdcf-4a73-b05e-f9521562edbb"> <img width="1264" alt="Screenshot 2023-06-30 at 00 09 51" src="https://github.com/go-gitea/gitea/assets/115237/52a70ea9-4bb3-406e-904b-0fdaafde9582"> Co-authored-by: Giteabot <[email protected]>
1 parent 9111d2d commit 491f36d

File tree

9 files changed

+51
-36
lines changed

9 files changed

+51
-36
lines changed

‎options/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3458,7 +3458,7 @@ runners.reset_registration_token_success = Runner registration token reset succe
34583458
34593459
runs.all_workflows = All Workflows
34603460
runs.commit = Commit
3461-
runs.pushed_by = Pushed by
3461+
runs.pushed_by = pushed by
34623462
runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s
34633463
runs.no_matching_runner_helper = No matching runner: %s
34643464

‎templates/package/shared/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
1717
{{range .PackageDescriptors}}
1818
<li class="item gt-df gt-py-3">
19-
<div class="issue-item-main gt-f1 gt-fc gt-df">
19+
<div class="issue-item-main">
2020
<div class="issue-item-top-row">
2121
<a class="title" href="{{.FullWebLink}}">{{.Package.Name}}</a>
2222
<span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span>
2323
</div>
24-
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
24+
<div class="desc issue-item-bottom-row">
2525
{{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}}
2626
{{$hasRepositoryAccess := false}}
2727
{{if .Repository}}

‎templates/package/shared/versionlist.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
2323
{{range .PackageDescriptors}}
2424
<li class="item gt-df gt-py-3">
25-
<div class="issue-item-main gt-f1 gt-fc gt-df">
25+
<div class="issue-item-main">
2626
<div class="issue-item-top-row">
2727
<a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a>
2828
</div>
29-
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
29+
<div class="desc issue-item-bottom-row">
3030
{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
3131
</div>
3232
</div>

‎templates/repo/actions/list.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<div class="four wide column">
77
<div class="ui fluid vertical menu">
88
<a class="item{{if not $.CurWorkflow}} active{{end}}" href="{{$.Link}}">{{.locale.Tr "actions.runs.all_workflows"}}</a>
9-
<div class="divider"></div>
109
{{range .workflows}}
1110
<a class="item{{if eq .Entry.Name $.CurWorkflow}} active{{end}}" href="{{$.Link}}?workflow={{.Entry.Name}}">{{.Entry.Name}}
1211
{{if .ErrMsg}}

‎templates/repo/actions/runs_list.tmpl

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
<div class="issue list gt-m-0">
22
{{range .Runs}}
3-
<li class="item gt-df gt-py-3 gt-ab">
4-
<div class="issue-item-left gt-df gt-mr-2">
3+
<li class="item gt-df gt-py-3">
4+
<div class="issue-item-left issue-item-icon gt-df gt-items-start">
55
{{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
66
</div>
7-
<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
7+
<div class="issue-item-main action-item-main">
88
<div class="issue-item-top-row">
9-
<a class="index gt-ml-0 gt-mr-2" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
9+
<a class="index gt-no-underline title action-item-title" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
1010
{{- .Title -}}
1111
</a>
1212
</div>
13-
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
14-
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
15-
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>{{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}}
16-
<span class="ui label">
17-
{{if .RefLink}}
18-
<a href="{{.RefLink}}">{{.PrettyRef}}</a>
19-
{{else}}
20-
{{.PrettyRef}}
21-
{{end}}
22-
</span>
13+
<div class="desc issue-item-bottom-row">
14+
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>
15+
: {{$.locale.Tr "actions.runs.commit"}}
16+
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>
17+
{{$.locale.Tr "actions.runs.pushed_by"}}
18+
<a href="{{.TriggerUser.HomeLink}}">{{.TriggerUser.GetDisplayName}}</a>
2319
</div>
2420
</div>
25-
<div class="issue-item-right">
26-
<div>{{TimeSinceUnix .Updated $.locale}}</div>
27-
<div>{{.Duration}}</div>
21+
<div class="action-item-center">
22+
{{if .RefLink}}
23+
<a class="ui label gt-px-2 gt-mx-0" href="{{.RefLink}}">{{.PrettyRef}}</a>
24+
{{else}}
25+
<span class="ui label gt-px-2 gt-mx-0">{{.PrettyRef}}</span>
26+
{{end}}
27+
</div>
28+
<div class="action-item-right">
29+
<div>{{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}</div>
30+
<div>{{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}</div>
2831
</div>
2932
</li>
3033
{{end}}

‎templates/shared/issuelist.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{template "shared/issueicon" .}}
1111
</div>
1212
</div>
13-
<div class="issue-item-main gt-f1 gt-fc gt-df">
13+
<div class="issue-item-main">
1414
<div class="issue-item-top-row">
1515
<a class="title gt-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
1616
{{if .IsPull}}
@@ -24,7 +24,7 @@
2424
{{end}}
2525
</span>
2626
</div>
27-
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
27+
<div class="desc issue-item-bottom-row">
2828
<a class="index gt-ml-0 gt-mr-2" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
2929
{{if eq $.listType "dashboard"}}
3030
{{.Repo.FullName}}#{{.Index}}

‎web_src/css/base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,6 +1721,7 @@ i.icon.centerlock {
17211721

17221722
.ui.label {
17231723
padding: 0.3em 0.5em;
1724+
transition: none;
17241725
}
17251726

17261727
.ui.label,

‎web_src/css/shared/issuelist.css

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,24 @@
1717
}
1818

1919
.issue.list > .item .issue-item-main {
20-
width: 100%;
20+
flex: 1;
21+
display: flex;
22+
flex-direction: column;
2123
}
2224

23-
.issue.list > .item .action-item-main {
24-
width: 80%;
25+
.issue.list > .item .action-item-center {
26+
display: flex;
27+
align-items: center;
28+
padding-left: 4px;
29+
padding-right: 12px;
2530
}
2631

27-
.issue.list > .item .issue-item-right {
28-
width: 15%;
32+
.issue.list > .item .action-item-right {
33+
flex: 0 0 15%;
34+
display: flex;
35+
flex-direction: column;
36+
gap: 3px;
37+
color: var(--color-text-light);
2938
}
3039

3140
.issue.list > .item .issue-item-top-row {
@@ -52,6 +61,10 @@
5261

5362
.issue.list > .item .issue-item-bottom-row {
5463
font-size: 13px;
64+
display: flex;
65+
align-items: center;
66+
flex-wrap: wrap;
67+
margin: .125rem 0;
5568
}
5669

5770
.issue.list > .item .title {

‎web_src/js/components/RepoActionView.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
</div>
2121
<div class="action-commit-summary">
2222
{{ run.commit.localeCommit }}
23-
<a :href="run.commit.link">{{ run.commit.shortSHA }}</a>
23+
<a class="muted" :href="run.commit.link">{{ run.commit.shortSHA }}</a>
24+
{{ run.commit.localePushedBy }}
25+
<a class="muted" :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
2426
<span class="ui label" v-if="run.commit.shortSHA">
2527
<a :href="run.commit.branch.link">{{ run.commit.branch.name }}</a>
2628
</span>
27-
{{ run.commit.localePushedBy }}
28-
<a :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
2929
</div>
3030
</div>
3131
<div class="action-view-body">
@@ -525,7 +525,6 @@ export function ansiLogToHTML(line) {
525525
526526
.action-view-header {
527527
margin-top: 8px;
528-
margin-bottom: 4px;
529528
}
530529
531530
.action-info-summary {
@@ -540,14 +539,14 @@ export function ansiLogToHTML(line) {
540539
541540
.action-info-summary-title-text {
542541
font-size: 20px;
543-
margin: 0 0 0 5px;
542+
margin: 0 0 0 8px;
544543
flex: 1;
545544
}
546545
547546
.action-commit-summary {
548547
display: flex;
549548
gap: 5px;
550-
margin: 5px 0 0 25px;
549+
margin: 0 0 0 28px;
551550
}
552551
553552
.action-view-left, .action-view-right {

0 commit comments

Comments
 (0)