From 3296046b4ab1f8cf3efcc908df2b1918b16831b7 Mon Sep 17 00:00:00 2001
From: Abhay Pratap Singh <abhaypratapsingh5353@gmail.com>
Date: Sat, 19 Sep 2026 01:12:22 +0530
Subject: [PATCH] fix: focus confirm button and use red for delete
 confirmations (#39350)

Fixes https://github.com/go-gitea/gitea/issues/39347

1. Focus the confirm button in generic confirm modals so `Enter` runs
the highlighted action.
2. Delete actions that lacked the risky flag now get it, so their
confirm button is red.

---------

Co-authored-by: silverwind <me@silverwind.io>
---
 templates/projects/view.tmpl                                | 4 ++--
 templates/repo/actions/runs_list.tmpl                       | 2 +-
 templates/repo/issue/labels/label_list.tmpl                 | 2 +-
 templates/repo/issue/view_content/comments_delete_time.tmpl | 2 +-
 templates/repo/settings/webhook/base_list.tmpl              | 2 +-
 templates/shared/secrets/add_list.tmpl                      | 2 +-
 templates/shared/variables/variable_list.tmpl               | 2 +-
 web_src/js/features/comp/ConfirmModal.ts                    | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 387e24bd8ea..2e719984584 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -48,7 +48,7 @@
 						{{ctx.Locale.Tr "repo.projects.close"}}
 					</button>
 				{{end}}
-				<button type="button" class="item btn link-action" data-url="{{.Link}}/delete?id={{.Project.ID}}"
+				<button type="button" class="item btn link-action negative" data-url="{{.Link}}/delete?id={{.Project.ID}}"
 								data-modal-confirm-header="{{ctx.Locale.Tr "repo.projects.deletion"}}"
 								data-modal-confirm-content="{{ctx.Locale.Tr "repo.projects.deletion_desc"}}"
 				>
@@ -108,7 +108,7 @@
 									>
 										{{svg "octicon-star"}} {{ctx.Locale.Tr "repo.projects.column.set_default"}}
 									</a>
-									<a class="item button link-action" data-url="{{$.Link}}/{{.ID}}" data-fetch-method="DELETE"
+									<a class="item button link-action negative" data-url="{{$.Link}}/{{.ID}}" data-fetch-method="DELETE"
 										data-modal-confirm-header="{{ctx.Locale.Tr "repo.projects.column.delete"}}"
 										data-modal-confirm-content="{{ctx.Locale.Tr "repo.projects.column.deletion_desc"}}"
 									>
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index 0ddc9dd36d7..e65143ccf35 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -62,7 +62,7 @@
 							</a>
 						{{end}}
 						{{if and $data.CanWriteRepoUnitActions $run.Status.IsDone}}
-							<a class="item link-action"
+							<a class="item link-action negative"
 								data-url="{{$run.Link}}/delete"
 								data-modal-confirm="{{ctx.Locale.Tr "actions.runs.delete.description"}}"
 							>
diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl
index c8a6b46cc45..c5d7bdf2029 100644
--- a/templates/repo/issue/labels/label_list.tmpl
+++ b/templates/repo/issue/labels/label_list.tmpl
@@ -51,7 +51,7 @@
 							data-label-num-issues="{{.NumIssues}}" data-label-description="{{.Description}}"
 							data-label-exclusive-order="{{.ExclusiveOrder}}"
 						>{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.label_edit"}}</a>
-						<a class="link-action" href="#" data-url="{{$.Link}}/delete?id={{.ID}}"
+						<a class="link-action negative" href="#" data-url="{{$.Link}}/delete?id={{.ID}}"
 							data-modal-confirm-header="{{ctx.Locale.Tr "repo.issues.label_deletion"}}"
 							data-modal-confirm-content="{{ctx.Locale.Tr "repo.issues.label_deletion_desc"}}"
 						>{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl
index 8c69679cc13..1a9b26d15a1 100644
--- a/templates/repo/issue/view_content/comments_delete_time.tmpl
+++ b/templates/repo/issue/view_content/comments_delete_time.tmpl
@@ -2,7 +2,7 @@
 	{{if (not .comment.Time.Deleted)}}
 		{{if (or ctx.RootData.IsAdmin (and ctx.RootData.IsSigned (eq ctx.RootData.SignedUserID .comment.PosterID)))}}
 			<span class="tw-ml-auto">
-				<button type="button" class="ui icon button compact mini link-action" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.del_time"}}"
+				<button type="button" class="ui icon button compact mini link-action negative" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.del_time"}}"
 								data-url="{{ctx.RootData.RepoLink}}/issues/{{ctx.RootData.Issue.Index}}/times/{{.comment.TimeID}}/delete?id={{.comment.Time.ID}}"
 								data-modal-confirm="{{ctx.Locale.Tr "repo.issues.del_time"}}"
 				>
diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl
index 2725df85e86..d024017cfd1 100644
--- a/templates/repo/settings/webhook/base_list.tmpl
+++ b/templates/repo/settings/webhook/base_list.tmpl
@@ -19,7 +19,7 @@
 					<span class="tw-ml-2 tw-text-grey-light">{{.URL}}</span>
 				</div>
 				<a class="muted" href="{{$.BaseLink}}/{{.ID}}">{{svg "octicon-pencil"}}</a>
-				<a class="tw-text-red tw-pr-2 link-action"
+				<a class="tw-text-red tw-pr-2 link-action negative"
 					data-url="{{$.Link}}/delete?id={{.ID}}"
 					data-modal-confirm="{{ctx.Locale.Tr "repo.settings.webhook_deletion_desc"}}"
 				>{{svg "octicon-trash"}}</a>
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index 500378ed610..b83b60cd3ca 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -49,7 +49,7 @@
 				>
 					{{svg "octicon-pencil"}}
 				</button>
-				<button type="button" class="btn interact-bg link-action tw-p-2"
+				<button type="button" class="btn interact-bg link-action negative tw-p-2"
 					data-url="{{$.Link}}/delete?id={{.ID}}"
 					data-modal-confirm="{{ctx.Locale.Tr "secrets.deletion.description"}}"
 					data-tooltip-content="{{ctx.Locale.Tr "secrets.deletion"}}"
diff --git a/templates/shared/variables/variable_list.tmpl b/templates/shared/variables/variable_list.tmpl
index 40261e93d1d..d6d41aaa014 100644
--- a/templates/shared/variables/variable_list.tmpl
+++ b/templates/shared/variables/variable_list.tmpl
@@ -47,7 +47,7 @@
 				>
 					{{svg "octicon-pencil"}}
 				</button>
-				<button type="button" class="btn interact-bg tw-p-2 link-action"
+				<button type="button" class="btn interact-bg tw-p-2 link-action negative"
 					data-tooltip-content="{{ctx.Locale.Tr "actions.variables.deletion"}}"
 					data-url="{{$.Link}}/{{.ID}}/delete"
 					data-modal-confirm="{{ctx.Locale.Tr "actions.variables.deletion.description"}}"
diff --git a/web_src/js/features/comp/ConfirmModal.ts b/web_src/js/features/comp/ConfirmModal.ts
index 70f314c32ce..2e4a35f2213 100644
--- a/web_src/js/features/comp/ConfirmModal.ts
+++ b/web_src/js/features/comp/ConfirmModal.ts
@@ -20,7 +20,7 @@ export function createConfirmModal({header = '', content = '', confirmButtonColo
       <div class="content">${content}</div>
       <div class="actions">
         <button class="ui cancel button">${htmlRaw(svg('octicon-x'))} ${i18n.modal_cancel}</button>
-        <button class="ui ${confirmButtonColor} ok button">${htmlRaw(svg('octicon-check'))} ${i18n.modal_confirm}</button>
+        <button class="ui ${confirmButtonColor} ok button" autofocus>${htmlRaw(svg('octicon-check'))} ${i18n.modal_confirm}</button>
       </div>
     </div>
   `.trim());