Skip to content

Make labels clickable in the comments section. #21137

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

Merged
merged 11 commits into from
Sep 12, 2022
Merged

Make labels clickable in the comments section. #21137

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da88ab6
Make labels clickable in the comments section.
BlenderDefender Sep 10, 2022
672de0e
Update patch to make sure to produce valid links
BlenderDefender Sep 10, 2022
ace82be
fix: build fails because of missing return statement.
BlenderDefender Sep 10, 2022
dae2507
small changes
wxiaoguang Sep 11, 2022
c0d4c87
revert label nil check
wxiaoguang Sep 11, 2022
36764c6
Merge branch 'main' into main
wxiaoguang Sep 11, 2022
fc34828
fine tune sprintf
wxiaoguang Sep 11, 2022
84fb6ac
Merge branch 'main' into main
wxiaoguang Sep 11, 2022
8ac78f3
Merge branch 'main' into main
6543 Sep 11, 2022
7d6b5d1
Merge branch 'main' into main
6543 Sep 11, 2022
e972dcc
Merge branch 'main' into main
techknowlogick Sep 12, 2022
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
14 changes: 9 additions & 5 deletions modules/templates/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,18 +376,22 @@ func NewFuncMap() []template.FuncMap {
// the table is NOT sorted with this header
return ""
},
"RenderLabels": func(labels []*issues_model.Label) template.HTML {
"RenderLabels": func(labels []*issues_model.Label, repoLink string) template.HTML {
html := `<span class="labels-list">`
for _, label := range labels {
// Protect against nil value in labels - shouldn't happen but would cause a panic if so
if label == nil {
continue
}
html += fmt.Sprintf("<div class='ui label' style='color: %s; background-color: %s'>%s</div> ",
label.ForegroundColor(), label.Color, RenderEmoji(label.Name))

// Prevent invalid links.
if !strings.HasSuffix(repoLink, "/") {
repoLink += "/"
}

html += fmt.Sprintf("<a href='%s' class='ui label' style='color: %s; background-color: %s'>%s</a> ",
repoLink+"issues?labels="+strconv.FormatInt(label.ID, 10), label.ForegroundColor(), label.Color, RenderEmoji(label.Name))
}
html += "</span>"
return template.HTML(html)
},
"MermaidMaxSourceCharacters": func() int {
return setting.MermaidMaxSourceCharacters
Expand Down
6 changes: 3 additions & 3 deletions templates/repo/issue/view_content/comments.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@
<span class="text grey">
{{template "shared/user/authorlink" .Poster}}
{{if and .AddedLabels (not .RemovedLabels)}}
{{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels) $createdStr | Safe}}
{{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels $.RepoLink) $createdStr | Safe}}
{{else if and (not .AddedLabels) .RemovedLabels}}
{{$.locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels .RemovedLabels) $createdStr | Safe}}
{{$.locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels .RemovedLabels $.RepoLink) $createdStr | Safe}}
{{else}}
{{$.locale.Tr "repo.issues.add_remove_labels" (RenderLabels .AddedLabels) (RenderLabels .RemovedLabels) $createdStr | Safe}}
{{$.locale.Tr "repo.issues.add_remove_labels" (RenderLabels .AddedLabels $.RepoLink) (RenderLabels .RemovedLabels $.RepoLink) $createdStr | Safe}}
{{end}}
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ a.ui.card:hover,
&.grey {
color: var(--color-text-light) !important;

a {
a:not(.label) {
color: var(--color-text) !important;

&:hover {
Expand Down