Skip to content

Commit b833ce4

Browse files
silverwindKN4CK3R
silverwind
and
KN4CK3R
authored
Mute all links in issue timeline (#22533)
#21799 introduced a regression where some links in the issue timeline were not muted any more. Fix it by replacing all `class="text grey"` with `class="text grey muted-links"` in the file. Before: <img width="384" alt="Screenshot 2023-01-19 at 22 23 05" src="https://user-images.githubusercontent.com/115237/213565351-1bb82f4e-fa72-4cd7-8e36-e527bbfe5c5f.png"> After: <img width="377" alt="Screenshot 2023-01-19 at 22 23 11" src="https://user-images.githubusercontent.com/115237/213565359-87e14855-6599-472a-be0b-61297b168f9a.png"> Co-authored-by: KN4CK3R <[email protected]>
1 parent 4199d28 commit b833ce4

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

‎templates/repo/issue/view_content/comments.tmpl

+49-49
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
3030
{{.OriginalAuthor}}
3131
</span>
32-
<span class="text grey">
32+
<span class="text grey muted-links">
3333
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{if $.Repository.OriginalURL}}
3434
</span>
3535
<span class="text migrate">
@@ -41,7 +41,7 @@
4141
{{avatar .Poster}}
4242
</a>
4343
{{end}}
44-
<span class="text grey">
44+
<span class="text grey muted-links">
4545
{{template "shared/user/authorlink" .Poster}}
4646
{{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
4747
</span>
@@ -95,7 +95,7 @@
9595
<div class="timeline-item event" id="{{.HashTag}}">
9696
<span class="badge bg-green text-white">{{svg "octicon-dot-fill"}}</span>
9797
{{template "shared/user/avatarlink" .Poster}}
98-
<span class="text grey">
98+
<span class="text grey muted-links">
9999
{{template "shared/user/authorlink" .Poster}}
100100
{{if .Issue.IsPull}}
101101
{{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}}
@@ -108,7 +108,7 @@
108108
<div class="timeline-item event" id="{{.HashTag}}">
109109
<span class="badge bg-red text-white">{{svg "octicon-circle-slash"}}</span>
110110
{{template "shared/user/avatarlink" .Poster}}
111-
<span class="text grey">
111+
<span class="text grey muted-links">
112112
{{template "shared/user/authorlink" .Poster}}
113113
{{if .Issue.IsPull}}
114114
{{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}}
@@ -121,7 +121,7 @@
121121
<div class="timeline-item event" id="{{.HashTag}}">
122122
<span class="badge bg-purple text-white">{{svg "octicon-git-merge"}}</span>
123123
{{template "shared/user/avatarlink" .Poster}}
124-
<span class="text grey">
124+
<span class="text grey muted-links">
125125
{{template "shared/user/authorlink" .Poster}}
126126
{{$link := printf "%s/commit/%s" $.Repository.HTMLURL ($.Issue.PullRequest.MergedCommitID|PathEscape)}}
127127
{{if eq $.Issue.PullRequest.Status 3}}
@@ -156,28 +156,28 @@
156156
{{if eq .RefAction 3}}</del>{{end}}
157157

158158
<div class="detail">
159-
<span class="text grey"><a class="muted" href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
159+
<span class="text grey muted-links"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
160160
</div>
161161
</div>
162162
{{else if eq .Type 4}}
163163
<div class="timeline-item event" id="{{.HashTag}}">
164164
<span class="badge">{{svg "octicon-bookmark"}}</span>
165165
{{template "shared/user/avatarlink" .Poster}}
166-
<span class="text grey">
166+
<span class="text grey muted-links">
167167
{{template "shared/user/authorlink" .Poster}}
168168
{{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
169169
</span>
170170
<div class="detail">
171171
{{svg "octicon-git-commit"}}
172-
<span class="text grey">{{.Content | Str2html}}</span>
172+
<span class="text grey muted-links">{{.Content | Str2html}}</span>
173173
</div>
174174
</div>
175175
{{else if eq .Type 7}}
176176
{{if or .AddedLabels .RemovedLabels}}
177177
<div class="timeline-item event" id="{{.HashTag}}">
178178
<span class="badge">{{svg "octicon-tag"}}</span>
179179
{{template "shared/user/avatarlink" .Poster}}
180-
<span class="text grey">
180+
<span class="text grey muted-links">
181181
{{template "shared/user/authorlink" .Poster}}
182182
{{if and .AddedLabels (not .RemovedLabels)}}
183183
{{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels $.RepoLink) $createdStr | Safe}}
@@ -193,7 +193,7 @@
193193
<div class="timeline-item event" id="{{.HashTag}}">
194194
<span class="badge">{{svg "octicon-milestone"}}</span>
195195
{{template "shared/user/avatarlink" .Poster}}
196-
<span class="text grey">
196+
<span class="text grey muted-links">
197197
{{template "shared/user/authorlink" .Poster}}
198198
{{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}}
199199
</span>
@@ -204,7 +204,7 @@
204204
{{if gt .AssigneeID 0}}
205205
{{if .RemovedAssignee}}
206206
{{template "shared/user/avatarlink" .Assignee}}
207-
<span class="text grey">
207+
<span class="text grey muted-links">
208208
{{template "shared/user/authorlink" .Assignee}}
209209
{{if eq .Poster.ID .Assignee.ID}}
210210
{{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
@@ -214,7 +214,7 @@
214214
</span>
215215
{{else}}
216216
{{template "shared/user/avatarlink" .Assignee}}
217-
<span class="text grey">
217+
<span class="text grey muted-links">
218218
{{template "shared/user/authorlink" .Assignee}}
219219
{{if eq .Poster.ID .AssigneeID}}
220220
{{$.locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
@@ -229,7 +229,7 @@
229229
<div class="timeline-item event" id="{{.HashTag}}">
230230
<span class="badge">{{svg "octicon-pencil"}}</span>
231231
{{template "shared/user/avatarlink" .Poster}}
232-
<span class="text grey">
232+
<span class="text grey muted-links">
233233
{{template "shared/user/authorlink" .Poster}}
234234
{{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
235235
</span>
@@ -238,7 +238,7 @@
238238
<div class="timeline-item event" id="{{.HashTag}}">
239239
<span class="badge">{{svg "octicon-git-branch"}}</span>
240240
{{template "shared/user/avatarlink" .Poster}}
241-
<span class="text grey">
241+
<span class="text grey muted-links">
242242
{{template "shared/user/authorlink" .Poster}}
243243
{{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
244244
</span>
@@ -247,7 +247,7 @@
247247
<div class="timeline-item event" id="{{.HashTag}}">
248248
<span class="badge">{{svg "octicon-clock"}}</span>
249249
{{template "shared/user/avatarlink" .Poster}}
250-
<span class="text grey">
250+
<span class="text grey muted-links">
251251
{{template "shared/user/authorlink" .Poster}}
252252
{{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
253253
</span>
@@ -256,35 +256,35 @@
256256
<div class="timeline-item event" id="{{.HashTag}}">
257257
<span class="badge">{{svg "octicon-clock"}}</span>
258258
{{template "shared/user/avatarlink" .Poster}}
259-
<span class="text grey">
259+
<span class="text grey muted-links">
260260
{{template "shared/user/authorlink" .Poster}}
261261
{{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}}
262262
</span>
263263
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
264264
<div class="detail">
265265
{{svg "octicon-clock"}}
266-
<span class="text grey">{{.Content}}</span>
266+
<span class="text grey muted-links">{{.Content}}</span>
267267
</div>
268268
</div>
269269
{{else if eq .Type 14}}
270270
<div class="timeline-item event" id="{{.HashTag}}">
271271
<span class="badge">{{svg "octicon-clock"}}</span>
272272
{{template "shared/user/avatarlink" .Poster}}
273-
<span class="text grey">
273+
<span class="text grey muted-links">
274274
{{template "shared/user/authorlink" .Poster}}
275275
{{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}}
276276
</span>
277277
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
278278
<div class="detail">
279279
{{svg "octicon-clock"}}
280-
<span class="text grey">{{.Content}}</span>
280+
<span class="text grey muted-links">{{.Content}}</span>
281281
</div>
282282
</div>
283283
{{else if eq .Type 15}}
284284
<div class="timeline-item event" id="{{.HashTag}}">
285285
<span class="badge">{{svg "octicon-clock"}}</span>
286286
{{template "shared/user/avatarlink" .Poster}}
287-
<span class="text grey">
287+
<span class="text grey muted-links">
288288
{{template "shared/user/authorlink" .Poster}}
289289
{{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
290290
</span>
@@ -293,7 +293,7 @@
293293
<div class="timeline-item event" id="{{.HashTag}}">
294294
<span class="badge">{{svg "octicon-clock"}}</span>
295295
{{template "shared/user/avatarlink" .Poster}}
296-
<span class="text grey">
296+
<span class="text grey muted-links">
297297
{{template "shared/user/authorlink" .Poster}}
298298
{{$.locale.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
299299
</span>
@@ -302,7 +302,7 @@
302302
<div class="timeline-item event" id="{{.HashTag}}">
303303
<span class="badge">{{svg "octicon-clock"}}</span>
304304
{{template "shared/user/avatarlink" .Poster}}
305-
<span class="text grey">
305+
<span class="text grey muted-links">
306306
{{template "shared/user/authorlink" .Poster}}
307307
{{$parsedDeadline := .Content | ParseDeadline}}
308308
{{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}}
@@ -312,7 +312,7 @@
312312
<div class="timeline-item event" id="{{.HashTag}}">
313313
<span class="badge">{{svg "octicon-clock"}}</span>
314314
{{template "shared/user/avatarlink" .Poster}}
315-
<span class="text grey">
315+
<span class="text grey muted-links">
316316
{{template "shared/user/authorlink" .Poster}}
317317
{{$.locale.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
318318
</span>
@@ -321,15 +321,15 @@
321321
<div class="timeline-item event" id="{{.HashTag}}">
322322
<span class="badge">{{svg "octicon-package-dependents"}}</span>
323323
{{template "shared/user/avatarlink" .Poster}}
324-
<span class="text grey">
324+
<span class="text grey muted-links">
325325
{{template "shared/user/authorlink" .Poster}}
326326
{{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}}
327327
</span>
328328
{{if .DependentIssue}}
329329
<div class="detail">
330330
{{svg "octicon-plus"}}
331-
<span class="text grey">
332-
<a class="muted" href="{{.DependentIssue.HTMLURL}}">
331+
<span class="text grey muted-links">
332+
<a href="{{.DependentIssue.HTMLURL}}">
333333
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
334334
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
335335
{{else}}
@@ -344,15 +344,15 @@
344344
<div class="timeline-item event" id="{{.HashTag}}">
345345
<span class="badge">{{svg "octicon-package-dependents"}}</span>
346346
{{template "shared/user/avatarlink" .Poster}}
347-
<span class="text grey">
347+
<span class="text grey muted-links">
348348
{{template "shared/user/authorlink" .Poster}}
349349
{{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}}
350350
</span>
351351
{{if .DependentIssue}}
352352
<div class="detail">
353-
<span class="text grey">{{svg "octicon-trash"}}</span>
354-
<span class="text grey">
355-
<a class="muted" href="{{.DependentIssue.HTMLURL}}">
353+
<span class="text grey muted-links">{{svg "octicon-trash"}}</span>
354+
<span class="text grey muted-links">
355+
<a href="{{.DependentIssue.HTMLURL}}">
356356
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
357357
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
358358
{{else}}
@@ -373,13 +373,13 @@
373373
</a>
374374
{{end}}
375375
<span class="badge{{if eq .Review.Type 1}} bg-green text-white{{else if eq .Review.Type 3}} bg-red text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span>
376-
<span class="text grey">
376+
<span class="text grey muted-links">
377377
{{if .OriginalAuthor}}
378378
<span class="text black">
379379
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
380380
{{.OriginalAuthor}}
381381
</span>
382-
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
382+
<span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
383383
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
384384
{{else}}
385385
{{template "shared/user/authorlink" .Poster}}
@@ -404,13 +404,13 @@
404404
<div class="content comment-container">
405405
<div class="ui top attached header comment-header df ac sb">
406406
<div class="comment-header-left df ac">
407-
<span class="text grey">
407+
<span class="text grey muted-links">
408408
{{if .OriginalAuthor}}
409409
<span class="text black bold">
410410
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
411411
{{.OriginalAuthor}}
412412
</span>
413-
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
413+
<span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
414414
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
415415
{{else}}
416416
{{template "shared/user/authorlink" .Poster}}
@@ -532,13 +532,13 @@
532532
{{avatar .Poster}}
533533
</a>
534534
{{end}}
535-
<span class="text grey">
535+
<span class="text grey muted-links">
536536
{{if .OriginalAuthor}}
537537
<span class="text black bold">
538538
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
539539
{{.OriginalAuthor}}
540540
</span>
541-
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
541+
<span class="text grey muted-links"> {{if $.Repository.OriginalURL}}</span>
542542
<span class="text migrate">({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}</span>
543543
{{else}}
544544
{{template "shared/user/authorlink" .Poster}}
@@ -628,12 +628,12 @@
628628
<span class="badge">{{svg "octicon-lock"}}</span>
629629
{{template "shared/user/avatarlink" .Poster}}
630630
{{if .Content}}
631-
<span class="text grey">
631+
<span class="text grey muted-links">
632632
{{template "shared/user/authorlink" .Poster}}
633633
{{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}}
634634
</span>
635635
{{else}}
636-
<span class="text grey">
636+
<span class="text grey muted-links">
637637
{{template "shared/user/authorlink" .Poster}}
638638
{{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}}
639639
</span>
@@ -643,7 +643,7 @@
643643
<div class="timeline-item event" id="{{.HashTag}}">
644644
<span class="badge">{{svg "octicon-key"}}</span>
645645
{{template "shared/user/avatarlink" .Poster}}
646-
<span class="text grey">
646+
<span class="text grey muted-links">
647647
{{template "shared/user/authorlink" .Poster}}
648648
{{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
649649
</span>
@@ -652,7 +652,7 @@
652652
<div class="timeline-item event">
653653
<span class="badge">{{svg "octicon-git-branch"}}</span>
654654
{{template "shared/user/avatarlink" .Poster}}
655-
<span class="text grey">
655+
<span class="text grey muted-links">
656656
<a{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.Name}}</a>
657657
{{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
658658
</span>
@@ -661,21 +661,21 @@
661661
<div class="timeline-item event" id="{{.HashTag}}">
662662
<span class="badge">{{svg "octicon-clock"}}</span>
663663
{{template "shared/user/avatarlink" .Poster}}
664-
<span class="text grey">
664+
<span class="text grey muted-links">
665665
{{template "shared/user/authorlink" .Poster}}
666666

667667
{{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}}
668668
</span>
669669
<div class="detail">
670670
{{svg "octicon-clock"}}
671-
<span class="text grey">{{.Content}}</span>
671+
<span class="text grey muted-links">{{.Content}}</span>
672672
</div>
673673
</div>
674674
{{else if eq .Type 27}}
675675
<div class="timeline-item event" id="{{.HashTag}}">
676676
<span class="badge">{{svg "octicon-eye"}}</span>
677677
{{template "shared/user/avatarlink" .Poster}}
678-
<span class="text grey">
678+
<span class="text grey muted-links">
679679
{{template "shared/user/authorlink" .Poster}}
680680
{{if (gt .AssigneeID 0)}}
681681
{{if .RemovedAssignee}}
@@ -699,7 +699,7 @@
699699
{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
700700
<div class="timeline-item event" id="{{.HashTag}}">
701701
<span class="badge">{{svg "octicon-repo-push"}}</span>
702-
<span class="text grey">
702+
<span class="text grey muted-links">
703703
{{template "shared/user/authorlink" .Poster}}
704704
{{if .IsForcePush}}
705705
{{$.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}}
@@ -716,7 +716,7 @@
716716
<div class="timeline-item event" id="{{.HashTag}}">
717717
<span class="badge">{{svg "octicon-project"}}</span>
718718
{{template "shared/user/avatarlink" .Poster}}
719-
<span class="text grey">
719+
<span class="text grey muted-links">
720720
{{template "shared/user/authorlink" .Poster}}
721721
{{if gt .OldProjectID 0}}
722722
{{if gt .ProjectID 0}}
@@ -737,7 +737,7 @@
737737
<img src="{{.Poster.AvatarLink}}">
738738
</a>
739739
<span class="badge grey">{{svg "octicon-x" 16}}</span>
740-
<span class="text grey">
740+
<span class="text grey muted-links">
741741
{{template "shared/user/authorlink" .Poster}}
742742
{{$reviewerName := ""}}
743743
{{if eq .Review.OriginalAuthor ""}}
@@ -752,7 +752,7 @@
752752
<div class="timeline-item comment">
753753
<div class="content">
754754
<div class="ui top attached header arrow-top">
755-
<span class="text grey">
755+
<span class="text grey muted-links">
756756
{{$.locale.Tr "action.review_dismissed_reason"}}
757757
</span>
758758
</div>
@@ -773,7 +773,7 @@
773773
<div class="timeline-item event" id="{{.HashTag}}">
774774
<span class="badge">{{svg "octicon-git-branch"}}</span>
775775
{{template "shared/user/avatarlink" .Poster}}
776-
<span class="text grey">
776+
<span class="text grey muted-links">
777777
{{template "shared/user/authorlink" .Poster}}
778778
{{if and .OldRef .NewRef}}
779779
{{$.locale.Tr "repo.issues.change_ref_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
@@ -787,7 +787,7 @@
787787
{{else if or (eq .Type 34) (eq .Type 35)}}
788788
<div class="timeline-item event" id="{{.HashTag}}">
789789
<span class="badge">{{svg "octicon-git-merge" 16}}</span>
790-
<span class="text grey">
790+
<span class="text grey muted-links">
791791
{{template "shared/user/authorlink" .Poster}}
792792
{{if eq .Type 34}}{{$.locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr | Safe}}
793793
{{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}}

0 commit comments

Comments
 (0)