From 5c35d88110a364c980b7b3c6a67a404f80db8195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?= Date: Sat, 10 Feb 2024 00:34:42 +0100 Subject: [PATCH] enhancement: shows divider --- modules/templates/util_render.go | 6 +++--- templates/shared/issue_dependency.tmpl | 2 +- templates/shared/issuelist.tmpl | 6 +++--- web_src/css/repo/issue-list.css | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index ead41faa32e..d4d34418c5d 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -226,11 +226,11 @@ func RenderLabels(ctx context.Context, labels []*issues_model.Label, repoLink st } func RenderDependencies(ctx context.Context, dependencies []*issues_model.DependencyInfo) template.HTML { - if dependencies == nil || len(dependencies) < 1 { + if len(dependencies) == 0 { return "" } - htmlCode := "" + htmlCode := "" for index, dependency := range dependencies { if index != 0 { @@ -240,5 +240,5 @@ func RenderDependencies(ctx context.Context, dependencies []*issues_model.Depend dependency.Issue.Link(), dependency.Issue.Index, RenderEmoji(ctx, dependency.Issue.Title), dependency.Issue.Index) } - return template.HTML(htmlCode) + return template.HTML(htmlCode + "") } diff --git a/templates/shared/issue_dependency.tmpl b/templates/shared/issue_dependency.tmpl index 481cba8229b..e97e8550849 100644 --- a/templates/shared/issue_dependency.tmpl +++ b/templates/shared/issue_dependency.tmpl @@ -1,5 +1,5 @@ {{if .Dependencies}} -
+
{{(ctx.Locale.Tr .TitleKey (RenderDependencies ctx .Dependencies)) | Safe}}
{{end}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index b040a9083d4..00fe09adaf0 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -118,12 +118,12 @@ {{end}} - {{template "shared/issue_dependency" (dict - "Dependencies" (index $.BlockingDependenciesMap .ID) - "TitleKey" "repo.issues.dependency.blocks_following")}} {{template "shared/issue_dependency" (dict "Dependencies" (index $.BlockedByDependenciesMap .ID) "TitleKey" "repo.issues.dependency.blocked_by_following")}} + {{template "shared/issue_dependency" (dict + "Dependencies" (index $.BlockingDependenciesMap .ID) + "TitleKey" "repo.issues.dependency.blocks_following")}} {{if .IsPull}} {{$approveOfficial := call $approvalCounts .ID "approve"}} {{$rejectOfficial := call $approvalCounts .ID "reject"}} diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 1421577af2a..264ec27abca 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -82,6 +82,10 @@ background-color: var(--color-secondary-dark-4); } +#issue-list .flex-item-body > .flex-text-inline::before { + content: '|'; +} + .archived-label-filter { margin-left: 10px; font-size: 12px;