Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actions list enhancements #25601

Merged
merged 16 commits into from
Jul 4, 2023
Merged

Actions list enhancements #25601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e3e0dd4
Actions list enhancements
silverwind Jun 29, 2023
b9b598a
Merge branch 'main' into actlist
GiteaBot Jun 30, 2023
3875c4a
Merge branch 'main' into actlist
silverwind Jul 3, 2023
fc82382
misc tweaks, add author link
silverwind Jul 3, 2023
dfb4606
Merge branch 'main' into actlist
GiteaBot Jul 3, 2023
5303415
Merge branch 'main' into actlist
GiteaBot Jul 3, 2023
3f8150a
align
silverwind Jul 3, 2023
7b31654
move branch ref to own column, remove label transition
silverwind Jul 3, 2023
e886eeb
tweak single actions view header
silverwind Jul 3, 2023
cb5f084
move shared styles into issue-item-main
silverwind Jul 3, 2023
54fe4d5
move some issue-list styles to css
silverwind Jul 3, 2023
d4a8e81
reduce gap to not increase row height
silverwind Jul 3, 2023
2f075d4
fix template lint
silverwind Jul 4, 2023
e339cf3
Merge branch 'main' into actlist
GiteaBot Jul 4, 2023
b433afd
Merge branch 'main' into actlist
GiteaBot Jul 4, 2023
952ca1d
Merge branch 'main' into actlist
GiteaBot Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3463,7 +3463,7 @@ runners.reset_registration_token_success = Runner registration token reset succe

runs.all_workflows = All Workflows
runs.commit = Commit
runs.pushed_by = Pushed by
runs.pushed_by = pushed by
runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s
runs.no_matching_runner_helper = No matching runner: %s
runs.actor = Actor
Expand Down
4 changes: 2 additions & 2 deletions templates/package/shared/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
{{range .PackageDescriptors}}
<li class="item gt-df gt-py-3">
<div class="issue-item-main gt-f1 gt-fc gt-df">
<div class="issue-item-main">
<div class="issue-item-top-row">
<a class="title" href="{{.FullWebLink}}">{{.Package.Name}}</a>
<span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span>
</div>
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
<div class="desc issue-item-bottom-row">
{{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}}
{{$hasRepositoryAccess := false}}
{{if .Repository}}
Expand Down
4 changes: 2 additions & 2 deletions templates/package/shared/versionlist.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
{{range .PackageDescriptors}}
<li class="item gt-df gt-py-3">
<div class="issue-item-main gt-f1 gt-fc gt-df">
<div class="issue-item-main">
<div class="issue-item-top-row">
<a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a>
</div>
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
<div class="desc issue-item-bottom-row">
{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion templates/repo/actions/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<div class="four wide column">
<div class="ui fluid vertical menu">
<a class="item{{if not $.CurWorkflow}} active{{end}}" href="{{$.Link}}?actor={{$.CurActor}}&status={{$.CurStatus}}">{{.locale.Tr "actions.runs.all_workflows"}}</a>
<div class="divider"></div>
{{range .workflows}}
<a class="item{{if eq .Entry.Name $.CurWorkflow}} active{{end}}" href="{{$.Link}}?workflow={{.Entry.Name}}&actor={{$.CurActor}}&status={{$.CurStatus}}">{{.Entry.Name}}
{{if .ErrMsg}}
Expand Down
35 changes: 19 additions & 16 deletions templates/repo/actions/runs_list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,34 @@
</div>
{{end}}
{{range .Runs}}
<li class="item gt-df gt-py-4">
<li class="item gt-df gt-py-3">
<div class="issue-item-left issue-item-icon gt-df gt-items-start">
{{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
</div>
<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
<div class="issue-item-top-row gt-mb-2">
<div class="issue-item-main action-item-main">
<div class="issue-item-top-row">
<a class="index gt-no-underline title action-item-title" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
{{- .Title -}}
</a>
</div>
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw">
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>{{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}}
<span class="ui label">
{{if .RefLink}}
<a href="{{.RefLink}}">{{.PrettyRef}}</a>
{{else}}
{{.PrettyRef}}
{{end}}
</span>
<div class="desc issue-item-bottom-row">
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>
: {{$.locale.Tr "actions.runs.commit"}}
silverwind marked this conversation as resolved.
Show resolved Hide resolved
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>
{{$.locale.Tr "actions.runs.pushed_by"}}
<a href="{{.TriggerUser.HomeLink}}">{{.TriggerUser.GetDisplayName}}</a>
silverwind marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
<div class="issue-item-right">
<div>{{TimeSinceUnix .Updated $.locale}}</div>
<div>{{.Duration}}</div>
<div class="action-item-center">
{{if .RefLink}}
<a class="ui label gt-px-2 gt-mx-0" href="{{.RefLink}}">{{.PrettyRef}}</a>
{{else}}
<span class="ui label gt-px-2 gt-mx-0">{{.PrettyRef}}</span>
{{end}}
silverwind marked this conversation as resolved.
Show resolved Hide resolved
</div>
<div class="action-item-right">
<div>{{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}</div>
<div>{{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}</div>
</div>
</li>
{{end}}
Expand Down
4 changes: 2 additions & 2 deletions templates/shared/issuelist.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{template "shared/issueicon" .}}
</div>
</div>
<div class="issue-item-main gt-f1 gt-fc gt-df">
<div class="issue-item-main">
<div class="issue-item-top-row">
<a class="title gt-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
{{if .IsPull}}
Expand All @@ -24,7 +24,7 @@
{{end}}
</span>
</div>
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
<div class="desc issue-item-bottom-row">
<a class="index gt-ml-0 gt-mr-2" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
{{if eq $.listType "dashboard"}}
{{.Repo.FullName}}#{{.Index}}
Expand Down
1 change: 1 addition & 0 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,6 +1633,7 @@ i.icon.centerlock {

.ui.label {
padding: 0.3em 0.5em;
transition: none;
}

.ui.label,
Expand Down
23 changes: 18 additions & 5 deletions web_src/css/shared/issuelist.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,24 @@
}

.issue.list > .item .issue-item-main {
width: 100%;
flex: 1;
display: flex;
flex-direction: column;
}

.issue.list > .item .action-item-main {
width: 80%;
.issue.list > .item .action-item-center {
display: flex;
align-items: center;
padding-left: 4px;
padding-right: 12px;
}

.issue.list > .item .issue-item-right {
width: 15%;
.issue.list > .item .action-item-right {
flex: 0 0 15%;
display: flex;
flex-direction: column;
gap: 3px;
color: var(--color-text-light);
}

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

.issue.list > .item .issue-item-bottom-row {
font-size: 13px;
display: flex;
align-items: center;
flex-wrap: wrap;
margin: .125rem 0;
}

.issue.list > .item .title {
Expand Down
11 changes: 5 additions & 6 deletions web_src/js/components/RepoActionView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
</div>
<div class="action-commit-summary">
{{ run.commit.localeCommit }}
<a :href="run.commit.link">{{ run.commit.shortSHA }}</a>
<a class="muted" :href="run.commit.link">{{ run.commit.shortSHA }}</a>
{{ run.commit.localePushedBy }}
<a class="muted" :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
<span class="ui label" v-if="run.commit.shortSHA">
<a :href="run.commit.branch.link">{{ run.commit.branch.name }}</a>
</span>
{{ run.commit.localePushedBy }}
<a :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
</div>
</div>
<div class="action-view-body">
Expand Down Expand Up @@ -507,7 +507,6 @@ export function initRepositoryActionView() {

.action-view-header {
margin-top: 8px;
margin-bottom: 4px;
}

.action-info-summary {
Expand All @@ -522,14 +521,14 @@ export function initRepositoryActionView() {

.action-info-summary-title-text {
font-size: 20px;
margin: 0 0 0 5px;
margin: 0 0 0 8px;
flex: 1;
}

.action-commit-summary {
display: flex;
gap: 5px;
margin: 5px 0 0 25px;
margin: 0 0 0 28px;
}

.action-view-left, .action-view-right {
Expand Down