- {{avatar $.Context .Org 140 "org-avatar"}} + {{ctx.AvatarUtils.Avatar .Org 140 "org-avatar"}}
{{.Org.DisplayName}} @@ -61,7 +61,7 @@ {{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (call $.IsPublicMember .ID)}} - {{avatar $.Context . 48}} + {{ctx.AvatarUtils.Avatar . 48}} {{end}} {{end}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 13b7d964f7..a15254d041 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -9,7 +9,7 @@ {{$isPublic := index $.MembersIsPublicMember .ID}}
- {{avatar $.Context . 48}} + {{ctx.AvatarUtils.Avatar . 48}}
diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl index 55ecd049b3..60332a5f40 100644 --- a/templates/org/team/invite.tmpl +++ b/templates/org/team/invite.tmpl @@ -4,7 +4,7 @@ {{template "base/alert" .}}
- {{avatar $.Context .Organization 140}} + {{ctx.AvatarUtils.Avatar .Organization 140}}
{{.locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name | Str2html}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index a73eb7bbd3..13c60d3945 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -26,7 +26,7 @@ {{range .Team.Members}}
- {{avatar $.Context . 32}} + {{ctx.AvatarUtils.Avatar . 32}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 9a7dae8f32..a96dd7d6be 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -32,7 +32,7 @@
{{range .Members}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .}} + {{template "shared/user/avatarlink" dict "user" .}} {{end}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 6689bea220..fe4ea6022f 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -234,7 +234,7 @@ {{end}}
{{range .Assignees}} - {{avatar $.Context . 28 "mini gt-mr-3"}} + {{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}} {{end}}
diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index f4f0aa9d6d..e73cf71f6b 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -33,7 +33,7 @@ {{range .Actors}} - {{avatar $.Context . 20}} {{.GetDisplayName}} + {{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}} {{end}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index b32e8cace7..bd045995b2 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -27,7 +27,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
-

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage .RepoLink .Repository.ComposeMetas}} · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime .locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "Context" $.Context "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage .RepoLink .Repository.ComposeMetas}} · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime .locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} @@ -94,7 +94,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
-

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime $.locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "Context" $.Context "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime $.locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

{{end}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index bd33a30443..06b8f1ba15 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -142,24 +142,24 @@
{{if .Author}} - {{avatar $.Context .Author 28 "gt-mr-3"}} + {{ctx.AvatarUtils.Avatar .Author 28 "gt-mr-3"}} {{if .Author.FullName}} {{.Author.FullName}} {{else}} {{.Commit.Author.Name}} {{end}} {{else}} - {{avatarByEmail $.Context .Commit.Author.Email .Commit.Author.Email 28 "gt-mr-3"}} + {{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 28 "gt-mr-3"}} {{.Commit.Author.Name}} {{end}} {{TimeSince .Commit.Author.When $.locale}} {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} {{.locale.Tr "repo.diff.committed_by"}} {{if ne .Verification.CommittingUser.ID 0}} - {{avatar $.Context .Verification.CommittingUser 28 "gt-mx-3"}} + {{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "gt-mx-3"}} {{.Commit.Committer.Name}} {{else}} - {{avatarByEmail $.Context .Commit.Committer.Email .Commit.Committer.Name 28 "gt-mr-3"}} + {{ctx.AvatarUtils.AvatarByEmail .Commit.Committer.Email .Commit.Committer.Name 28 "gt-mr-3"}} {{.Commit.Committer.Name}} {{end}} {{end}} @@ -196,12 +196,12 @@ {{else}} {{.locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}} - {{avatar $.Context .Verification.SigningUser 28 "gt-mr-3"}} + {{ctx.AvatarUtils.Avatar .Verification.SigningUser 28 "gt-mr-3"}} {{.Verification.SigningUser.GetDisplayName}} {{else}} {{svg "gitea-lock-cog" 16 "gt-mr-3"}} {{.locale.Tr "repo.commits.signed_by"}}: - {{avatarByEmail $.Context .Verification.SigningEmail "" 28}} + {{ctx.AvatarUtils.AvatarByEmail .Verification.SigningEmail "" 28}} {{.Verification.SigningUser.GetDisplayName}} {{end}} {{else}} diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index ef9d065456..9f1d182158 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -18,9 +18,9 @@ {{if .User.FullName}} {{$userName = .User.FullName}} {{end}} - {{avatar $.Context .User 28 "gt-mr-2"}}{{$userName}} + {{ctx.AvatarUtils.Avatar .User 28 "gt-mr-2"}}{{$userName}} {{else}} - {{avatarByEmail $.Context .Author.Email .Author.Name 28 "gt-mr-2"}} + {{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "gt-mr-2"}} {{$userName}} {{end}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 57c9fd17ef..ff65d02885 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -6,9 +6,9 @@
{{svg "octicon-git-commit"}} {{if .User}} - {{avatar $.root.Context .User}} + {{ctx.AvatarUtils.Avatar .User}} {{else}} - {{avatarByEmail $.root.Context .Author.Email .Author.Name}} + {{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name}} {{end}} {{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index ce909fbbf7..2025cac566 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -21,18 +21,18 @@
- {{avatar $.Context .ContextUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index d19ac1f047..c1bb14e714 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -5,7 +5,7 @@ {{if .OriginalAuthor}} {{else}} - {{template "shared/user/avatarlink" dict "Context" $.root.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}}
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 6a3f86f9fc..5833687753 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -1,5 +1,5 @@
- {{avatar $.Context .SignedUser 48 "commit-avatar"}} + {{ctx.AvatarUtils.Avatar .SignedUser 48 "commit-avatar"}}

{{- if .CanCommitToBranch.WillSign}} {{svg "octicon-lock" 24}} diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index 13810b44da..481c0e67e0 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -7,7 +7,7 @@

{{range .Forks}}
- {{avatar $.Context .Owner}} + {{ctx.AvatarUtils.Avatar .Owner}} {{.Owner.Name}} / {{.Name}}
{{end}} diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 8652a72052..0a21aec9c0 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -64,10 +64,10 @@ {{if $commit.User.FullName}} {{$userName = $commit.User.FullName}} {{end}} - {{avatar $.Context $commit.User}} + {{ctx.AvatarUtils.Avatar $commit.User}} {{$userName}} {{else}} - {{avatarByEmail $.Context $commit.Commit.Author.Email $userName}} + {{ctx.AvatarUtils.AvatarByEmail $commit.Commit.Author.Email $userName}} {{$userName}} {{end}} diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index b75d98ed6f..799509328f 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -146,7 +146,7 @@
{{range .Assignees}} - {{avatar $.Context . 20}}{{template "repo/search_name" .}} + {{ctx.AvatarUtils.Avatar . 20}}{{template "repo/search_name" .}} {{end}}
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 8eb85a3298..7ae65efedc 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -56,7 +56,7 @@ {{end}}
{{range .Assignees}} - {{avatar $.Context . 28 "mini gt-mr-3"}} + {{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}} {{end}}
@@ -208,7 +208,7 @@
{{range .Assignees}}
- {{avatar $.Context . 20}} {{.GetDisplayName}} + {{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}}
{{end}}
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index aa68021748..272693e63e 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -8,7 +8,7 @@
- {{avatar $.Context .SignedUser 40}} + {{ctx.AvatarUtils.Avatar .SignedUser 40}}
@@ -160,7 +160,7 @@ - {{avatar $.Context . 28 "gt-mr-3"}}{{template "repo/search_name" .}} + {{ctx.AvatarUtils.Avatar . 28 "gt-mr-3"}}{{template "repo/search_name" .}} {{end}} @@ -173,7 +173,7 @@
{{range .Assignees}} - {{avatar $.Context . 28 "gt-mr-3 gt-vm"}}{{.GetDisplayName}} + {{ctx.AvatarUtils.Avatar . 28 "gt-mr-3 gt-vm"}}{{.GetDisplayName}} {{end}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index ab8da434ee..f6572d4965 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -16,7 +16,7 @@ {{else}} - {{avatar $.Context .Issue.Poster 40}} + {{ctx.AvatarUtils.Avatar .Issue.Poster 40}} {{end}}
@@ -35,7 +35,7 @@ {{else}} - {{avatar $.Context .Issue.Poster 24}} + {{ctx.AvatarUtils.Avatar .Issue.Poster 24}} {{template "shared/user/authorlink" .Issue.Poster}} @@ -93,7 +93,7 @@ {{if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived)}}
- {{avatar $.Context .SignedUser 40}} + {{ctx.AvatarUtils.Avatar .SignedUser 40}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 5dbd530fa5..57756e36b9 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -20,7 +20,7 @@ {{else}} - {{avatar $.Context .Poster 40}} + {{ctx.AvatarUtils.Avatar .Poster 40}} {{end}}
@@ -40,7 +40,7 @@ {{else}} {{if gt .Poster.ID 0}} - {{avatar $.Context .Poster 24}} + {{ctx.AvatarUtils.Avatar .Poster 24}} {{end}} @@ -94,7 +94,7 @@ {{else if eq .Type 1}}
{{svg "octicon-dot-fill"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{if .Issue.IsPull}} @@ -107,7 +107,7 @@ {{else if eq .Type 2}}
{{svg "octicon-circle-slash"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{if .Issue.IsPull}} @@ -120,7 +120,7 @@ {{else if eq .Type 28}}
{{svg "octicon-git-merge"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$link := printf "%s/commit/%s" $.Repository.Link ($.Issue.PullRequest.MergedCommitID|PathEscape)}} @@ -147,7 +147,7 @@ {{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
{{svg "octicon-bookmark"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{if eq .RefAction 3}}{{end}} {{template "shared/user/authorlink" .Poster}} @@ -162,7 +162,7 @@ {{else if eq .Type 4}}
{{svg "octicon-bookmark"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}} @@ -176,7 +176,7 @@ {{if or .AddedLabels .RemovedLabels}}
{{svg "octicon-tag"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{if and .AddedLabels (not .RemovedLabels)}} @@ -192,7 +192,7 @@ {{else if eq .Type 8}}
{{svg "octicon-milestone"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .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}} @@ -203,7 +203,7 @@ {{svg "octicon-person"}} {{if gt .AssigneeID 0}} {{if .RemovedAssignee}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Assignee}} + {{template "shared/user/avatarlink" dict "user" .Assignee}} {{template "shared/user/authorlink" .Assignee}} {{if eq .Poster.ID .Assignee.ID}} @@ -213,7 +213,7 @@ {{end}} {{else}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Assignee}} + {{template "shared/user/avatarlink" dict "user" .Assignee}} {{template "shared/user/authorlink" .Assignee}} {{if eq .Poster.ID .AssigneeID}} @@ -228,7 +228,7 @@ {{else if eq .Type 10}}
{{svg "octicon-pencil"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji $.Context) (.NewTitle|RenderEmoji $.Context) $createdStr | Safe}} @@ -237,7 +237,7 @@ {{else if eq .Type 11}}
{{svg "octicon-git-branch"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}} @@ -246,7 +246,7 @@ {{else if eq .Type 12}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.start_tracking_history" $createdStr | Safe}} @@ -255,7 +255,7 @@ {{else if eq .Type 13}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} @@ -274,7 +274,7 @@ {{else if eq .Type 14}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}} @@ -293,7 +293,7 @@ {{else if eq .Type 15}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}} @@ -302,7 +302,7 @@ {{else if eq .Type 16}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.due_date_added" (DateTime "long" .Content) $createdStr | Safe}} @@ -311,7 +311,7 @@ {{else if eq .Type 17}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$parsedDeadline := StringUtils.Split .Content "|"}} @@ -325,7 +325,7 @@ {{else if eq .Type 18}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.due_date_remove" (DateTime "long" .Content) $createdStr | Safe}} @@ -334,7 +334,7 @@ {{else if eq .Type 19}}
{{svg "octicon-package-dependents"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}} @@ -357,7 +357,7 @@ {{else if eq .Type 20}}
{{svg "octicon-package-dependents"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}} @@ -386,7 +386,7 @@ bubble. The condition depends on review type and for positive reviews whether there is a comment element or not */}} - {{avatar $.Context .Poster 40}} + {{ctx.AvatarUtils.Avatar .Poster 40}} {{end}} {{svg (printf "octicon-%s" .Review.Type.Icon)}} @@ -423,7 +423,7 @@
{{if gt .Poster.ID 0}} - {{avatar $.Context .Poster 24}} + {{ctx.AvatarUtils.Avatar .Poster 24}} {{end}} @@ -549,7 +549,7 @@
{{if not .OriginalAuthor}} - {{avatar $.Context .Poster 20}} + {{ctx.AvatarUtils.Avatar .Poster 20}} {{end}} @@ -644,7 +644,7 @@ {{else if eq .Type 23}}
{{svg "octicon-lock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{if .Content}} {{template "shared/user/authorlink" .Poster}} @@ -660,7 +660,7 @@ {{else if eq .Type 24}}
{{svg "octicon-key"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$.locale.Tr "repo.issues.unlock_comment" $createdStr | Safe}} @@ -669,7 +669,7 @@ {{else if eq .Type 25}}
{{svg "octicon-git-branch"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{.Poster.Name}} {{$.locale.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} @@ -678,7 +678,7 @@ {{else if eq .Type 26}}
{{svg "octicon-clock"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} @@ -697,7 +697,7 @@ {{else if eq .Type 27}}
{{svg "octicon-eye"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{if (gt .AssigneeID 0)}} @@ -752,7 +752,7 @@ {{if not $.UnitProjectsGlobalDisabled}}
{{svg "octicon-project"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{$oldProjectDisplayHtml := "Unknown Project"}} @@ -799,7 +799,7 @@
{{if gt .Poster.ID 0}} - {{avatar $.Context .Poster 24}} + {{ctx.AvatarUtils.Avatar .Poster 24}} {{end}} @@ -822,7 +822,7 @@ {{else if eq .Type 33}}
{{svg "octicon-git-branch"}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{if and .OldRef .NewRef}} @@ -846,7 +846,7 @@ {{else if or (eq .Type 36) (eq .Type 37)}}
{{svg "octicon-pin" 16}} - {{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}} + {{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/authorlink" .Poster}} {{if eq .Type 36}}{{$.locale.Tr "repo.issues.pin_comment" $createdStr | Safe}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 15845665bb..70aa8e53c0 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -22,7 +22,7 @@ {{svg "octicon-check"}} - {{avatar $.Context .User 28 "gt-mr-3"}}{{template "repo/search_name" .User}} + {{ctx.AvatarUtils.Avatar .User 28 "gt-mr-3"}}{{template "repo/search_name" .User}} {{end}} @@ -51,7 +51,7 @@
{{if .User}} - {{avatar $.Context .User 20 "gt-mr-3"}}{{.User.GetDisplayName}} + {{ctx.AvatarUtils.Avatar .User 20 "gt-mr-3"}}{{.User.GetDisplayName}} {{else if .Team}} {{svg "octicon-people" 20 "gt-mr-3"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}} {{end}} @@ -231,7 +231,7 @@ {{end}} {{svg "octicon-check"}} - {{avatar $.Context . 20 "gt-mr-3"}}{{template "repo/search_name" .}} + {{ctx.AvatarUtils.Avatar . 20 "gt-mr-3"}}{{template "repo/search_name" .}} {{end}} @@ -243,7 +243,7 @@ {{range .Issue.Assignees}}
- {{avatar $.Context . 28 "gt-mr-3"}} + {{ctx.AvatarUtils.Avatar . 28 "gt-mr-3"}} {{.GetDisplayName}}
@@ -258,7 +258,7 @@
{{range .Participants}} - {{avatar $.Context . 28 "gt-my-1 gt-mr-2"}} + {{ctx.AvatarUtils.Avatar . 28 "gt-my-1 gt-mr-2"}} {{end}}
@@ -347,7 +347,7 @@ {{range $user, $trackedtime := .WorkingUsers}}
- {{avatar $.Context $user}} + {{ctx.AvatarUtils.Avatar $user}}
{{template "shared/user/authorlink" $user}} diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index 3d46b14ccc..db607eebb4 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -62,18 +62,18 @@
- {{avatar $.Context .ContextUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index df2f10e487..42ae642d26 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -36,18 +36,18 @@
- {{avatar $.Context .ContextUser}} + {{ctx.AvatarUtils.Avatar .ContextUser}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser}} + {{ctx.AvatarUtils.Avatar .SignedUser}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context .}} + {{ctx.AvatarUtils.Avatar .}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index 2ac9159d2e..372df0c2db 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -78,18 +78,18 @@
- {{avatar $.Context .ContextUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 49015e69eb..dcceb1e3af 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -74,18 +74,18 @@
- {{avatar $.Context .ContextUser}} + {{ctx.AvatarUtils.Avatar .ContextUser}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser}} + {{ctx.AvatarUtils.Avatar .SignedUser}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context .}} + {{ctx.AvatarUtils.Avatar .}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 164e62d299..0ccad3a3ea 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -76,18 +76,18 @@
- {{avatar $.Context .ContextUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 7c226f8097..af20fa38e2 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -73,18 +73,18 @@
- {{avatar $.Context .ContextUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index 6390d8917e..dd62e80479 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -76,18 +76,18 @@
- {{avatar $.Context .ContextUser}} + {{ctx.AvatarUtils.Avatar .ContextUser}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser}} + {{ctx.AvatarUtils.Avatar .SignedUser}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context .}} + {{ctx.AvatarUtils.Avatar .}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index 2a1ae110d6..f5ba11ab06 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -62,18 +62,18 @@
- {{avatar $.Context .ContextUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{avatar $.Context .SignedUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 40}}
{{range .Orgs}}
- {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 9df55ff317..2dbb381960 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -243,7 +243,7 @@ {{end}}
{{range .Assignees}} - {{avatar $.Context . 28 "mini gt-mr-3"}} + {{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}} {{end}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 525858c6aa..15635074ac 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -14,20 +14,20 @@
- {{avatar $.Context .ContextUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} {{.ContextUser.ShortName 40}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{if .CanForkToUser}}
- {{avatar $.Context .SignedUser 28 "mini"}} + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} {{.SignedUser.ShortName 40}}
{{end}} {{range .Orgs}}
- {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}} {{.ShortName 40}}
{{end}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index fb8534f102..f326fb3272 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -38,7 +38,7 @@

{{if gt .Publisher.ID 0}} - {{avatar $.Context .Publisher 20}} + {{ctx.AvatarUtils.Avatar .Publisher 20}} {{.Publisher.Name}} @@ -57,7 +57,7 @@ {{if .OriginalAuthor}} {{svg "octicon-mark-github" 16 "gt-mr-2"}}{{.OriginalAuthor}} {{else if .Publisher}} - {{avatar $.Context .Publisher 20}} + {{ctx.AvatarUtils.Avatar .Publisher 20}} {{.Publisher.GetDisplayName}} {{else}} Ghost diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 0716489291..13b2df0653 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -9,7 +9,7 @@ {{range .Collaborators}}

- {{avatar $.Context . 32}} + {{ctx.AvatarUtils.Avatar . 32}}
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl index c003500bb6..4eadf9ca32 100644 --- a/templates/repo/settings/lfs_locks.tmpl +++ b/templates/repo/settings/lfs_locks.tmpl @@ -31,7 +31,7 @@ - {{avatar $.Context $.Owner}} + {{ctx.AvatarUtils.Avatar $.Owner}} {{$.Owner.DisplayName}} diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index e76d3c76e2..eb5baff59b 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -55,7 +55,7 @@
{{range .Users}}
- {{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}}{{template "repo/search_name" .}}
{{end}}
@@ -116,7 +116,7 @@
{{range .Users}}
- {{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}}{{template "repo/search_name" .}}
{{end}}
@@ -206,7 +206,7 @@
{{range .Users}}
- {{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}}{{template "repo/search_name" .}}
{{end}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index b3e8cefa6c..c3d2fc38de 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -32,7 +32,7 @@
{{range .Users}}
- {{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}}{{template "repo/search_name" .}}
{{end}}
@@ -89,7 +89,7 @@ {{$userIDs := .AllowlistUserIDs}} {{range $.Users}} {{if SliceUtils.Contains $userIDs .ID}} - {{avatar $.Context . 26}} {{.GetDisplayName}} + {{ctx.AvatarUtils.Avatar . 26}} {{.GetDisplayName}} {{end}} {{end}} {{if $.Owner.IsOrganization}} diff --git a/templates/repo/shabox_badge.tmpl b/templates/repo/shabox_badge.tmpl index 2418d95c67..20fbe553a4 100644 --- a/templates/repo/shabox_badge.tmpl +++ b/templates/repo/shabox_badge.tmpl @@ -3,10 +3,10 @@
{{if ne .verification.SigningUser.ID 0}} {{svg "gitea-lock"}} - {{avatar $.root.Context .verification.SigningUser 28 "signature"}} + {{ctx.AvatarUtils.Avatar .verification.SigningUser 28 "signature"}} {{else}} {{svg "gitea-lock-cog"}} - {{avatarByEmail $.root.Context .verification.SigningEmail "" 28 "signature"}} + {{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 28 "signature"}} {{end}}
{{else}} diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index 29864462e6..61ed11366c 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -8,7 +8,7 @@ {{range .Cards}}
  • - {{avatar $.Context .}} + {{ctx.AvatarUtils.Avatar .}}

    {{.DisplayName}}

    diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 3eabf9f181..453c06216d 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -6,7 +6,7 @@
    …
    {{else}} {{if .LatestCommitUser}} - {{avatar $.Context .LatestCommitUser 24}} + {{ctx.AvatarUtils.Avatar .LatestCommitUser 24}} {{if .LatestCommitUser.FullName}} {{.LatestCommitUser.FullName}} {{else}} @@ -14,7 +14,7 @@ {{end}} {{else}} {{if .LatestCommit.Author}} - {{avatarByEmail $.Context .LatestCommit.Author.Email .LatestCommit.Author.Name 24}} + {{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}} {{.LatestCommit.Author.Name}} {{end}} {{end}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 30e19baf7c..72cf1dd6c8 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -37,7 +37,7 @@
    {{range .Assignees}} - {{avatar $.Context . 20}} + {{ctx.AvatarUtils.Avatar . 20}} {{end}}
    diff --git a/templates/shared/user/avatarlink.tmpl b/templates/shared/user/avatarlink.tmpl index c99f0aacb7..5e3ed7a68c 100644 --- a/templates/shared/user/avatarlink.tmpl +++ b/templates/shared/user/avatarlink.tmpl @@ -1 +1 @@ -{{avatar $.Context .user}} +{{ctx.AvatarUtils.Avatar .user}} diff --git a/templates/shared/user/org_profile_avatar.tmpl b/templates/shared/user/org_profile_avatar.tmpl index a56763e288..9c94930511 100644 --- a/templates/shared/user/org_profile_avatar.tmpl +++ b/templates/shared/user/org_profile_avatar.tmpl @@ -3,7 +3,7 @@
    - {{avatar $.Context . 100}} + {{ctx.AvatarUtils.Avatar . 100}} {{.DisplayName}} {{if .Visibility.IsLimited}}
    {{$.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index 97afbb6580..305a6b5a20 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -3,11 +3,11 @@ {{if eq .SignedUserID .ContextUser.ID}} {{/* the size doesn't take affect (and no need to take affect), image size(width) should be controlled by the parent container since this is not a flex layout*/}} - {{avatar $.Context .ContextUser 256}} + {{ctx.AvatarUtils.Avatar .ContextUser 256}} {{else}} - {{avatar $.Context .ContextUser 256}} + {{ctx.AvatarUtils.Avatar .ContextUser 256}} {{end}}
    @@ -86,7 +86,7 @@ {{if (or .Visibility.IsPublic (and ($.SignedUser) (or .Visibility.IsLimited (and (.HasMemberWithUserID $.SignedUserID) .Visibility.IsPrivate) ($.IsAdmin))))}}
  • - {{avatar $.Context .}} + {{ctx.AvatarUtils.Avatar .}}
    • {{end}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 4a8d6c6914..24768439f5 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -2,7 +2,7 @@ {{range .Feeds}}
    - {{avatarByAction $.Context .}} + {{ctx.AvatarUtils.AvatarByAction .}}
    diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 929e85a016..0aa6e4b162 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -3,7 +3,7 @@
    - {{avatar $.Context .ContextUser}} + {{ctx.AvatarUtils.Avatar .ContextUser}} {{.ContextUser.ShortName 40}} {{if .ContextUser.Visibility.IsLimited}}
    {{.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} @@ -17,7 +17,7 @@
    - {{avatar $.Context .SignedUser}} + {{ctx.AvatarUtils.Avatar .SignedUser}} {{.SignedUser.ShortName 40}} {{if .SignedUser.Visibility.IsLimited}}
    {{$.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} @@ -26,7 +26,7 @@     {{range .Orgs}} - {{avatar $.Context .}} + {{ctx.AvatarUtils.Avatar .}} {{.ShortName 40}} {{if .Visibility.IsLimited}}
    {{$.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 7a4ea17cb2..be986cd8cf 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -14,7 +14,7 @@ {{range .Orgs}}
    - {{avatar $.Context . 28 "mini"}} + {{ctx.AvatarUtils.Avatar . 28 "mini"}}
    {{template "shared/user/name" .}}