From dfe0672a68df1e9261a84747a0bc6085cc4b78bb Mon Sep 17 00:00:00 2001 From: delvh Date: Mon, 6 Mar 2023 18:03:09 +0100 Subject: [PATCH 1/5] Convert `
` to ` -
{{.locale.Tr "admin.auths.delete"}}
+
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 091f5011f9530..d8fa986cff3e3 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -78,7 +78,7 @@ {{.locale.Tr "admin.emails.change_email_header"}}
-

{{.locale.Tr "admin.emails.change_email_text"}}

+

{{.locale.Tr "admin.emails.change_email_text"}}

{{$.CsrfTokenHtml}} @@ -93,11 +93,9 @@ -
-
{{$.locale.Tr "settings.cancel"}}
- +
+ {{template "base/delete_modal_actions" .}}
-
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index a2c7ca2f6ae83..34bd83a21449a 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -23,7 +23,7 @@
- +
{{.ID}} @@ -39,13 +39,11 @@ -
-
- {{.CsrfTokenHtml}} - -
-
-
+
+ {{.CsrfTokenHtml}} + +
+
{{/* TODO: Make this dropdown accessible */}} {{.locale.Tr "admin.notices.operations"}}
@@ -59,9 +57,9 @@
-
+
+ diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index 2629056d1dd5c..7ff41d503ad29 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -43,16 +43,7 @@ -
-
- {{svg "octicon-trash" 16 "gt-mr-2"}} - {{$.locale.Tr "modal.no"}} -
- -
+ {{template "base/delete_modal_actions" .}}
@@ -70,16 +61,7 @@ -
-
- {{svg "octicon-trash" 16 "gt-mr-2"}} - {{$.locale.Tr "modal.no"}} -
- -
+ {{template "base/delete_modal_actions" .}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 5dd1f531fda92..5c8787960c370 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -151,7 +151,7 @@
-
{{.locale.Tr "admin.users.delete_account"}}
+
@@ -189,7 +189,7 @@
- {{$.locale.Tr "settings.delete_current_avatar"}} + {{$.locale.Tr "settings.delete_current_avatar"}}{{/* TODO: Why is this link not focusable? */}}
@@ -213,16 +213,7 @@

{{.locale.Tr "admin.users.purge_help"}}

-
-
- {{svg "octicon-x"}} - {{.locale.Tr "modal.no"}} -
- -
- + {{template "base/delete_modal_actions" .}} + {{template "base/footer" .}} diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl index fb4d31270af53..58f96236bbd56 100644 --- a/templates/base/delete_modal_actions.tmpl +++ b/templates/base/delete_modal_actions.tmpl @@ -1,10 +1,10 @@
-
+
-
+ +
+
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 669e393e1decc..69e226f410a79 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -19,9 +19,9 @@ -
+
+ diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 5436bcba05ca6..e04b391271623 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -11,7 +11,7 @@
-
{{.locale.Tr "repo.issues.new_label"}}
+
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index dc12fb8207dd5..875bf852bb98a 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -57,10 +57,7 @@
{{.CsrfTokenHtml}} -
-
{{.locale.Tr "cancel"}}
- -
+ {{template "base/delete_modal_actions" .}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 8d9594e2b4773..2e9b8bc254702 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -84,15 +84,6 @@

{{.locale.Tr "repo.projects.deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}} {{end}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 074c5315ab2a3..972374a3c4f02 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -29,7 +29,7 @@
-
{{$.locale.Tr "settings.cancel"}}
+
@@ -127,7 +127,7 @@
-
{{$.locale.Tr "settings.cancel"}}
+
@@ -143,8 +143,8 @@ {{$.locale.Tr "repo.projects.column.set_default_desc"}} -
-
{{$.locale.Tr "settings.cancel"}}
+
{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} +
@@ -158,8 +158,8 @@ {{$.locale.Tr "repo.projects.column.deletion_desc"}} -
-
{{$.locale.Tr "settings.cancel"}}
+
{{/* TODO: convert to base/delete_modal_actions.tmpl */}} +
@@ -265,15 +265,6 @@

{{.locale.Tr "repo.projects.deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}} {{end}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index ae1d426bc0741..d0e39f318e729 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -6,12 +6,10 @@
-
- - {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
+ + {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{.locale.Tr "repo.activity.period.daily"}} {{.locale.Tr "repo.activity.period.halfweekly"}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index a093c19deb8cc..4fe28a6e749ec 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -175,8 +175,8 @@
-
-
{{.locale.Tr "settings.cancel"}}
+
{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} +
diff --git a/templates/repo/cite/cite_modal.tmpl b/templates/repo/cite/cite_modal.tmpl index 185b34173dc81..2f2933f014721 100644 --- a/templates/repo/cite/cite_modal.tmpl +++ b/templates/repo/cite/cite_modal.tmpl @@ -15,8 +15,8 @@
-
+
+
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 028fdc7e51484..9bd2bc5542587 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -96,7 +96,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
@@ -121,7 +121,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 4e6879650ddcc..d2677ad16b275 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -107,8 +107,8 @@
{{if $showFileViewToggle}}
- {{svg "octicon-code"}} - {{svg "octicon-file"}} + +
{{end}} {{if $file.IsProtected}} @@ -200,8 +200,8 @@ {{$.locale.Tr "loading"}}
-
{{.locale.Tr "repo.issues.cancel"}}
-
{{.locale.Tr "repo.issues.save"}}
+ +
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index c7538a7969638..1c82e3f20f3e5 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -43,10 +43,10 @@
{{svg "octicon-git-compare"}}
-
+
+
{{svg "octicon-filter" 16}} @@ -112,10 +112,10 @@
{{.CompareSeparator}}
-
+
+
{{svg "octicon-filter" 16}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 992ccee8e4ff5..897e3c764071c 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -64,15 +64,15 @@

{{.locale.Tr "repo.editor.commit_empty_file_text"}}

-
-
+
{{/* TODO: Convert to base/delete_modal_actions.tmpl*/}} +
-
+ +
+
diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index bbd5c2dbdef1a..3e0e873e07cca 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -45,14 +45,14 @@

{{.locale.Tr "repo.editor.commit_empty_file_text"}}

-
- +
-
- + +
+
diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 51eb5e26a0659..cd3dc97ff55c7 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -6,10 +6,10 @@
-
+
+
{{svg "octicon-filter" 16}} diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 82cfcd071204c..0a25d9c87ff1b 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -6,7 +6,7 @@ {{template "repo/issue/navbar" .}} {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
-
{{.locale.Tr "repo.issues.new_label"}}
+
{{end}}
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 450061e8357c2..9931a3208e2ae 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -6,16 +6,7 @@

{{.locale.Tr "repo.issues.label_deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}}
@@ -61,11 +52,13 @@
-
+
-
+ +
+
diff --git a/templates/repo/issue/labels/label_new.tmpl b/templates/repo/issue/labels/label_new.tmpl index 62f7155b745c8..6f2461af22fed 100644 --- a/templates/repo/issue/labels/label_new.tmpl +++ b/templates/repo/issue/labels/label_new.tmpl @@ -36,12 +36,15 @@
+
-
+
-
+ +
+
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index ca05264e77b62..36faf861136b5 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -213,9 +213,9 @@ {{if not .Repository.IsArchived}} {{if .IsShowClosed}} -
{{.locale.Tr "repo.issues.action_open"}}
+ {{else}} -
{{.locale.Tr "repo.issues.action_close"}}
+ {{end}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 2918c4359f9d7..b4f036d32afe3 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -149,9 +149,9 @@
{{if .IsShowClosed}} -
{{.locale.Tr "repo.issues.action_open"}}
+ {{else}} -
{{.locale.Tr "repo.issues.action_close"}}
+ {{end}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 3730d3d3c46f3..5797b358f7795 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -124,16 +124,7 @@

{{.locale.Tr "repo.milestones.deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}}
{{end}} {{template "base/footer" .}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 6aec6e3157f43..1624417ba203f 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -112,13 +112,13 @@
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} {{if .Issue.IsClosed}} -
+
+ {{else}} -
+
+ {{end}} {{end}}
+ {{else}} -
+
+ {{end}} {{end}} +
diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index bc08d7fde78de..b79b7ae2be09c 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -7,10 +7,7 @@ {{.ctxData.CsrfTokenHtml}}
{{.ctxData.locale.Tr "repo.issues.del_time"}}
-
-
{{.ctxData.locale.Tr "repo.issues.context.delete"}}
-
{{.ctxData.locale.Tr "repo.issues.add_time_cancel"}}
-
+ {{template "base/delete_modal_actions" .}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 29bfac7c27ea2..4c9246b4cf32f 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -388,8 +388,8 @@
-
{{.locale.Tr "repo.issues.add_time_short"}}
-
{{.locale.Tr "repo.issues.add_time_cancel"}}
+ +
@@ -574,14 +574,14 @@ {{end}}

-
+
-
+ +
+
{{end}} @@ -661,7 +661,7 @@ {{end}}
-
{{.locale.Tr "settings.cancel"}}
+
diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 6d36a9b45f388..4bd9b5146eaa1 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -19,8 +19,8 @@
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-
{{$.locale.Tr "repo.pulls.update_branch"}}
-
{{$.locale.Tr "repo.pulls.update_branch_rebase"}}
+ +
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index f0ac1e021ec4b..dc0f7e135608d 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,9 +1,7 @@
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} -
- -
+ {{end}}

{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} @@ -63,16 +61,16 @@ {{end}}
-
+
+
{{svg "octicon-arrow-right"}}
-
+
+
{{svg "octicon-filter" 16}} diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index a3552610c47d1..0e729bfa27fa9 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -72,7 +72,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index fc4770e5d8d42..3dc4b5c03a519 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -86,16 +86,7 @@

{{.locale.Tr "repo.projects.deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}}
{{end}} {{template "base/footer" .}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index f6bc6e1a42a6e..014d172f5b9ca 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -33,7 +33,7 @@
-
{{$.locale.Tr "settings.cancel"}}
+
@@ -131,7 +131,7 @@

-
{{$.locale.Tr "settings.cancel"}}
+
@@ -148,7 +148,7 @@
-
{{$.locale.Tr "settings.cancel"}}
+
@@ -162,8 +162,8 @@ {{$.locale.Tr "repo.projects.column.deletion_desc"}} -
-
{{$.locale.Tr "settings.cancel"}}
+
{{/* Convert to base/delete_modal_actions.tmpl? */}} +
@@ -276,16 +276,7 @@

{{.locale.Tr "repo.projects.deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}} {{end}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 37d7ca032196e..fa03b3733f429 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -109,7 +109,7 @@ {{$.locale.Tr "repo.release.delete_release"}} {{if .IsDraft}} - + @@ -120,9 +120,9 @@ {{end}} {{else}} {{if not .tag_name}} - + {{end}} - + diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 22fddeb4df67d..ea4fba240edba 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -8,9 +8,9 @@ {{.locale.Tr "repo.settings.deploy_keys"}}
{{if not .DisableSSH}} -
{{.locale.Tr "repo.settings.add_deploy_key"}}
+ {{else}} -
{{.locale.Tr "settings.ssh_disabled"}}
+ {{end}}
@@ -85,15 +85,6 @@

{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}} {{template "base/footer" .}} diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 566a701efb2a8..547a627cb9f94 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -50,8 +50,8 @@

{{$.CsrfTokenHtml}} -
-
{{$.locale.Tr "settings.cancel"}}
+
{{/* Convert to base/delete_modal_actions */}} +
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index 8eebc6e870a19..67021ba6cda6b 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -49,9 +49,9 @@ {{ShortSha .Oid}} {{else}} - + {{end}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 030c77b881da4..c6c3cb66ba318 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -825,7 +825,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
@@ -856,7 +856,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
@@ -892,7 +892,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
@@ -926,7 +926,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
@@ -958,7 +958,7 @@
-
{{.locale.Tr "settings.cancel"}}
+
@@ -988,10 +988,7 @@ {{.CsrfTokenHtml}} -
-
{{.locale.Tr "settings.cancel"}}
- -
+ {{template "base/delete_modal_actions" .}} {{end}} diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index 61c57995134c1..70fe0237e27c4 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -2,7 +2,7 @@ {{.Title}}
-
{{.locale.Tr "repo.settings.add_webhook"}}
+
{{.locale.Tr "repo.settings.web_hook_name_gitea"}} diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl index fdc49ada4e379..f455899663e8f 100644 --- a/templates/repo/settings/webhook/delete_modal.tmpl +++ b/templates/repo/settings/webhook/delete_modal.tmpl @@ -6,14 +6,5 @@

{{.locale.Tr "repo.settings.webhook_deletion_desc"}}

-
-
- - {{.locale.Tr "modal.no"}} -
-
- - {{.locale.Tr "modal.yes"}} -
-
+ {{template "base/delete_modal_actions" .}}
diff --git a/templates/repo/unicode_escape_prompt.tmpl b/templates/repo/unicode_escape_prompt.tmpl index d55bd0150a1b6..12eff6aebe3af 100644 --- a/templates/repo/unicode_escape_prompt.tmpl +++ b/templates/repo/unicode_escape_prompt.tmpl @@ -1,7 +1,7 @@ {{if .EscapeStatus}} {{if .EscapeStatus.HasInvisible}}
- {{svg "octicon-x" 16 "close inside"}} +
{{$.root.locale.Tr "repo.invisible_runes_header"}}
@@ -12,7 +12,7 @@
{{else if .EscapeStatus.HasAmbiguous}}
- {{svg "octicon-x" 16 "close inside"}} +
{{$.root.locale.Tr "repo.ambiguous_runes_header"}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 15553cedd8838..5928cd34ad8fd 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -7,13 +7,13 @@
-
+
+
{{svg "octicon-filter" 16}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index eabddbb30cdce..30c52c01b4577 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -20,9 +20,9 @@
-
+
+
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 9105b7ad9bf4b..4aa5f0ccd578a 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -1,7 +1,7 @@

{{.locale.Tr "secrets.secrets"}}
-
{{.locale.Tr "secrets.creation"}}
+

diff --git a/templates/user/auth/grant.tmpl b/templates/user/auth/grant.tmpl index c906db3e0a174..060b675273003 100644 --- a/templates/user/auth/grant.tmpl +++ b/templates/user/auth/grant.tmpl @@ -23,7 +23,7 @@ - + Cancel
diff --git a/templates/user/auth/webauthn_error.tmpl b/templates/user/auth/webauthn_error.tmpl index 447d289a28070..4e5622de2af72 100644 --- a/templates/user/auth/webauthn_error.tmpl +++ b/templates/user/auth/webauthn_error.tmpl @@ -17,6 +17,6 @@
-
{{.locale.Tr "cancel"}}
+
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 9a57bd5722670..53f7d021e0b6a 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -151,9 +151,9 @@
-
+
+ {{.locale.Tr "auth.forgot_password"}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index ef9ac9a97784c..17acb724a647b 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -270,15 +270,16 @@

{{.locale.Tr "settings.access_token_deletion_desc"}}

-
-
- + +
{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} +
-
- + +
+
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index c80890940a442..93ca12a0880ce 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -1,7 +1,7 @@

{{.locale.Tr "settings.manage_gpg_keys"}}
-
{{.locale.Tr "settings.add_key"}}
+

diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index cc1152b739a69..8012b874cdcff 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -3,9 +3,9 @@ {{.locale.Tr "settings.manage_ssh_principals"}}
{{if not .DisableSSH}} -
{{.locale.Tr "settings.add_new_principal"}}
+ {{else}} -
{{.locale.Tr "settings.ssh_disabled"}}
+ {{end}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 891959d351456..1ff4dab34e318 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -2,11 +2,11 @@ {{.locale.Tr "settings.manage_ssh_keys"}}
{{if not .DisableSSH}} -
+
+ {{else}} -
{{.locale.Tr "settings.ssh_disabled"}}
+ {{end}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 902b3fb2f33b2..2e107ca7fa1a7 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -50,16 +50,7 @@ {{$.CsrfTokenHtml}} -
-
- - {{$.locale.Tr "modal.no"}} -
- -
+ {{template "base/delete_modal_actions" .}}
{{end}} @@ -77,16 +68,7 @@ {{$.CsrfTokenHtml}} -
-
- - {{$.locale.Tr "modal.no"}} -
- -
+ {{template "base/delete_modal_actions" .}}
{{end}} diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl index e8eed632946c1..fa82bf6611487 100644 --- a/templates/user/settings/security/accountlinks.tmpl +++ b/templates/user/settings/security/accountlinks.tmpl @@ -3,7 +3,7 @@ {{if .OrderedOAuth2Names}}
-
{{.locale.Tr "settings.link_account"}}
+
{{range $key := .OrderedOAuth2Names}} {{$provider := index $.OAuth2Providers $key}} diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl index a4da947628869..1a0a8a6432c09 100644 --- a/templates/user/settings/security/twofa.tmpl +++ b/templates/user/settings/security/twofa.tmpl @@ -13,7 +13,7 @@
{{.CsrfTokenHtml}}

{{.locale.Tr "settings.twofa_disable_note"}}

-
{{$.locale.Tr "settings.twofa_disable"}}
+
{{else}}

{{.locale.Tr "settings.twofa_not_enrolled"}}

From a703d8640f26aa464f726b648174be15c74ece0d Mon Sep 17 00:00:00 2001 From: delvh Date: Thu, 9 Mar 2023 12:38:14 +0100 Subject: [PATCH 2/5] Implement suggestions by @wxiaoguang Most notably, this includes automatically setting 'type="button"' for all cancel buttons, and 'e.preventDefault()' when opening a modal. --- templates/admin/user/edit.tmpl | 4 ++-- templates/repo/activity.tmpl | 4 ++-- .../repo/issue/view_content/update_branch_by_merge.tmpl | 4 ++-- templates/repo/projects/view.tmpl | 2 +- templates/repo/settings/lfs.tmpl | 2 +- web_src/js/features/aria.js | 5 +++++ web_src/js/features/common-global.js | 3 ++- web_src/js/index.js | 2 ++ 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 5c8787960c370..c7f2c40073774 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -151,7 +151,7 @@
- +
@@ -189,7 +189,7 @@
- {{$.locale.Tr "settings.delete_current_avatar"}}{{/* TODO: Why is this link not focusable? */}} + {{$.locale.Tr "settings.delete_current_avatar"}}{{/* TODO: Convert links without href to buttons for a11y */}}
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index d0e39f318e729..2d2c59d34309d 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -5,8 +5,8 @@

-
-
- +
+ {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 4bd9b5146eaa1..49e4467dc3f45 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -19,8 +19,8 @@
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
- - + {{$.locale.Tr "repo.pulls.update_branch"}} + {{$.locale.Tr "repo.pulls.update_branch_rebase"}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 014d172f5b9ca..db4e1c50d5899 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -162,7 +162,7 @@ {{$.locale.Tr "repo.projects.column.deletion_desc"}}
-
{{/* Convert to base/delete_modal_actions.tmpl? */}} +
{{/* TODO: Convert to base/delete_modal_actions.tmpl? */}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 547a627cb9f94..a0174bacb371d 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -50,7 +50,7 @@

{{$.CsrfTokenHtml}} -
{{/* Convert to base/delete_modal_actions */}} +
{{/* TODO: Convert to base/delete_modal_actions */}}
diff --git a/web_src/js/features/aria.js b/web_src/js/features/aria.js index 373d667c5f73c..0df74379d3dec 100644 --- a/web_src/js/features/aria.js +++ b/web_src/js/features/aria.js @@ -96,6 +96,11 @@ function attachOneDropdownAria($dropdown) { $dropdown.on('keyup', (e) => { if (e.key.startsWith('Arrow')) deferredRefreshAria(); }); } +export function initCancelButtons(rootElement=document) { + // Only cancel buttons should have the 'cancel' class, and these buttons should not submit an underlying form, so set 'type="button"' for them + rootElement.querySelectorAll('.cancel').forEach(cancelButton => cancelButton.setAttribute('type', 'button')); +} + export function attachDropdownAria($dropdowns) { $dropdowns.each((_, e) => attachOneDropdownAria($(e))); } diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 4fa6942467ee3..ca0c379bb03df 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -339,7 +339,8 @@ export function initGlobalButtons() { alert('Nothing to hide'); }); - $('.show-modal').on('click', function () { + $('.show-modal').on('click', function (e) { + e.preventDefault(); const modalDiv = $($(this).attr('data-modal')); for (const attrib of this.attributes) { if (!attrib.name.startsWith('data-modal-')) { diff --git a/web_src/js/index.js b/web_src/js/index.js index 611c09d2b8c16..7706f51a8d7c0 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -6,6 +6,7 @@ import {initVueEnv} from './components/VueComponentLoader.js'; import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue'; import {initDashboardRepoList} from './components/DashboardRepoList.js'; +import {initCancelButtons} from './features/aria.js'; import {attachTribute} from './features/tribute.js'; import {initGlobalCopyToClipboardListener} from './features/clipboard.js'; import {initContextPopups} from './features/contextpopup.js'; @@ -198,4 +199,5 @@ $(document).ready(() => { initUserAuthWebAuthnRegister(); initUserSettings(); initViewedCheckboxListenerFor(); + initCancelButtons(); }); From 9b7b5ad3c6297e690f6db8b407c58360120c159d Mon Sep 17 00:00:00 2001 From: delvh Date: Thu, 9 Mar 2023 13:20:19 +0100 Subject: [PATCH 3/5] Remove `type="button"`, add more `e.preventDefault`, rename `e -> event` --- templates/base/delete_modal_actions.tmpl | 2 +- templates/projects/view.tmpl | 8 +++--- templates/repo/branch/list.tmpl | 4 +-- templates/repo/commit_page.tmpl | 4 +-- templates/repo/diff/box.tmpl | 2 +- templates/repo/editor/edit.tmpl | 2 +- templates/repo/editor/patch.tmpl | 2 +- .../repo/issue/labels/edit_delete_label.tmpl | 2 +- templates/repo/issue/labels/label_new.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 2 +- templates/repo/issue/view_content/pull.tmpl | 2 +- .../repo/issue/view_content/sidebar.tmpl | 6 ++--- templates/repo/migrate/migrating.tmpl | 2 +- templates/repo/projects/view.tmpl | 8 +++--- templates/repo/settings/lfs.tmpl | 2 +- templates/repo/settings/options.tmpl | 10 +++---- templates/user/auth/webauthn_error.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- web_src/js/features/common-global.js | 26 ++++++++++--------- 19 files changed, 46 insertions(+), 44 deletions(-) diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl index 58f96236bbd56..29bf5f92fd53f 100644 --- a/templates/base/delete_modal_actions.tmpl +++ b/templates/base/delete_modal_actions.tmpl @@ -1,5 +1,5 @@
- diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 972374a3c4f02..adb56834352d2 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -29,7 +29,7 @@
- +
@@ -127,7 +127,7 @@
- +
@@ -144,7 +144,7 @@
{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} - +
@@ -159,7 +159,7 @@

{{/* TODO: convert to base/delete_modal_actions.tmpl */}} - +
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 4fe28a6e749ec..7e8bf348a4d6e 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -175,8 +175,8 @@
-
{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} - +
+
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 9bd2bc5542587..c16e12f716890 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -96,7 +96,7 @@
- +
@@ -121,7 +121,7 @@
- +
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 32187fe127520..e0c58896f0f08 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -200,7 +200,7 @@ {{$.locale.Tr "loading"}}
- +
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 897e3c764071c..a39eda04f4de9 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -65,7 +65,7 @@

{{.locale.Tr "repo.editor.commit_empty_file_text"}}

{{/* TODO: Convert to base/delete_modal_actions.tmpl*/}} - diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index 3e0e873e07cca..a3d22d6a29e2c 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -45,7 +45,7 @@

{{.locale.Tr "repo.editor.commit_empty_file_text"}}

- diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 9931a3208e2ae..38a948172ffc5 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -52,7 +52,7 @@
- diff --git a/templates/repo/issue/labels/label_new.tmpl b/templates/repo/issue/labels/label_new.tmpl index 6f2461af22fed..c937f28e8aa2f 100644 --- a/templates/repo/issue/labels/label_new.tmpl +++ b/templates/repo/issue/labels/label_new.tmpl @@ -38,7 +38,7 @@
- diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 1624417ba203f..f013317ca8be2 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -215,7 +215,7 @@ {{end}}
- +
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index e4376ac31b35a..30345b0138bfa 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -58,7 +58,7 @@
- +
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 4c9246b4cf32f..62f7c495c3c0e 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -574,7 +574,7 @@ {{end}}

- @@ -661,7 +661,7 @@ {{end}}
- + +
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index 0e729bfa27fa9..cd3c5e754ecbd 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -72,7 +72,7 @@
- +
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index db4e1c50d5899..3bb3d1178ab81 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -33,7 +33,7 @@
- +
@@ -131,7 +131,7 @@
- +
@@ -148,7 +148,7 @@
- +
@@ -163,7 +163,7 @@
{{/* TODO: Convert to base/delete_modal_actions.tmpl? */}} - +
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index a0174bacb371d..9a38d32345739 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -51,7 +51,7 @@
{{$.CsrfTokenHtml}}
{{/* TODO: Convert to base/delete_modal_actions */}} - +
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index c6c3cb66ba318..be07aeb0ffeb9 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -825,7 +825,7 @@
- +
@@ -856,7 +856,7 @@
- +
@@ -892,7 +892,7 @@
- +
@@ -926,7 +926,7 @@
- +
@@ -958,7 +958,7 @@
- +
diff --git a/templates/user/auth/webauthn_error.tmpl b/templates/user/auth/webauthn_error.tmpl index 4e5622de2af72..b6467de1aad8f 100644 --- a/templates/user/auth/webauthn_error.tmpl +++ b/templates/user/auth/webauthn_error.tmpl @@ -17,6 +17,6 @@
- +
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 17acb724a647b..8a46724fe81d3 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -272,7 +272,7 @@
{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} - diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index ca0c379bb03df..81e210557c5f2 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -49,20 +49,20 @@ export function initFootLanguageMenu() { export function initGlobalEnterQuickSubmit() { - $(document).on('keydown', '.js-quick-submit', (e) => { - if (((e.ctrlKey && !e.altKey) || e.metaKey) && (e.key === 'Enter')) { - handleGlobalEnterQuickSubmit(e.target); + $(document).on('keydown', '.js-quick-submit', (event) => { + if (((event.ctrlKey && !event.altKey) || event.metaKey) && (event.key === 'Enter')) { + handleGlobalEnterQuickSubmit(event.target); return false; } }); } export function initGlobalButtonClickOnEnter() { - $(document).on('keypress', '.ui.button', (e) => { - if (e.keyCode === 13 || e.keyCode === 32) { // enter key or space bar - if (e.target.nodeName === 'BUTTON') return; // button already handles space&enter correctly - $(e.target).trigger('click'); - e.preventDefault(); + $(document).on('keypress', '.ui.button', (event) => { + if (event.keyCode === 13 || event.keyCode === 32) { // enter key or space bar + if (event.target.nodeName === 'BUTTON') return; // button already handles space&enter correctly + $(event.target).trigger('click'); + event.preventDefault(); } }); } @@ -318,7 +318,8 @@ export function initGlobalLinkActions() { } export function initGlobalButtons() { - $('.show-panel.button').on('click', function () { + $('.show-panel.button').on('click', function (event) { + event.preventDefault(); showElem($(this).data('panel')); }); @@ -339,8 +340,8 @@ export function initGlobalButtons() { alert('Nothing to hide'); }); - $('.show-modal').on('click', function (e) { - e.preventDefault(); + $('.show-modal').on('click', function (event) { + event.preventDefault(); const modalDiv = $($(this).attr('data-modal')); for (const attrib of this.attributes) { if (!attrib.name.startsWith('data-modal-')) { @@ -361,7 +362,8 @@ export function initGlobalButtons() { } }); - $('.delete-post.button').on('click', function () { + $('.delete-post.button').on('click', function (event) { + event.preventDefault(); const $this = $(this); $.post($this.attr('data-request-url'), { _csrf: csrfToken From 46f064e4934a09704fe89a47b6d5a2a06fc1d278 Mon Sep 17 00:00:00 2001 From: delvh Date: Thu, 9 Mar 2023 13:24:36 +0100 Subject: [PATCH 4/5] Remove TODO comments that are not placed on deletion dialogues --- templates/projects/view.tmpl | 2 +- templates/repo/editor/edit.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index adb56834352d2..1a7b39cd4237a 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -143,7 +143,7 @@ {{$.locale.Tr "repo.projects.column.set_default_desc"}}
-
{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} +
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index a39eda04f4de9..431033e18e8a4 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -64,7 +64,7 @@

{{.locale.Tr "repo.editor.commit_empty_file_text"}}

-
{{/* TODO: Convert to base/delete_modal_actions.tmpl*/}} +
{{template "base/delete_modal_actions" .}} - +
{{template "base/footer" .}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 2d2c59d34309d..ae1d426bc0741 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -5,11 +5,13 @@

-
-
- - {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - +
+
+ + {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
{{.locale.Tr "repo.activity.period.daily"}} {{.locale.Tr "repo.activity.period.halfweekly"}} diff --git a/templates/repo/cite/cite_modal.tmpl b/templates/repo/cite/cite_modal.tmpl index 2f2933f014721..f00bab8859e4e 100644 --- a/templates/repo/cite/cite_modal.tmpl +++ b/templates/repo/cite/cite_modal.tmpl @@ -15,7 +15,7 @@
-
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 1c82e3f20f3e5..c7538a7969638 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -43,10 +43,10 @@
{{svg "octicon-git-compare"}}
- +
{{svg "octicon-filter" 16}} @@ -112,10 +112,10 @@
{{.CompareSeparator}}
- +
{{svg "octicon-filter" 16}} diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index a3d22d6a29e2c..75a8b5d687d9a 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -50,7 +50,7 @@ {{.locale.Tr "repo.editor.cancel"}}
diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index cd3dc97ff55c7..51eb5e26a0659 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -6,10 +6,10 @@
- +
{{svg "octicon-filter" 16}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index dc0f7e135608d..2a8381b0b47b1 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -61,16 +61,16 @@ {{end}}
- +
{{svg "octicon-arrow-right"}}
- +
{{svg "octicon-filter" 16}} diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index 70fe0237e27c4..61c57995134c1 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -2,7 +2,7 @@ {{.Title}}
- +
{{.locale.Tr "repo.settings.add_webhook"}}
{{.locale.Tr "repo.settings.web_hook_name_gitea"}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 5928cd34ad8fd..15553cedd8838 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -7,13 +7,13 @@
- +
{{svg "octicon-filter" 16}} diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl index fa82bf6611487..e8eed632946c1 100644 --- a/templates/user/settings/security/accountlinks.tmpl +++ b/templates/user/settings/security/accountlinks.tmpl @@ -3,7 +3,7 @@ {{if .OrderedOAuth2Names}}
- +
{{.locale.Tr "settings.link_account"}}
{{range $key := .OrderedOAuth2Names}} {{$provider := index $.OAuth2Providers $key}} diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js index d023e0bc3695f..be5aa876a5dba 100644 --- a/web_src/js/features/admin/common.js +++ b/web_src/js/features/admin/common.js @@ -198,7 +198,8 @@ export function initAdminCommon() { break; } }); - $('#delete-selection').on('click', function () { + $('#delete-selection').on('click', function (e) { + e.preventDefault(); const $this = $(this); $this.addClass('loading disabled'); const ids = []; diff --git a/web_src/js/features/aria.js b/web_src/js/features/aria.js index 0df74379d3dec..46944336adc10 100644 --- a/web_src/js/features/aria.js +++ b/web_src/js/features/aria.js @@ -83,8 +83,9 @@ function attachOneDropdownAria($dropdown) { if (e.key === 'Enter') { let $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value')); if (!$item) $item = $menu.find('> .item.selected'); // when dropdown filters items by input, there is no "value", so query the "selected" item - // if the selected item is clickable, then trigger the click event. in the future there could be a special CSS class for it. - if ($item && $item.is('a')) $item[0].click(); + // if the selected item is clickable, then trigger the click event. + // we can not click any item without check, because Fomantic code might also handle the Enter event. that would result in double click. + if ($item && ($item.is('a') || $item.is('.js-aria-clickable'))) $item[0].click(); } }); @@ -96,11 +97,6 @@ function attachOneDropdownAria($dropdown) { $dropdown.on('keyup', (e) => { if (e.key.startsWith('Arrow')) deferredRefreshAria(); }); } -export function initCancelButtons(rootElement=document) { - // Only cancel buttons should have the 'cancel' class, and these buttons should not submit an underlying form, so set 'type="button"' for them - rootElement.querySelectorAll('.cancel').forEach(cancelButton => cancelButton.setAttribute('type', 'button')); -} - export function attachDropdownAria($dropdowns) { $dropdowns.each((_, e) => attachOneDropdownAria($(e))); } diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 81e210557c5f2..0f36ce2bf84fa 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -49,20 +49,20 @@ export function initFootLanguageMenu() { export function initGlobalEnterQuickSubmit() { - $(document).on('keydown', '.js-quick-submit', (event) => { - if (((event.ctrlKey && !event.altKey) || event.metaKey) && (event.key === 'Enter')) { - handleGlobalEnterQuickSubmit(event.target); + $(document).on('keydown', '.js-quick-submit', (e) => { + if (((e.ctrlKey && !e.altKey) || e.metaKey) && (e.key === 'Enter')) { + handleGlobalEnterQuickSubmit(e.target); return false; } }); } export function initGlobalButtonClickOnEnter() { - $(document).on('keypress', '.ui.button', (event) => { - if (event.keyCode === 13 || event.keyCode === 32) { // enter key or space bar - if (event.target.nodeName === 'BUTTON') return; // button already handles space&enter correctly - $(event.target).trigger('click'); - event.preventDefault(); + $(document).on('keypress', '.ui.button', (e) => { + if (e.keyCode === 13 || e.keyCode === 32) { // enter key or space bar + if (e.target.nodeName === 'BUTTON') return; // button already handles space&enter correctly + $(e.target).trigger('click'); + e.preventDefault(); } }); } @@ -202,7 +202,8 @@ export function initGlobalDropzone() { } export function initGlobalLinkActions() { - function showDeletePopup() { + function showDeletePopup(e) { + e.preventDefault(); const $this = $(this); const dataArray = $this.data(); let filter = ''; @@ -243,10 +244,10 @@ export function initGlobalLinkActions() { }); } }).modal('show'); - return false; } - function showAddAllPopup() { + function showAddAllPopup(e) { + e.preventDefault(); const $this = $(this); let filter = ''; if ($this.attr('id')) { @@ -272,7 +273,6 @@ export function initGlobalLinkActions() { }); } }).modal('show'); - return false; } function linkAction(e) { @@ -318,14 +318,21 @@ export function initGlobalLinkActions() { } export function initGlobalButtons() { - $('.show-panel.button').on('click', function (event) { - event.preventDefault(); + // There are many "cancel button" elements in modal dialogs, Fomantic UI expects they are button-like elements but never submit a form. + // However, Gitea misuses the modal dialog and put the cancel buttons inside forms, so we must prevent the form submission. + // There are a few cancel buttons in non-modal forms, and there are some dynamically created forms (eg: the "Edit Issue Content") + $(document).on('click', 'form .ui.cancel.button', (e) => { + e.preventDefault(); + }); + + $('.show-panel.button').on('click', function (e) { + e.preventDefault(); showElem($(this).data('panel')); }); - $('.hide-panel.button').on('click', function (event) { + $('.hide-panel.button').on('click', function (e) { // a `.hide-panel.button` can hide a panel, by `data-panel="selector"` or `data-panel-closest="selector"` - event.preventDefault(); + e.preventDefault(); let sel = $(this).attr('data-panel'); if (sel) { hideElem($(sel)); @@ -340,8 +347,8 @@ export function initGlobalButtons() { alert('Nothing to hide'); }); - $('.show-modal').on('click', function (event) { - event.preventDefault(); + $('.show-modal').on('click', function (e) { + e.preventDefault(); const modalDiv = $($(this).attr('data-modal')); for (const attrib of this.attributes) { if (!attrib.name.startsWith('data-modal-')) { @@ -362,8 +369,8 @@ export function initGlobalButtons() { } }); - $('.delete-post.button').on('click', function (event) { - event.preventDefault(); + $('.delete-post.button').on('click', function (e) { + e.preventDefault(); const $this = $(this); $.post($this.attr('data-request-url'), { _csrf: csrfToken diff --git a/web_src/js/features/common-issue.js b/web_src/js/features/common-issue.js index 0965caef154fb..ebc851d676336 100644 --- a/web_src/js/features/common-issue.js +++ b/web_src/js/features/common-issue.js @@ -34,6 +34,7 @@ export function initCommonIssue() { }); $('.issue-action').on('click', async function (e) { + e.preventDefault(); let action = this.getAttribute('data-action'); let elementId = this.getAttribute('data-element-id'); const url = this.getAttribute('data-url'); diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 41c9dd118f2ff..a8a27c257209a 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -230,7 +230,8 @@ export function initRepoIssueStatusButton() { const value = easyMDE?.value() || $(this).val(); $statusButton.text($statusButton.data(value.length === 0 ? 'status' : 'status-and-comment')); }); - $statusButton.on('click', () => { + $statusButton.on('click', (e) => { + e.preventDefault(); $('#status').val($statusButton.data('status-val')); $('#comment-form').trigger('submit'); }); diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 5173a5b59907c..08baab4e0542b 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -412,7 +412,8 @@ async function onEditContent(event) { $saveButton.trigger('click'); }); - $editContentZone.find('.cancel.button').on('click', () => { + $editContentZone.find('.cancel.button').on('click', (e) => { + e.preventDefault(); showElem($renderContent); hideElem($editContentZone); if (dz) { diff --git a/web_src/js/index.js b/web_src/js/index.js index 7706f51a8d7c0..611c09d2b8c16 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -6,7 +6,6 @@ import {initVueEnv} from './components/VueComponentLoader.js'; import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue'; import {initDashboardRepoList} from './components/DashboardRepoList.js'; -import {initCancelButtons} from './features/aria.js'; import {attachTribute} from './features/tribute.js'; import {initGlobalCopyToClipboardListener} from './features/clipboard.js'; import {initContextPopups} from './features/contextpopup.js'; @@ -199,5 +198,4 @@ $(document).ready(() => { initUserAuthWebAuthnRegister(); initUserSettings(); initViewedCheckboxListenerFor(); - initCancelButtons(); }); diff --git a/web_src/svg/fontawesome-save.svg b/web_src/svg/fontawesome-save.svg new file mode 100644 index 0000000000000..763d26abb1c31 --- /dev/null +++ b/web_src/svg/fontawesome-save.svg @@ -0,0 +1 @@ + \ No newline at end of file