Skip to content

Commit 0006169

Browse files
silverwindGiteaBot
silverwind
and
GiteaBot
authored
Actions list enhancements (#25601)
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 9958642 commit 0006169

File tree

9 files changed

+50
-35
lines changed

9 files changed

+50
-35
lines changed

‎options/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3463,7 +3463,7 @@ runners.reset_registration_token_success = Runner registration token reset succe
34633463
34643464
runs.all_workflows = All Workflows
34653465
runs.commit = Commit
3466-
runs.pushed_by = Pushed by
3466+
runs.pushed_by = pushed by
34673467
runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s
34683468
runs.no_matching_runner_helper = No matching runner: %s
34693469
runs.actor = Actor

‎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}}?actor={{$.CurActor}}&status={{$.CurStatus}}">{{.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}}&actor={{$.CurActor}}&status={{$.CurStatus}}">{{.Entry.Name}}
1211
{{if .ErrMsg}}

‎templates/repo/actions/runs_list.tmpl

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,34 @@
66
</div>
77
{{end}}
88
{{range .Runs}}
9-
<li class="item gt-df gt-py-4">
9+
<li class="item gt-df gt-py-3">
1010
<div class="issue-item-left issue-item-icon gt-df gt-items-start">
1111
{{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
1212
</div>
13-
<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
14-
<div class="issue-item-top-row gt-mb-2">
13+
<div class="issue-item-main action-item-main">
14+
<div class="issue-item-top-row">
1515
<a class="index gt-no-underline title action-item-title" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
1616
{{- .Title -}}
1717
</a>
1818
</div>
19-
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw">
20-
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
21-
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>{{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}}
22-
<span class="ui label">
23-
{{if .RefLink}}
24-
<a href="{{.RefLink}}">{{.PrettyRef}}</a>
25-
{{else}}
26-
{{.PrettyRef}}
27-
{{end}}
28-
</span>
19+
<div class="desc issue-item-bottom-row">
20+
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>
21+
: {{$.locale.Tr "actions.runs.commit"}}
22+
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>
23+
{{$.locale.Tr "actions.runs.pushed_by"}}
24+
<a href="{{.TriggerUser.HomeLink}}">{{.TriggerUser.GetDisplayName}}</a>
2925
</div>
3026
</div>
31-
<div class="issue-item-right">
32-
<div>{{TimeSinceUnix .Updated $.locale}}</div>
33-
<div>{{.Duration}}</div>
27+
<div class="action-item-center">
28+
{{if .RefLink}}
29+
<a class="ui label gt-px-2 gt-mx-0" href="{{.RefLink}}">{{.PrettyRef}}</a>
30+
{{else}}
31+
<span class="ui label gt-px-2 gt-mx-0">{{.PrettyRef}}</span>
32+
{{end}}
33+
</div>
34+
<div class="action-item-right">
35+
<div>{{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}</div>
36+
<div>{{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}</div>
3437
</div>
3538
</li>
3639
{{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
@@ -1633,6 +1633,7 @@ i.icon.centerlock {
16331633

16341634
.ui.label {
16351635
padding: 0.3em 0.5em;
1636+
transition: none;
16361637
}
16371638

16381639
.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">
@@ -507,7 +507,6 @@ export function initRepositoryActionView() {
507507
508508
.action-view-header {
509509
margin-top: 8px;
510-
margin-bottom: 4px;
511510
}
512511
513512
.action-info-summary {
@@ -522,14 +521,14 @@ export function initRepositoryActionView() {
522521
523522
.action-info-summary-title-text {
524523
font-size: 20px;
525-
margin: 0 0 0 5px;
524+
margin: 0 0 0 8px;
526525
flex: 1;
527526
}
528527
529528
.action-commit-summary {
530529
display: flex;
531530
gap: 5px;
532-
margin: 5px 0 0 25px;
531+
margin: 0 0 0 28px;
533532
}
534533
535534
.action-view-left, .action-view-right {

0 commit comments

Comments
 (0)