From 647b2649b1600107c5fec3505db691f78b2c1e2a Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 31 Aug 2022 17:58:54 +0200 Subject: [PATCH] Make sure fmt catches all templates (#20979) * Make sure fmt catches all templates Make's `wildcard` is not recursive so it missed many template files, fix that by using `find`. * Update Makefile --- Makefile | 2 +- templates/admin/auth/edit.tmpl | 12 +-- templates/admin/auth/new.tmpl | 8 +- templates/admin/user/edit.tmpl | 2 +- templates/admin/user/new.tmpl | 2 +- templates/mail/auth/activate.tmpl | 2 +- templates/mail/auth/activate_email.tmpl | 2 +- templates/mail/auth/reset_passwd.tmpl | 2 +- templates/org/member/members.tmpl | 4 +- templates/package/shared/list.tmpl | 2 +- templates/repo/diff/blob_excerpt.tmpl | 8 +- .../repo/diff/comment_form_datahandler.tmpl | 6 +- templates/repo/diff/comments.tmpl | 12 +-- templates/repo/diff/compare.tmpl | 8 +- templates/repo/diff/image_diff.tmpl | 16 ++-- templates/repo/diff/new_review.tmpl | 4 +- templates/repo/diff/section_split.tmpl | 4 +- templates/repo/diff/section_unified.tmpl | 4 +- templates/repo/diff/whitespace_dropdown.tmpl | 8 +- templates/repo/editor/edit.tmpl | 4 +- templates/repo/editor/upload.tmpl | 4 +- templates/repo/graph/commits.tmpl | 10 +-- templates/repo/issue/labels.tmpl | 2 +- templates/repo/issue/labels/label_list.tmpl | 4 +- templates/repo/issue/milestone_issues.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 4 +- templates/repo/issue/view_content.tmpl | 26 +++--- .../repo/issue/view_content/add_reaction.tmpl | 4 +- .../repo/issue/view_content/comments.tmpl | 80 +++++++++---------- .../view_content/comments_delete_time.tmpl | 6 +- .../repo/issue/view_content/context_menu.tmpl | 12 +-- templates/repo/issue/view_content/pull.tmpl | 24 +++--- .../repo/issue/view_content/reactions.tmpl | 2 +- .../view_content/reference_issue_dialog.tmpl | 2 +- .../repo/issue/view_content/sidebar.tmpl | 26 +++--- templates/repo/issue/view_title.tmpl | 18 ++--- templates/repo/migrate/migrate.tmpl | 2 +- templates/repo/projects/list.tmpl | 4 +- templates/repo/projects/view.tmpl | 42 +++++----- templates/repo/release/list.tmpl | 6 +- templates/repo/settings/collaboration.tmpl | 8 +- templates/repo/settings/lfs_pointers.tmpl | 2 +- templates/repo/settings/options.tmpl | 6 +- templates/repo/settings/tags.tmpl | 4 +- templates/repo/settings/webhook/history.tmpl | 4 +- templates/repo/wiki/revision.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/user/auth/change_passwd_inner.tmpl | 2 +- templates/user/auth/grant_error.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 6 +- templates/user/auth/signup_inner.tmpl | 6 +- .../user/auth/signup_openid_connect.tmpl | 2 +- .../user/auth/signup_openid_register.tmpl | 8 +- templates/user/dashboard/feeds.tmpl | 38 ++++----- templates/user/dashboard/milestones.tmpl | 2 +- .../user/notification/notification_div.tmpl | 2 +- templates/user/settings/account.tmpl | 4 +- .../user/settings/applications_oauth2.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- templates/user/settings/repos.tmpl | 2 +- templates/user/settings/security/twofa.tmpl | 2 +- 62 files changed, 251 insertions(+), 251 deletions(-) diff --git a/Makefile b/Makefile index 0b2dce53ee..9e0c29f2b5 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ clean: .PHONY: fmt fmt: @MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}' - $(eval TEMPLATES := $(wildcard templates/**/*.tmpl)) + $(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl')) @# strip whitespace after '{{' and before `}}` unless there is only whitespace before it @$(SED_INPLACE) -e 's/{{[ ]\{1,\}/{{/g' -e '/^[ ]\{1,\}}}/! s/[ ]\{1,\}}}/}}/g' $(TEMPLATES) diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 18722f4837..bf9d53152c 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -23,7 +23,7 @@ {{if or .Source.IsLDAP .Source.IsDLDAP}} - {{ $cfg:=.Source.Cfg }} + {{$cfg:=.Source.Cfg}}
@@ -180,7 +180,7 @@ {{if .Source.IsSMTP}} - {{ $cfg:=.Source.Cfg }} + {{$cfg:=.Source.Cfg}}
@@ -242,7 +242,7 @@ {{if .Source.IsPAM}} - {{ $cfg:=.Source.Cfg }} + {{$cfg:=.Source.Cfg}}
@@ -262,7 +262,7 @@ {{if .Source.IsOAuth2}} - {{ $cfg:=.Source.Cfg }} + {{$cfg:=.Source.Cfg}}
@@ -337,7 +337,7 @@
- +
@@ -365,7 +365,7 @@ {{if .Source.IsSSPI}} - {{ $cfg:=.Source.Cfg }} + {{$cfg:=.Source.Cfg}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 6bfda9fcd3..213c621b42 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -30,10 +30,10 @@
- {{ template "admin/auth/source/ldap" . }} + {{template "admin/auth/source/ldap" .}} - {{ template "admin/auth/source/smtp" . }} + {{template "admin/auth/source/smtp" .}}
@@ -51,10 +51,10 @@
- {{ template "admin/auth/source/oauth" . }} + {{template "admin/auth/source/oauth" .}} - {{ template "admin/auth/source/sspi" . }} + {{template "admin/auth/source/sspi" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index dd2646b50a..7aeaa2537c 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -12,7 +12,7 @@ {{.CsrfTokenHtml}}
- +
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index b8fd8c0ad1..9fdf0dce93 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -69,7 +69,7 @@
- +
diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index fcb54c0a78..75a0b8564a 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -6,7 +6,7 @@ {{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}} -{{ $activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} +{{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}}

{{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName | Str2html}}


{{.locale.Tr "mail.activate_account.text_2" .ActiveCodeLives | Str2html}}

{{$activate_url}}


diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index e65ebd6b98..0a24dc19c8 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -6,7 +6,7 @@ {{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}} -{{ $activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} +{{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}}

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape) | Str2html}}


{{.locale.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}

{{$activate_url}}


diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index a013ebd7a6..6a3625ab78 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -6,7 +6,7 @@ {{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}} -{{ $recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} +{{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}}

{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape) | Str2html}}


{{.locale.Tr "mail.reset_password.text" .ResetPwdCodeLives | Str2html}}

{{$recover_url}}


diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index b558dbe5ee..fceb080134 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}}
- {{ range .Members}} + {{range .Members}}
{{avatar . 48}} @@ -19,7 +19,7 @@ {{$.locale.Tr "org.members.membership_visibility"}}
- {{ $isPublic := index $.MembersIsPublicMember .ID}} + {{$isPublic := index $.MembersIsPublicMember .ID}} {{if $isPublic}} {{$.locale.Tr "org.members.public"}} {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}({{$.locale.Tr "org.members.public_helper"}}){{end}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index b48f772f39..37c47cef33 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -50,7 +50,7 @@ {{svg "octicon-package" 32}}

{{.locale.Tr "packages.empty"}}

{{if and .Repository .CanWritePackages}} - {{$packagesUrl := URLJoin .Owner.HTMLURL "-" "packages" }} + {{$packagesUrl := URLJoin .Owner.HTMLURL "-" "packages"}}

{{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}

{{end}}

{{.locale.Tr "packages.empty.documentation" | Safe}}

diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index c821d12d90..402435c467 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -3,12 +3,12 @@ {{if eq .GetType 4}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} {{svg "octicon-fold-down"}} {{end}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}} {{svg "octicon-fold-up"}} @@ -47,12 +47,12 @@ {{if eq .GetType 4}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} {{svg "octicon-fold-down"}} {{end}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}} {{svg "octicon-fold-up"}} diff --git a/templates/repo/diff/comment_form_datahandler.tmpl b/templates/repo/diff/comment_form_datahandler.tmpl index 9656944719..d0e493488d 100644 --- a/templates/repo/diff/comment_form_datahandler.tmpl +++ b/templates/repo/diff/comment_form_datahandler.tmpl @@ -1,7 +1,7 @@ {{if $.comment}} - {{ template "repo/diff/comment_form" dict "root" $.root "hidden" $.hidden "reply" $.reply "Line" $.comment.UnsignedLine "File" $.comment.TreePath "Side" $.comment.DiffSide "HasComments" true}} + {{template "repo/diff/comment_form" dict "root" $.root "hidden" $.hidden "reply" $.reply "Line" $.comment.UnsignedLine "File" $.comment.TreePath "Side" $.comment.DiffSide "HasComments" true}} {{else if $.root}} - {{ template "repo/diff/comment_form" $}} + {{template "repo/diff/comment_form" $}} {{else}} - {{ template "repo/diff/comment_form" dict "root" $}} + {{template "repo/diff/comment_form" dict "root" $}} {{end}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 9905f09baa..0cc7853378 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -1,8 +1,8 @@ {{range .comments}} -{{ $createdStr:= TimeSinceUnix .CreatedUnix $.root.locale }} +{{$createdStr:= TimeSinceUnix .CreatedUnix $.root.locale}}
- {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{else}} @@ -12,17 +12,17 @@
- {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}} - {{ .OriginalAuthor }} + {{.OriginalAuthor}} {{$.root.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{if $.root.Repository.OriginalURL}} - ({{$.root.locale.Tr "repo.migrated_from" ($.root.Repository.OriginalURL | Escape) ($.root.Repository.GetOriginalURLHostname | Escape) | Safe }}) + ({{$.root.locale.Tr "repo.migrated_from" ($.root.Repository.OriginalURL | Escape) ($.root.Repository.GetOriginalURLHostname | Escape) | Safe}}) {{end}} {{else}} @@ -46,7 +46,7 @@
{{end}} {{end}} - {{template "repo/issue/view_content/add_reaction" Dict "ctx" $.root "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }} + {{template "repo/issue/view_content/add_reaction" Dict "ctx" $.root "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID)}} {{template "repo/issue/view_content/context_menu" Dict "ctx" $.root "item" . "delete" true "issue" false "diff" true "IsCommentPoster" (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}}
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 426ea737bd..5875efaac3 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -7,11 +7,11 @@ {{if and $.PageIsComparePull $.IsSigned (not .Repository.IsArchived)}} {{.locale.Tr "repo.pulls.compare_changes"}}
{{.locale.Tr "repo.pulls.compare_changes_desc"}}
- {{ else }} + {{else}} {{.locale.Tr "action.compare_commits_general"}} - {{ end }} + {{end}} - {{ $BaseCompareName := $.BaseName -}} + {{$BaseCompareName := $.BaseName -}} {{- $HeadCompareName := $.HeadRepo.OwnerName -}} {{- if and (eq $.BaseName $.HeadRepo.OwnerName) (ne $.Repository.Name $.HeadRepo.Name) -}} {{- $HeadCompareName = printf "%s/%s" $.HeadRepo.OwnerName $.HeadRepo.Name -}} @@ -174,7 +174,7 @@
{{if .IsNothingToCompare}} - {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived) }} + {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived)}}
{{.locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr"}}
diff --git a/templates/repo/diff/image_diff.tmpl b/templates/repo/diff/image_diff.tmpl index 71a6da5c5e..4b95c8d85f 100644 --- a/templates/repo/diff/image_diff.tmpl +++ b/templates/repo/diff/image_diff.tmpl @@ -4,17 +4,17 @@
- {{.root.locale.Tr "repo.diff.image.side_by_side"}} + {{.root.locale.Tr "repo.diff.image.side_by_side"}} {{if and .blobBase .blobHead}} - {{.root.locale.Tr "repo.diff.image.swipe"}} - {{.root.locale.Tr "repo.diff.image.overlay"}} + {{.root.locale.Tr "repo.diff.image.swipe"}} + {{.root.locale.Tr "repo.diff.image.overlay"}} {{end}}
-
+
- {{if .blobBase }} + {{if .blobBase}}

{{.root.locale.Tr "repo.diff.file_before"}}

@@ -29,7 +29,7 @@

{{end}} - {{if .blobHead }} + {{if .blobHead}}

{{.root.locale.Tr "repo.diff.file_after"}}

@@ -47,7 +47,7 @@
{{if and .blobBase .blobHead}} -
+
@@ -61,7 +61,7 @@
-
+
diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index 857577b152..60ebb61fb9 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -22,9 +22,9 @@
{{end}}
- + - +
diff --git a/templates/repo/diff/section_split.tmpl b/templates/repo/diff/section_split.tmpl index 5ea71ae595..6143a47158 100644 --- a/templates/repo/diff/section_split.tmpl +++ b/templates/repo/diff/section_split.tmpl @@ -6,12 +6,12 @@ {{if eq .GetType 4}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} {{svg "octicon-fold-down"}} {{end}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}} {{svg "octicon-fold-up"}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index aaf53b97c5..373747002c 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -5,12 +5,12 @@ {{if eq .GetType 4}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} {{svg "octicon-fold-down"}} {{end}} - {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} + {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}} {{svg "octicon-fold-up"}} diff --git a/templates/repo/diff/whitespace_dropdown.tmpl b/templates/repo/diff/whitespace_dropdown.tmpl index d28cb12bf8..9df79dab73 100644 --- a/templates/repo/diff/whitespace_dropdown.tmpl +++ b/templates/repo/diff/whitespace_dropdown.tmpl @@ -3,19 +3,19 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- + {{.locale.Tr "repo.diff.whitespace_show_everything"}} - + {{.locale.Tr "repo.diff.whitespace_ignore_all_whitespace"}} - + {{.locale.Tr "repo.diff.whitespace_ignore_amount_changes"}} - + {{.locale.Tr "repo.diff.whitespace_ignore_at_eol"}}
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 77a6bf15e1..ebe56ec477 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -11,8 +11,8 @@
{{.Repository.Name}} - {{ $n := len .TreeNames}} - {{ $l := Subtract $n 1}} + {{$n := len .TreeNames}} + {{$l := Subtract $n 1}} {{range $i, $v := .TreeNames}}
/
{{if eq $i $l}} diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index d388f1ef65..f8496d5911 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -9,8 +9,8 @@
{{.Repository.Name}} - {{ $n := len .TreeNames}} - {{ $l := Subtract $n 1}} + {{$n := len .TreeNames}} + {{$l := Subtract $n 1}} {{range $i, $v := .TreeNames}}
/
{{if eq $i $l}} diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 478121f27c..357c99b2b8 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -1,10 +1,10 @@
    - {{ range $commitI, $commit := .Graph.Commits }} + {{range $commitI, $commit := .Graph.Commits}}
  • - {{ if $commit.OnlyRelation }} + {{if $commit.OnlyRelation}} - {{ else }} + {{else}} {{$class := "ui sha label"}} {{if $commit.Commit.Signature}} @@ -72,8 +72,8 @@ {{end}} {{$commit.Date}} - {{ end }} + {{end}}
    • - {{ end }} + {{end}}
diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 9467f3253b..88cfd124a7 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -19,7 +19,7 @@
-{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived) }} +{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} {{template "repo/issue/labels/edit_delete_label" .}} {{end}}
diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 660cf9f861..a56d5abf53 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -21,7 +21,7 @@
- {{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived) }} + {{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived)}} {{template "repo/issue/labels/label_load_template" .}}
{{else if and ($.PageIsOrgSettingsLabels) (eq .NumLabels 0)}} @@ -57,7 +57,7 @@
{{end}} - {{if and (not .PageIsOrgSettingsLabels) (.OrgLabels) }} + {{if and (not .PageIsOrgSettingsLabels) (.OrgLabels)}}
  • diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 0f00e9284a..e17cb2ae6c 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -22,7 +22,7 @@
    - {{ $closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale }} + {{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}} {{if .IsClosed}} {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} {{else}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 0b6fdd37f2..641dc6c918 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -71,7 +71,7 @@
    - {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.locale }} + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} {{else}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 1f03014b54..91a523a1e2 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -57,13 +57,13 @@ {{if or .Labels .OrgLabels}} {{range .Labels}} {{svg "octicon-check"}} {{.Name | RenderEmoji}} - {{if .Description }}
    {{.Description | RenderEmoji}}{{end}}     + {{if .Description}}
    {{.Description | RenderEmoji}}{{end}} {{end}}
    {{range .OrgLabels}} {{svg "octicon-check"}} {{.Name | RenderEmoji}} - {{if .Description }}
    {{.Description | RenderEmoji}}{{end}}     + {{if .Description}}
    {{.Description | RenderEmoji}}{{end}} {{end}} {{else}}
    {{.locale.Tr "repo.issues.new.no_items"}}
    diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 3d4d1450ae..de11846af7 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -15,11 +15,11 @@ - {{ $createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale }} + {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
    - {{if .Issue.OriginalAuthor }} + {{if .Issue.OriginalAuthor}} {{else}} @@ -29,16 +29,16 @@
    - {{if .Issue.OriginalAuthor }} + {{if .Issue.OriginalAuthor}} {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} - {{ .Issue.OriginalAuthor }} + {{.Issue.OriginalAuthor}} - {{ .locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe }} + {{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}} - {{if .Repository.OriginalURL}} ({{$.locale.Tr "repo.migrated_from" (.Repository.OriginalURL|Escape) (.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} + {{if .Repository.OriginalURL}} ({{$.locale.Tr "repo.migrated_from" (.Repository.OriginalURL|Escape) (.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}} {{else}} @@ -92,13 +92,13 @@
    - {{ template "repo/issue/view_content/comments" . }} + {{template "repo/issue/view_content/comments" .}} {{if and .Issue.IsPull (not $.Repository.IsArchived)}} - {{ template "repo/issue/view_content/pull". }} + {{template "repo/issue/view_content/pull".}} {{end}} {{if .IsSigned}} - {{ if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived) }} + {{if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived)}}
    {{avatar .SignedUser}} @@ -129,7 +129,7 @@
    - {{ else if .Repository.IsArchived }} + {{else if .Repository.IsArchived}}
    {{if .Issue.IsPull}} {{.locale.Tr "repo.archive.pull.nocomment"}} @@ -137,7 +137,7 @@ {{.locale.Tr "repo.archive.issue.nocomment"}} {{end}}
    - {{ end }} + {{end}} {{else}} {{if .Repository.IsArchived}}
    @@ -191,7 +191,7 @@
    - {{ template "repo/issue/view_content/sidebar" . }} + {{template "repo/issue/view_content/sidebar" .}}
    @@ -231,7 +231,7 @@
    {{svg "octicon-trash"}} - {{.locale.Tr "repo.branch.delete" .HeadTarget }} + {{.locale.Tr "repo.branch.delete" .HeadTarget}}

    {{.locale.Tr "repo.branch.delete_desc" | Str2html}}

    diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 1d0ddb62a9..9bd9022d28 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -1,10 +1,10 @@ {{if .ctx.IsSigned}} -
    +
    {{svg "octicon-smiley"}}
    -
    {{ .ctx.locale.Tr "repo.pick_reaction"}}
    +
    {{.ctx.locale.Tr "repo.pick_reaction"}}
    {{range $value := AllowedReactions}}
    {{ReactionToEmoji $value}}
    diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index e284d5aef5..e33981a012 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -1,7 +1,7 @@ -{{ template "base/alert" }} +{{template "base/alert"}} {{range .Issue.Comments}} {{if call $.ShouldShowCommentType .Type}} - {{ $createdStr:= TimeSinceUnix .CreatedUnix $.locale }} + {{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}} {{if eq .Type 0}}
    - {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{else}} @@ -24,16 +24,16 @@
    - {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} - {{ .OriginalAuthor }} + {{.OriginalAuthor}} {{$.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}} {{if $.Repository.OriginalURL}} - ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} + ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}} {{else}} {{if gt .Poster.ID 0}} @@ -101,7 +101,7 @@ {{.Poster.GetDisplayName}} - {{if .Issue.IsPull }} + {{if .Issue.IsPull}} {{$.locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}} {{else}} {{$.locale.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}} @@ -116,7 +116,7 @@ {{.Poster.GetDisplayName}} - {{if .Issue.IsPull }} + {{if .Issue.IsPull}} {{$.locale.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}} {{else}} {{$.locale.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}} @@ -140,19 +140,19 @@
    {{else if eq .Type 3 5 6}} - {{ $refFrom:= "" }} + {{$refFrom:= ""}} {{if ne .RefRepoID .Issue.RepoID}} - {{ $refFrom = $.locale.Tr "repo.issues.ref_from" (.RefRepo.FullName|Escape) }} + {{$refFrom = $.locale.Tr "repo.issues.ref_from" (.RefRepo.FullName|Escape)}} {{end}} - {{ $refTr := "repo.issues.ref_issue_from" }} + {{$refTr := "repo.issues.ref_issue_from"}} {{if .Issue.IsPull}} - {{ $refTr = "repo.issues.ref_pull_from" }} - {{else if eq .RefAction 1 }} - {{ $refTr = "repo.issues.ref_closing_from" }} - {{else if eq .RefAction 2 }} - {{ $refTr = "repo.issues.ref_reopening_from" }} + {{$refTr = "repo.issues.ref_pull_from"}} + {{else if eq .RefAction 1}} + {{$refTr = "repo.issues.ref_closing_from"}} + {{else if eq .RefAction 2}} + {{$refTr = "repo.issues.ref_reopening_from"}} {{end}} - {{ $createdStr:= TimeSinceUnix .CreatedUnix $.locale }} + {{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
    {{svg "octicon-bookmark"}} @@ -224,11 +224,11 @@ {{.Assignee.GetDisplayName}} - {{ if eq .Poster.ID .Assignee.ID }} + {{if eq .Poster.ID .Assignee.ID}} {{$.locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}} - {{ else }} + {{else}} {{$.locale.Tr "repo.issues.remove_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}} - {{ end }} + {{end}} {{else}} @@ -288,7 +288,7 @@ {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} - {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} + {{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
    {{svg "octicon-clock"}} {{.Content}} @@ -304,7 +304,7 @@ {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}} - {{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }} + {{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
    {{svg "octicon-clock"}} {{.Content}} @@ -408,7 +408,7 @@ {{else if eq .Type 22}}
    - {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{else}} {{avatar .Poster}} @@ -416,13 +416,13 @@ {{end}} {{svg (printf "octicon-%s" .Review.Type.Icon)}} - {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} - {{ .OriginalAuthor }} + {{.OriginalAuthor}} {{if $.Repository.OriginalURL}} - ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} + ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}} {{else}} {{.Poster.GetDisplayName}} {{end}} @@ -447,13 +447,13 @@
    - {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} - {{ .OriginalAuthor }} + {{.OriginalAuthor}} {{if $.Repository.OriginalURL}} - ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} + ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}} {{else}} {{.Poster.GetDisplayName}} {{end}} @@ -509,7 +509,7 @@ {{if .Review.CodeComments}}
    - {{ range $filename, $lines := .Review.CodeComments}} + {{range $filename, $lines := .Review.CodeComments}} {{range $line, $comms := $lines}}
    @@ -519,7 +519,7 @@ {{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}}
    {{$filename}} - {{if $invalid }} + {{if $invalid}} {{$.locale.Tr "repo.issues.review.outdated"}} @@ -564,24 +564,24 @@
    {{range $comms}} - {{ $createdSubStr:= TimeSinceUnix .CreatedUnix $.locale }} + {{$createdSubStr:= TimeSinceUnix .CreatedUnix $.locale}}
    - {{if not .OriginalAuthor }} + {{if not .OriginalAuthor}} {{avatar .Poster}} {{end}} - {{if .OriginalAuthor }} + {{if .OriginalAuthor}} {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} - {{ .OriginalAuthor }} + {{.OriginalAuthor}} {{if $.Repository.OriginalURL}} - ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe }}){{end}} + ({{$.locale.Tr "repo.migrated_from" ($.Repository.OriginalURL|Escape) ($.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}} {{else}} {{.Poster.GetDisplayName}} {{end}} @@ -671,17 +671,17 @@ {{avatar .Poster}} - {{ if .Content }} + {{if .Content}} {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}} - {{ else }} + {{else}} {{.Poster.GetDisplayName}} {{$.locale.Tr "repo.issues.lock_no_reason" $createdStr | Safe}} - {{ end }} + {{end}}
    {{else if eq .Type 24}}
    @@ -752,7 +752,7 @@ {{svg "octicon-repo-push"}} {{.Poster.GetDisplayName}} - {{ if .IsForcePush }} + {{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}} {{$.locale.TrN (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n" (len .Commits) $createdStr | Safe}} diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index 8ace95f33e..e01d2602f6 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -1,6 +1,6 @@ -{{ if .comment.Time }} {{/* compatibility with time comments made before v1.14 */}} - {{ if (not .comment.Time.Deleted) }} - {{ if (or .ctx.IsAdmin (and .ctx.IsSigned (eq .ctx.SignedUserID .comment.PosterID))) }} +{{if .comment.Time}} {{/* compatibility with time comments made before v1.14 */}} + {{if (not .comment.Time.Deleted)}} + {{if (or .ctx.IsAdmin (and .ctx.IsSigned (eq .ctx.SignedUserID .comment.PosterID)))}}
    diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index d3907eee99..45dd08bf61 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -4,12 +4,12 @@ {{svg "octicon-kebab-horizontal"}}
    - {{ $referenceUrl := "" }} - {{ if .issue }} - {{ $referenceUrl = Printf "%s#%s" .ctx.Issue.HTMLURL .item.HashTag }} - {{ else }} - {{ $referenceUrl = Printf "%s/files#%s" .ctx.Issue.HTMLURL .item.HashTag }} - {{ end }} + {{$referenceUrl := ""}} + {{if .issue}} + {{$referenceUrl = Printf "%s#%s" .ctx.Issue.HTMLURL .item.HashTag}} + {{else}} + {{$referenceUrl = Printf "%s/files#%s" .ctx.Issue.HTMLURL .item.HashTag}} + {{end}}
    {{.ctx.locale.Tr "repo.issues.context.copy_link"}}
    {{.ctx.locale.Tr "repo.issues.context.quote_reply"}}
    {{if not .ctx.UnitIssuesGlobalDisabled}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index fd901f013e..1e07225300 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -1,10 +1,10 @@ -{{if or .PullReviewers .OriginalReviews }} +{{if or .PullReviewers .OriginalReviews}}

    {{$.locale.Tr "repo.issues.review.reviewers"}}

    {{range .PullReviewers}} - {{ $createdStr:= TimeSinceUnix .Review.UpdatedUnix $.locale }} + {{$createdStr:= TimeSinceUnix .Review.UpdatedUnix $.locale}}
    @@ -71,7 +71,7 @@ {{- else if eq .Review.Type 4}}yellow {{else}}grey{{end}}"> - {{if .CanChange }} + {{if .CanChange}} {{if .Checked}} {{svg "octicon-trash"}} {{else}} {{svg "octicon-sync"}} {{end}} @@ -82,14 +82,14 @@
    {{end}} {{range .OriginalReviews}} - {{ $createdStr:= TimeSinceUnix .UpdatedUnix $.locale }} + {{$createdStr:= TimeSinceUnix .UpdatedUnix $.locale}}
    - + {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} - {{ .OriginalAuthor }} + {{.OriginalAuthor}}
    @@ -180,7 +180,7 @@
    {{svg "octicon-x"}} - {{$.locale.Tr "repo.pulls.cannot_merge_work_in_progress" }} + {{$.locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
    {{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}} @@ -224,7 +224,7 @@ {{else if .IsBlockedByChangedProtectedFiles}}
    {{svg "octicon-x" 16}} - {{$.locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe }} + {{$.locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe}}
    {{range .ChangedProtectedFiles}}
    {{.}}
    @@ -248,7 +248,7 @@
    - {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }} + {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
    {{end}} @@ -278,7 +278,7 @@ {{else if .IsSigned}}
    - {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }} + {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
    {{end}} {{end}} @@ -290,7 +290,7 @@ {{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
    - {{if and .UpdateAllowed .UpdateByRebaseAllowed }} + {{if and .UpdateAllowed .UpdateByRebaseAllowed}}
    diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 6703283b8c..9e265f9a91 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -42,8 +42,8 @@
  • {{svg "octicon-project"}} {{.Title}}
    - {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.locale }} - {{if .IsClosed }} + {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{if .IsClosed}} {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} {{end}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 0f96f11f6c..262efd2e0e 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -78,7 +78,7 @@
    - {{ range $board := .Boards }} + {{range $board := .Boards}}
    @@ -169,13 +169,13 @@
    - {{ end }} + {{end}}
    - {{ range (index $.IssuesMap .ID) }} + {{range (index $.IssuesMap .ID)}}
    @@ -207,8 +207,8 @@
    #{{.Index}} - {{ $timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale }} - {{if .OriginalAuthor }} + {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}} + {{if .OriginalAuthor}} {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} {{else if gt .Poster.ID 0}} {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} @@ -217,43 +217,43 @@ {{end}}
    - {{- if .MilestoneID }} + {{- if .MilestoneID}}
    - + {{svg "octicon-milestone" 16 "mr-2 vm"}} - {{ .Milestone.Name }} + {{.Milestone.Name}}
    - {{- end }} - {{- range index $.LinkedPRs .ID }} + {{- end}} + {{- range index $.LinkedPRs .ID}}
    - + {{svg "octicon-git-merge" 16 "mr-2 vm"}} - {{ .Title}} #{{.Index}} + {{.Title}} #{{.Index}}
    - {{- end }} + {{- end}}
    - {{ if or .Labels .Assignees }} + {{if or .Labels .Assignees}}
    - {{ range .Labels }} + {{range .Labels}} {{.Name | RenderEmoji}} - {{ end }} + {{end}}
    - {{ range .Assignees }} + {{range .Assignees}} {{avatar . 28 "mini mr-3"}} - {{ end }} + {{end}}
    - {{ end }} + {{end}}
    - {{ end }} + {{end}}
    • - {{ end }} + {{end}}
    diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 4eb099129a..1f04743eaf 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -84,7 +84,7 @@ {{svg "octicon-git-commit" 16 "mr-2"}}{{ShortSha .Sha1}} {{end}} - {{if .Sha1 }} + {{if .Sha1}} {{template "repo/branch_dropdown" dict "root" $ "release" .}} {{end}} {{end}} @@ -95,12 +95,12 @@ {{svg "octicon-tag" 16 "mr-2"}}{{.TagName}}

    - {{ if gt .Publisher.ID 0 }} + {{if gt .Publisher.ID 0}} {{avatar .Publisher 20}} {{.Publisher.Name}} - {{ end }} + {{end}} {{$.locale.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}} {{$.locale.Tr "repo.release.ahead.target" $.DefaultBranch}}

    diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 5d152a62e4..342b260db6 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -56,7 +56,7 @@

    {{$.locale.Tr "repo.settings.teams"}}

    - {{ $allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner)) }} + {{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}} {{if .Teams}}
    {{range $t, $team := .Teams}} @@ -71,10 +71,10 @@
    {{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
    - {{ if or (eq .AccessMode 1) (eq .AccessMode 2) }} - {{ $first := true }} + {{if or (eq .AccessMode 1) (eq .AccessMode 2)}} + {{$first := true}}
    - Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $unit.Type) ($team.UnitEnabled $unit.Type)}}{{if $first}}{{ $first = false }}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}} + Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $unit.Type) ($team.UnitEnabled $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
    {{end}}
    diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index 85ce2a4324..07633e3342 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -5,7 +5,7 @@
    {{template "base/alert" .}}

    - {{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist }} + {{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}} {{if gt .NumAssociatable 0}}
    diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index f34057d9c0..a9ceebd446 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -336,7 +336,7 @@

    - +
    @@ -678,9 +678,9 @@ - {{ else }} + {{else}} - {{ end }} + {{end}}
    {{.locale.Tr "repo.settings.transfer"}}
    diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index d18061c115..1c7e915c66 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -93,14 +93,14 @@ {{if or .AllowlistUserIDs (and $.Owner.IsOrganization .AllowlistTeamIDs)}} {{$userIDs := .AllowlistUserIDs}} {{range $.Users}} - {{if contain $userIDs .ID }} + {{if contain $userIDs .ID}} {{avatar . 26}} {{.GetDisplayName}} {{end}} {{end}} {{if $.Owner.IsOrganization}} {{$teamIDs := .AllowlistTeamIDs}} {{range $.Teams}} - {{if contain $teamIDs .ID }} + {{if contain $teamIDs .ID}} {{.Name}} {{end}} {{end}} diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index e99ff6a0b9..767d66114c 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -54,7 +54,7 @@
    {{$.locale.Tr "repo.settings.webhook.headers"}}
    Request URL: {{.RequestInfo.URL}}
 Request method: {{if .RequestInfo.HTTPMethod}}{{.RequestInfo.HTTPMethod}}{{else}}POST{{end}}
-{{ range $key, $val := .RequestInfo.Headers }}{{$key}}: {{$val}}
+{{range $key, $val := .RequestInfo.Headers}}{{$key}}: {{$val}}
 {{end}}
    {{$.locale.Tr "repo.settings.webhook.payload"}}
    {{.PayloadContent}}
    @@ -65,7 +65,7 @@
    {{if .ResponseInfo}}
    {{$.locale.Tr "repo.settings.webhook.headers"}}
    - 
    {{ range $key, $val := .ResponseInfo.Headers }}{{$key}}: {{$val}}
+								
    {{range $key, $val := .ResponseInfo.Headers}}{{$key}}: {{$val}}
 {{end}}
    
 								
    {{$.locale.Tr "repo.settings.webhook.body"}}
    
 								
    {{.ResponseInfo.Body}}
    
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index 71b69220c6..b49441f4eb 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 
    
 	{{template "repo/header" .}}
-	{{ $title := .title}}
+	{{$title := .title}}
 	
    
 		
    
 			
    
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index d641c25cf0..3cd6617dd9 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 
    
 	{{template "repo/header" .}}
-	{{ $title := .title}}
+	{{$title := .title}}
 	
    
 		
    
 			
    
diff --git a/templates/user/auth/change_passwd_inner.tmpl b/templates/user/auth/change_passwd_inner.tmpl
index 49ae608053..4b18ac944f 100644
--- a/templates/user/auth/change_passwd_inner.tmpl
+++ b/templates/user/auth/change_passwd_inner.tmpl
@@ -20,7 +20,7 @@
 
 			
    
 				
-				
+				
 			
    
 			
 		
    
diff --git a/templates/user/auth/grant_error.tmpl b/templates/user/auth/grant_error.tmpl
index 2173a3311b..b775ac9b92 100644
--- a/templates/user/auth/grant_error.tmpl
+++ b/templates/user/auth/grant_error.tmpl
@@ -4,7 +4,7 @@
 	
    
 		
    
 			
    
-				{{.locale.Tr "auth.authorization_failed" }}
+				{{.locale.Tr "auth.authorization_failed"}}
 			
    
 			
    {{.Error.ErrorDescription}}
    
 			
    
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index bba7b2bc4b..e55eb8d330 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -10,10 +10,10 @@
 				
 				
    
 					{{template "base/alert" .}}
-					{{if .user_email }}
+					{{if .user_email}}
 						
    
 							
-							
+							
 						
    
 					{{end}}
 					{{if .IsResetForm}}
@@ -34,7 +34,7 @@
 						
    
 							{{.locale.Tr "twofa"}}
 						
    
-						
    {{.locale.Tr "settings.twofa_is_enrolled" | Str2html }}
    
+						
    {{.locale.Tr "settings.twofa_is_enrolled" | Str2html}}
    
 						{{if .scratch_code}}
 						
    
 							
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index b868b77bed..43df945931 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -46,19 +46,19 @@
 				{{end}}
 				{{if and .EnableCaptcha (eq .CaptchaType "recaptcha")}}
 					
    
-						
    
+						
    
 					
    
 				{{end}}
 				{{if and .EnableCaptcha (eq .CaptchaType "hcaptcha")}}
 					
    
-						
    
+						
    
 					
    
 				{{end}}
 				{{if and .EnableCaptcha (eq .CaptchaType "mcaptcha")}}
 					
    
 						{{.locale.Tr "captcha"}}
 						
    
-						
    
+						
    
 					
    
 				{{end}}
 
diff --git a/templates/user/auth/signup_openid_connect.tmpl b/templates/user/auth/signup_openid_connect.tmpl
index b023ca1125..36f0277b40 100644
--- a/templates/user/auth/signup_openid_connect.tmpl
+++ b/templates/user/auth/signup_openid_connect.tmpl
@@ -22,7 +22,7 @@
 					
    
 					
    
 						
-						
+						
 					
    
 					
    
 						
diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl
index 9fe0a9de1b..9c0558311f 100644
--- a/templates/user/auth/signup_openid_register.tmpl
+++ b/templates/user/auth/signup_openid_register.tmpl
@@ -32,22 +32,22 @@
 					{{end}}
 					{{if and .EnableCaptcha (eq .CaptchaType "recaptcha")}}
 						
    
-							
    
+							
    
 						
    
 					{{end}}
 					{{if and .EnableCaptcha (eq .CaptchaType "hcaptcha")}}
 						
    
-							
    
+							
    
 						
    
 					{{end}}
 					{{if and .EnableCaptcha (eq .CaptchaType "mcaptcha")}}
 						
    
-							
    
+							
    
 						
    
 					{{end}}
 					
    
 						
-						
+						
 					
    
 					
    
 						
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 95e2239257..1862f32b6b 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -23,38 +23,38 @@
 								{{$.locale.Tr "action.create_branch" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}}
 							{{end}}
 						{{else if eq .GetOpType 6}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.create_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 7}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.create_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 8}}
 							{{$.locale.Tr "action.transfer_repo" .GetContent (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 9}}
 							{{$.locale.Tr "action.push_tag" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 10}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.comment_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 11}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.merge_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 12}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.close_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 13}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.reopen_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 14}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.close_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 15}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.reopen_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 16}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.delete_tag" (.GetRepoLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 17}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.delete_branch" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 18}}
 							{{$.locale.Tr "action.mirror_sync_push" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
@@ -63,30 +63,30 @@
 						{{else if eq .GetOpType 20}}
 							{{$.locale.Tr "action.mirror_sync_delete" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 21}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.approve_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 22}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.reject_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 23}}
-							{{ $index := index .GetIssueInfos 0}}
+							{{$index := index .GetIssueInfos 0}}
 							{{$.locale.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
 						{{else if eq .GetOpType 24}}
-							{{ $linkText := .Content | RenderEmoji }}
+							{{$linkText := .Content | RenderEmoji}}
 							{{$.locale.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/releases/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}}
 						{{else if eq .GetOpType 25}}
-							{{ $index := index .GetIssueInfos 0}}
-							{{ $reviewer := index .GetIssueInfos 1}}
+							{{$index := index .GetIssueInfos 0}}
+							{{$reviewer := index .GetIssueInfos 1}}
 							{{$.locale.Tr "action.review_dismissed" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) $reviewer | Str2html}}
 						{{end}}
 					
    
 					{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}
 						
    
 							
      
-								{{ $push := ActionContent2Commits .}}
-								{{ $repoLink := .GetRepoLink}}
+								{{$push := ActionContent2Commits .}}
+								{{$repoLink := .GetRepoLink}}
 								{{range $push.Commits}}
-									{{ $commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
+									{{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
 									
    • 
 										{{avatarHTML ($push.AvatarLink .AuthorEmail) 16 "mr-2" .AuthorName}}
 										{{ShortSha .Sha1}}
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 9044c7a2a4..248d37b2e4 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -91,7 +91,7 @@
 								
    
 							
    
 							
    
-								{{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.locale }}
+								{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
 								{{if .IsClosed}}
 									{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 								{{else}}
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl
index 6dce7f751b..192652d06b 100644
--- a/templates/user/notification/notification_div.tmpl
+++ b/templates/user/notification/notification_div.tmpl
@@ -2,7 +2,7 @@
 	
    
 		
    {{.locale.Tr "notification.notifications"}}
    
 		
    
-			{{ $notificationUnreadCount := call .NotificationUnreadCount}}
+			{{$notificationUnreadCount := call .NotificationUnreadCount}}
 			
 				{{.locale.Tr "notification.unread"}}
 				
    {{$notificationUnreadCount}}
    
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 53fd25313a..3070e8889c 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -139,9 +139,9 @@
 		
    
 			
    
 				
    {{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}
    
-				{{ if .UserDeleteWithComments }}
+				{{if .UserDeleteWithComments}}
 				
    {{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}
    
-				{{ end }}
+				{{end}}
 			
    
 			
    
 				{{template "base/disable_form_autofill"}}
diff --git a/templates/user/settings/applications_oauth2.tmpl b/templates/user/settings/applications_oauth2.tmpl
index 424060d2e0..5e53ed00ca 100644
--- a/templates/user/settings/applications_oauth2.tmpl
+++ b/templates/user/settings/applications_oauth2.tmpl
@@ -29,7 +29,7 @@
 
    
 
    
 	
    
-		{{.locale.Tr "settings.create_oauth2_application" }}
+		{{.locale.Tr "settings.create_oauth2_application"}}
 	
    
 	
 		{{.CsrfTokenHtml}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 7e0158a5f1..bcab968d59 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -1,7 +1,7 @@
 
    
 	{{.locale.Tr "settings.manage_ssh_keys"}}
 	
    
-		{{if not .DisableSSH }}
+		{{if not .DisableSSH}}
 			
    
 				{{.locale.Tr "settings.add_key"}}
 			
    
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index aedff91de9..54ea7ad2e1 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -11,7 +11,7 @@
 				{{if .Dirs}}
 					
    
 						{{range $dirI, $dir := .Dirs}}
-							{{ $repo := index $.ReposMap $dir}}
+							{{$repo := index $.ReposMap $dir}}
 							
    
 								
    
 									{{if $repo}}
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index 3d2f78ed0d..a4da947628 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -4,7 +4,7 @@
 
    
 	
    {{.locale.Tr "settings.twofa_desc"}}
    
 	{{if .TOTPEnrolled}}
-	
    {{$.locale.Tr "settings.twofa_is_enrolled" | Str2html }}
    
+	
    {{$.locale.Tr "settings.twofa_is_enrolled" | Str2html}}
    
 	
 		{{.CsrfTokenHtml}}
 		
    {{.locale.Tr "settings.regenerate_scratch_token_desc"}}