From 8281ea2d6f4db851f81ef12336eddd31b27c1245 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 31 Jul 2022 22:14:47 +0100 Subject: [PATCH 1/6] Do not add links to Posters or Assignees with ID < 0 Fix #20559 Signed-off-by: Andrew Thornton --- .../repo/issue/view_content/comments.tmpl | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index e284d5aef5e9c..7f771522c1b5b 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -17,7 +17,7 @@ {{if .OriginalAuthor }} {{else}} - + {{avatar .Poster}} {{end}} @@ -37,7 +37,7 @@ {{else}} {{if gt .Poster.ID 0}} - + {{avatar .Poster}} {{end}} @@ -96,11 +96,11 @@ {{else if eq .Type 1}}
{{svg "octicon-dot-fill"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if .Issue.IsPull }} {{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}} {{else}} @@ -111,11 +111,11 @@ {{else if eq .Type 2}}
{{svg "octicon-circle-slash"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if .Issue.IsPull }} {{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}} {{else}} @@ -126,11 +126,11 @@ {{else if eq .Type 28}}
{{svg "octicon-git-merge"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}} {{if eq $.Issue.PullRequest.Status 3}} {{$.locale.Tr "repo.issues.manually_pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}} @@ -155,12 +155,12 @@ {{ $createdStr:= TimeSinceUnix .CreatedUnix $.locale }}
{{svg "octicon-bookmark"}} - + {{avatar .Poster}} {{if eq .RefAction 3}}{{end}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr $refTr (.EventTag|Escape) $createdStr (.RefCommentHTMLURL|Escape) $refFrom | Safe}} {{if eq .RefAction 3}}{{end}} @@ -172,11 +172,11 @@ {{else if eq .Type 4}}
{{svg "octicon-bookmark"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
@@ -188,11 +188,11 @@ {{if or .AddedLabels .RemovedLabels}}
{{svg "octicon-tag"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if and .AddedLabels (not .RemovedLabels)}} {{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels) $createdStr | Safe}} {{else if and (not .AddedLabels) .RemovedLabels}} @@ -206,11 +206,11 @@ {{else if eq .Type 8}}
{{svg "octicon-milestone"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
@@ -219,11 +219,11 @@ {{svg "octicon-person"}} {{if gt .AssigneeID 0}} {{if .RemovedAssignee}} - + {{avatar .Assignee}} - {{.Assignee.GetDisplayName}} + {{.Assignee.GetDisplayName}} {{ if eq .Poster.ID .Assignee.ID }} {{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}} {{ else }} @@ -231,11 +231,11 @@ {{ end }} {{else}} - + {{avatar .Assignee}} - {{.Assignee.GetDisplayName}} + {{.Assignee.GetDisplayName}} {{if eq .Poster.ID .AssigneeID}} {{$.locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}} {{else}} @@ -248,44 +248,44 @@ {{else if eq .Type 10}}
{{svg "octicon-pencil"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
{{else if eq .Type 11}}
{{svg "octicon-git-branch"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
{{else if eq .Type 12}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
{{else if eq .Type 13}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} @@ -297,11 +297,11 @@ {{else if eq .Type 14}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}} {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} @@ -313,33 +313,33 @@ {{else if eq .Type 15}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
{{else if eq .Type 16}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
{{else if eq .Type 17}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$parsedDeadline := .Content | ParseDeadline}} {{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}} @@ -347,22 +347,22 @@ {{else if eq .Type 18}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
{{else if eq .Type 19}}
{{svg "octicon-package-dependents"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}} {{if .DependentIssue}} @@ -383,11 +383,11 @@ {{else if eq .Type 20}}
{{svg "octicon-package-dependents"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}} {{if .DependentIssue}} @@ -668,17 +668,17 @@ {{else if eq .Type 23}}
{{svg "octicon-lock"}} - + {{avatar .Poster}} {{ if .Content }} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}} {{ else }} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}} {{ end }} @@ -686,33 +686,33 @@ {{else if eq .Type 24}}
{{svg "octicon-key"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
{{else if eq .Type 25}}
{{svg "octicon-git-branch"}} - + {{avatar .Poster}} - {{.Poster.Name}} + {{.Poster.Name}} {{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
{{else if eq .Type 26}}
{{svg "octicon-clock"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}}
@@ -723,11 +723,11 @@ {{else if eq .Type 27}}
{{svg "octicon-eye"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if (gt .AssigneeID 0)}} {{if .RemovedAssignee}} {{if eq .PosterID .AssigneeID}} @@ -751,7 +751,7 @@
{{svg "octicon-repo-push"}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{ if .IsForcePush }} {{$.locale.Tr "repo.issues.force_push_codes" ($.Issue.PullRequest.HeadBranch|Escape) (ShortSha .OldCommit) (($.Issue.Repo.CommitLink .OldCommit)|Escape) (ShortSha .NewCommit) (($.Issue.Repo.CommitLink .NewCommit)|Escape) $createdStr | Safe}} {{else}} @@ -766,11 +766,11 @@ {{if not $.UnitProjectsGlobalDisabled}}
{{svg "octicon-project"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if gt .OldProjectID 0}} {{if gt .ProjectID 0}} {{$.locale.Tr "repo.issues.change_project_at" (.OldProject.Title|Escape) (.Project.Title|Escape) $createdStr | Safe}} @@ -825,11 +825,11 @@ {{else if eq .Type 33}}
{{svg "octicon-git-branch"}} - + {{avatar .Poster}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if and .OldRef .NewRef}} {{$.locale.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} {{else if .OldRef}} @@ -843,7 +843,7 @@
{{svg "octicon-git-merge" 16}} - {{.Poster.GetDisplayName}} + {{.Poster.GetDisplayName}} {{if eq .Type 34}}{{$.locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr | Safe}} {{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}} From 4d206d23441b1bc70f96ee9de3709c54652fe666 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 1 Aug 2022 08:37:19 +0100 Subject: [PATCH 2/6] Update templates/repo/issue/view_content/comments.tmpl --- templates/repo/issue/view_content/comments.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 7f771522c1b5b..8e5f74310f1bb 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -37,7 +37,7 @@ {{else}} {{if gt .Poster.ID 0}} - + {{avatar .Poster}} {{end}} From c8a425eb04d13170a0ac06cb3e1deb608e36570b Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 12 Aug 2022 21:22:08 +0100 Subject: [PATCH 3/6] use some common templates Signed-off-by: Andrew Thornton --- templates/org/team/teams.tmpl | 4 +- templates/repo/diff/comments.tmpl | 8 +- templates/repo/issue/new_form.tmpl | 4 +- .../repo/issue/view_content/comments.tmpl | 228 +++++++----------- templates/shared/user/authorlink.tmpl | 3 + templates/shared/user/avatarlink.tmpl | 3 + templates/shared/user/namelink.tmpl | 3 + 7 files changed, 104 insertions(+), 149 deletions(-) create mode 100644 templates/shared/user/authorlink.tmpl create mode 100644 templates/shared/user/avatarlink.tmpl create mode 100644 templates/shared/user/namelink.tmpl diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 465701d96ed2c..5399f3a594081 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -32,9 +32,7 @@
{{range .Members}} - - {{avatar .}} - + {{template "shared/user/avatarlink" .}} {{end}}
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 9905f09baac94..446ecaadefb47 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -5,9 +5,7 @@ {{if .OriginalAuthor }} {{else}} - - {{avatar .Poster}} - + {{template "shared/user/avatarlink" .Poster}} {{end}}
@@ -27,9 +25,7 @@ {{else}} - - {{.Poster.GetDisplayName}} - + {{template "shared/user/namelink" .Poster}} {{$.root.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 1f03014b542bb..01b351c611e52 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -8,9 +8,7 @@
- - {{avatar .SignedUser}} - + {{template "shared/user/avatarlink" .SignedUser}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 8e5f74310f1bb..344178cd1279d 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -96,11 +96,10 @@ {{else if eq .Type 1}}
{{svg "octicon-dot-fill"}} - - {{avatar .Poster}} - + {{template "shared/user/avatarlink" .Poster}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{if .Issue.IsPull }} {{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}} {{else}} @@ -111,11 +110,9 @@ {{else if eq .Type 2}}
{{svg "octicon-circle-slash"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{if .Issue.IsPull }} {{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}} {{else}} @@ -126,11 +123,9 @@ {{else if eq .Type 28}}
{{svg "octicon-git-merge"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}} {{if eq $.Issue.PullRequest.Status 3}} {{$.locale.Tr "repo.issues.manually_pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}} @@ -155,12 +150,10 @@ {{ $createdStr:= TimeSinceUnix .CreatedUnix $.locale }}
{{svg "octicon-bookmark"}} - - {{avatar .Poster}} - - {{if eq .RefAction 3}}{{end}} + {{template "shared/user/avatarlink" .Poster}} {{if eq .RefAction 3}}{{end}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr $refTr (.EventTag|Escape) $createdStr (.RefCommentHTMLURL|Escape) $refFrom | Safe}} {{if eq .RefAction 3}}{{end}} @@ -172,11 +165,9 @@ {{else if eq .Type 4}}
{{svg "octicon-bookmark"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
@@ -188,11 +179,9 @@ {{if or .AddedLabels .RemovedLabels}}
{{svg "octicon-tag"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{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}} {{else if and (not .AddedLabels) .RemovedLabels}} @@ -206,11 +195,9 @@ {{else if eq .Type 8}}
{{svg "octicon-milestone"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
@@ -219,9 +206,7 @@ {{svg "octicon-person"}} {{if gt .AssigneeID 0}} {{if .RemovedAssignee}} - - {{avatar .Assignee}} - + {{template "shared/user/avatarlink" .Assignee}} {{.Assignee.GetDisplayName}} {{ if eq .Poster.ID .Assignee.ID }} @@ -231,11 +216,10 @@ {{ end }} {{else}} - - {{avatar .Assignee}} - + {{template "shared/user/avatarlink" .Assignee}} - {{.Assignee.GetDisplayName}} + {{template "shared/user/authorlink" .Assignee}} + {{if eq .Poster.ID .AssigneeID}} {{$.locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}} {{else}} @@ -248,44 +232,36 @@ {{else if eq .Type 10}}
{{svg "octicon-pencil"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
{{else if eq .Type 11}}
{{svg "octicon-git-branch"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
{{else if eq .Type 12}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
{{else if eq .Type 13}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} @@ -297,11 +273,9 @@ {{else if eq .Type 14}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}} {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} @@ -313,33 +287,27 @@ {{else if eq .Type 15}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
{{else if eq .Type 16}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
{{else if eq .Type 17}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$parsedDeadline := .Content | ParseDeadline}} {{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}} @@ -347,22 +315,18 @@ {{else if eq .Type 18}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
{{else if eq .Type 19}}
{{svg "octicon-package-dependents"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}} {{if .DependentIssue}} @@ -383,11 +347,9 @@ {{else if eq .Type 20}}
{{svg "octicon-package-dependents"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}} {{if .DependentIssue}} @@ -424,7 +386,8 @@ {{if $.Repository.OriginalURL}} ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} {{else}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{end}} {{if eq .Review.Type 1}} @@ -455,7 +418,8 @@ {{if $.Repository.OriginalURL}} ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} {{else}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{end}} {{$.locale.Tr "repo.issues.review.left_comment" | Safe}} @@ -583,7 +547,8 @@ {{if $.Repository.OriginalURL}} ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} {{else}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{end}} {{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdSubStr | Safe}} @@ -668,17 +633,16 @@ {{else if eq .Type 23}}
{{svg "octicon-lock"}} - - {{avatar .Poster}} - - {{ if .Content }} + {{template "shared/user/avatarlink" .Poster}} {{ if .Content }} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}} {{ else }} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}} {{ end }} @@ -686,21 +650,16 @@ {{else if eq .Type 24}}
{{svg "octicon-key"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
{{else if eq .Type 25}}
{{svg "octicon-git-branch"}} - - {{avatar .Poster}} - - + {{template "shared/user/avatarlink" .Poster}} {{.Poster.Name}} {{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} @@ -708,11 +667,9 @@ {{else if eq .Type 26}}
{{svg "octicon-clock"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}}
@@ -723,11 +680,9 @@ {{else if eq .Type 27}}
{{svg "octicon-eye"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{if (gt .AssigneeID 0)}} {{if .RemovedAssignee}} {{if eq .PosterID .AssigneeID}} @@ -751,7 +706,8 @@
{{svg "octicon-repo-push"}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{ if .IsForcePush }} {{$.locale.Tr "repo.issues.force_push_codes" ($.Issue.PullRequest.HeadBranch|Escape) (ShortSha .OldCommit) (($.Issue.Repo.CommitLink .OldCommit)|Escape) (ShortSha .NewCommit) (($.Issue.Repo.CommitLink .NewCommit)|Escape) $createdStr | Safe}} {{else}} @@ -766,11 +722,9 @@ {{if not $.UnitProjectsGlobalDisabled}}
{{svg "octicon-project"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{if gt .OldProjectID 0}} {{if gt .ProjectID 0}} {{$.locale.Tr "repo.issues.change_project_at" (.OldProject.Title|Escape) (.Project.Title|Escape) $createdStr | Safe}} @@ -791,7 +745,8 @@ {{svg "octicon-x" 16}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{$reviewerName := ""}} {{if eq .Review.OriginalAuthor ""}} {{$reviewerName = .Review.Reviewer.Name}} @@ -825,11 +780,9 @@ {{else if eq .Type 33}}
{{svg "octicon-git-branch"}} - - {{avatar .Poster}} - - - {{.Poster.GetDisplayName}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} + {{if and .OldRef .NewRef}} {{$.locale.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} {{else if .OldRef}} @@ -843,7 +796,8 @@
{{svg "octicon-git-merge" 16}} - {{.Poster.GetDisplayName}} + {{template "shared/user/authorlink" .Poster}} + {{if eq .Type 34}}{{$.locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr | Safe}} {{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}} diff --git a/templates/shared/user/authorlink.tmpl b/templates/shared/user/authorlink.tmpl new file mode 100644 index 0000000000000..81c2a4ed5e508 --- /dev/null +++ b/templates/shared/user/authorlink.tmpl @@ -0,0 +1,3 @@ + + {{.GetDisplayName}} + diff --git a/templates/shared/user/avatarlink.tmpl b/templates/shared/user/avatarlink.tmpl new file mode 100644 index 0000000000000..40f5ee71297fe --- /dev/null +++ b/templates/shared/user/avatarlink.tmpl @@ -0,0 +1,3 @@ + + {{avatar .}} + diff --git a/templates/shared/user/namelink.tmpl b/templates/shared/user/namelink.tmpl new file mode 100644 index 0000000000000..25dff36a78802 --- /dev/null +++ b/templates/shared/user/namelink.tmpl @@ -0,0 +1,3 @@ + + {{.GetDisplayName}} + From bcffc12ed42156d604ca8a4e1b78f7285cae3f4e Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 12 Aug 2022 21:56:31 +0100 Subject: [PATCH 4/6] fix spans Signed-off-by: Andrew Thornton --- .../repo/issue/view_content/comments.tmpl | 63 ++++++++++++------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 344178cd1279d..c7677de759d39 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -110,7 +110,8 @@ {{else if eq .Type 2}}
{{svg "octicon-circle-slash"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{if .Issue.IsPull }} @@ -123,7 +124,8 @@ {{else if eq .Type 28}}
{{svg "octicon-git-merge"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}} @@ -165,7 +167,8 @@ {{else if eq .Type 4}}
{{svg "octicon-bookmark"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}} @@ -195,7 +198,8 @@ {{else if eq .Type 8}}
{{svg "octicon-milestone"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}} @@ -232,7 +236,8 @@ {{else if eq .Type 10}}
{{svg "octicon-pencil"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}} @@ -241,7 +246,8 @@ {{else if eq .Type 11}}
{{svg "octicon-git-branch"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}} @@ -250,7 +256,8 @@ {{else if eq .Type 12}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}} @@ -259,7 +266,8 @@ {{else if eq .Type 13}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} @@ -273,7 +281,8 @@ {{else if eq .Type 14}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}} @@ -287,7 +296,8 @@ {{else if eq .Type 15}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}} @@ -296,7 +306,8 @@ {{else if eq .Type 16}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}} @@ -305,7 +316,8 @@ {{else if eq .Type 17}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$parsedDeadline := .Content | ParseDeadline}} @@ -315,7 +327,8 @@ {{else if eq .Type 18}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}} @@ -324,7 +337,8 @@ {{else if eq .Type 19}}
{{svg "octicon-package-dependents"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}} @@ -347,7 +361,8 @@ {{else if eq .Type 20}}
{{svg "octicon-package-dependents"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}} @@ -650,7 +665,8 @@ {{else if eq .Type 24}}
{{svg "octicon-key"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}} @@ -659,7 +675,8 @@ {{else if eq .Type 25}}
{{svg "octicon-git-branch"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{.Poster.Name}} {{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} @@ -667,7 +684,8 @@ {{else if eq .Type 26}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}} @@ -680,7 +698,8 @@ {{else if eq .Type 27}}
{{svg "octicon-eye"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{if (gt .AssigneeID 0)}} @@ -722,7 +741,8 @@ {{if not $.UnitProjectsGlobalDisabled}}
{{svg "octicon-project"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{if gt .OldProjectID 0}} @@ -780,7 +800,8 @@ {{else if eq .Type 33}}
{{svg "octicon-git-branch"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/authorlink" .Poster}} {{if and .OldRef .NewRef}} From 3c3c9ed328ed4af4427daac5c09f71a6d3eaa484 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 12 Aug 2022 22:00:50 +0100 Subject: [PATCH 5/6] fix spacing; Signed-off-by: Andrew Thornton --- .../repo/issue/view_content/comments.tmpl | 37 ++----------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index c7677de759d39..ba14ec49dcd24 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -99,7 +99,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{if .Issue.IsPull }} {{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}} {{else}} @@ -113,7 +112,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{if .Issue.IsPull }} {{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}} {{else}} @@ -127,7 +125,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}} {{if eq $.Issue.PullRequest.Status 3}} {{$.locale.Tr "repo.issues.manually_pull_merged_at" ($link|Escape) (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}} @@ -152,10 +149,10 @@ {{ $createdStr:= TimeSinceUnix .CreatedUnix $.locale }}
{{svg "octicon-bookmark"}} - {{template "shared/user/avatarlink" .Poster}} {{if eq .RefAction 3}}{{end}} + {{template "shared/user/avatarlink" .Poster}} + {{if eq .RefAction 3}}{{end}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr $refTr (.EventTag|Escape) $createdStr (.RefCommentHTMLURL|Escape) $refFrom | Safe}} {{if eq .RefAction 3}}{{end}} @@ -170,7 +167,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
@@ -184,7 +180,6 @@ {{svg "octicon-tag"}} {{template "shared/user/avatarlink" .Poster}} {{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}} {{else if and (not .AddedLabels) .RemovedLabels}} @@ -201,7 +196,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
@@ -223,7 +217,6 @@ {{template "shared/user/avatarlink" .Assignee}} {{template "shared/user/authorlink" .Assignee}} - {{if eq .Poster.ID .AssigneeID}} {{$.locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}} {{else}} @@ -239,7 +232,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
@@ -249,7 +241,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
@@ -259,7 +250,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
@@ -269,7 +259,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} @@ -284,7 +273,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}} {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} @@ -299,7 +287,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
@@ -309,7 +296,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
@@ -319,7 +305,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$parsedDeadline := .Content | ParseDeadline}} {{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}} @@ -330,7 +315,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
@@ -340,7 +324,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}} {{if .DependentIssue}} @@ -364,7 +347,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}} {{if .DependentIssue}} @@ -402,7 +384,6 @@ ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} {{else}} {{template "shared/user/authorlink" .Poster}} - {{end}} {{if eq .Review.Type 1}} @@ -434,7 +415,6 @@ ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} {{else}} {{template "shared/user/authorlink" .Poster}} - {{end}} {{$.locale.Tr "repo.issues.review.left_comment" | Safe}} @@ -563,7 +543,6 @@ ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} {{else}} {{template "shared/user/authorlink" .Poster}} - {{end}} {{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdSubStr | Safe}} @@ -648,16 +627,15 @@ {{else if eq .Type 23}}
{{svg "octicon-lock"}} - {{template "shared/user/avatarlink" .Poster}} {{ if .Content }} + {{template "shared/user/avatarlink" .Poster}} + {{ if .Content }} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}} {{ else }} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}} {{ end }} @@ -668,7 +646,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
@@ -701,7 +678,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{if (gt .AssigneeID 0)}} {{if .RemovedAssignee}} {{if eq .PosterID .AssigneeID}} @@ -726,7 +702,6 @@ {{svg "octicon-repo-push"}} {{template "shared/user/authorlink" .Poster}} - {{ if .IsForcePush }} {{$.locale.Tr "repo.issues.force_push_codes" ($.Issue.PullRequest.HeadBranch|Escape) (ShortSha .OldCommit) (($.Issue.Repo.CommitLink .OldCommit)|Escape) (ShortSha .NewCommit) (($.Issue.Repo.CommitLink .NewCommit)|Escape) $createdStr | Safe}} {{else}} @@ -744,7 +719,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{if gt .OldProjectID 0}} {{if gt .ProjectID 0}} {{$.locale.Tr "repo.issues.change_project_at" (.OldProject.Title|Escape) (.Project.Title|Escape) $createdStr | Safe}} @@ -766,7 +740,6 @@ {{svg "octicon-x" 16}} {{template "shared/user/authorlink" .Poster}} - {{$reviewerName := ""}} {{if eq .Review.OriginalAuthor ""}} {{$reviewerName = .Review.Reviewer.Name}} @@ -803,7 +776,6 @@ {{template "shared/user/avatarlink" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{if and .OldRef .NewRef}} {{$.locale.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} {{else if .OldRef}} @@ -818,7 +790,6 @@ {{svg "octicon-git-merge" 16}} {{template "shared/user/authorlink" .Poster}} - {{if eq .Type 34}}{{$.locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr | Safe}} {{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}} From c73ec14fb7adce34b2ef44e1124f436c4fcb8492 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 12 Aug 2022 22:01:48 +0100 Subject: [PATCH 6/6] fix spacing 2 Signed-off-by: Andrew Thornton --- templates/repo/issue/view_content/comments.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index ba14ec49dcd24..6610548cf04ce 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -178,7 +178,8 @@ {{if or .AddedLabels .RemovedLabels}}
{{svg "octicon-tag"}} - {{template "shared/user/avatarlink" .Poster}} + {{template "shared/user/avatarlink" .Poster}} + {{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}}