From 63ee6783b83669735c22fd3878f01ad36711ca05 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 6 Jul 2025 00:01:53 +0800 Subject: [PATCH] Refactor "delete-button" to "link-action" (#34962) --- templates/admin/auth/edit.tmpl | 17 ++++------------- templates/admin/packages/list.tmpl | 19 +++++++++++-------- templates/admin/repo/list.tmpl | 19 +++++++++++-------- templates/projects/list.tmpl | 13 ++++--------- templates/repo/issue/milestones.tmpl | 14 +++++--------- templates/repo/release/new.tmpl | 14 +++++--------- templates/repo/settings/branches.tmpl | 15 +++++---------- templates/repo/settings/collaboration.tmpl | 15 +++++---------- templates/repo/settings/deploy_keys.tmpl | 13 ++++--------- templates/repo/wiki/view.tmpl | 13 ++++--------- web_src/js/features/common-button.ts | 5 +++-- 11 files changed, 61 insertions(+), 96 deletions(-) diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 91b84e13b6..781f514af4 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -408,7 +408,10 @@
- +
@@ -424,16 +427,4 @@

{{ctx.Locale.Tr "admin.auths.tips.oauth2.general.tip"}}

- -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "admin.auths.delete_auth_title"}} -
-
-

{{ctx.Locale.Tr "admin.auths.delete_auth_desc"}}

-
- {{template "base/modal_actions_confirm" .}} -
- {{template "admin/layout_footer" .}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 985caf6bdf..4817f2681b 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -72,7 +72,12 @@ {{FileSize .CalculateBlobSize}} {{DateUtils.AbsoluteShort .Version.CreatedUnix}} - {{svg "octicon-trash"}} + + {{svg "octicon-trash"}} + {{else}} {{ctx.Locale.Tr "no_results_found"}} @@ -84,15 +89,13 @@ {{template "base/paginate" .}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "packages.settings.delete"}} -
+
+ {{template "admin/layout_footer" .}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index ce08d49656..2ad2de3a1d 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -84,7 +84,12 @@ {{FileSize .LFSSize}} {{DateUtils.AbsoluteShort .UpdatedUnix}} {{DateUtils.AbsoluteShort .CreatedUnix}} - {{svg "octicon-trash"}} + + {{svg "octicon-trash"}} + {{else}} {{ctx.Locale.Tr "no_results_found"}} @@ -96,17 +101,15 @@ {{template "base/paginate" .}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.settings.delete"}} -
+
+ {{template "admin/layout_footer" .}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index f6d549a634..e769543f6a 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -67,7 +67,7 @@ {{else}} {{svg "octicon-skip" 14}}{{ctx.Locale.Tr "repo.projects.close"}} {{end}} - {{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}} {{end}} @@ -81,14 +81,9 @@ {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.projects.deletion"}} -
-
-

{{ctx.Locale.Tr "repo.projects.deletion_desc"}}

-
+ {{end}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 5701c1faa6..8805c709a0 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -76,7 +76,7 @@ {{else}} {{svg "octicon-x" 14}}{{ctx.Locale.Tr "repo.milestones.close"}} {{end}} - {{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}
{{end}} @@ -92,15 +92,11 @@ {{if or .CanWriteIssues .CanWritePulls}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.milestones.deletion"}} -
-
-

{{ctx.Locale.Tr "repo.milestones.deletion_desc"}}

-
+ {{end}} + {{template "base/footer" .}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index f61a8ef9e7..109a18fa0e 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -105,7 +105,7 @@ {{ctx.Locale.Tr "repo.release.cancel"}} - + {{ctx.Locale.Tr "repo.release.delete_release"}} {{if .IsDraft}} @@ -129,15 +129,11 @@
{{if .PageIsEditRelease}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.release.deletion"}} -
-
-

{{ctx.Locale.Tr "repo.release.deletion_desc"}}

-
+ {{end}} + {{template "base/footer" .}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index ef4732540b..e8e7a3f1c2 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -49,8 +49,8 @@
- {{ctx.Locale.Tr "repo.settings.edit_protected_branch"}} -
@@ -65,14 +65,9 @@ {{end}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.settings.protected_branch_deletion"}} -
-
-

{{ctx.Locale.Tr "repo.settings.protected_branch_deletion_desc"}}

-
+ diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index e941a2c4b6..62903e1cfb 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -29,7 +29,7 @@
- @@ -95,7 +95,7 @@ {{if $allowedToChangeTeams}}
-
@@ -123,14 +123,9 @@ {{end}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.settings.collaborator_deletion"}} -
-
-

{{ctx.Locale.Tr "repo.settings.collaborator_deletion_desc"}}

-
+ diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 5eb2a47e5a..b82d584b22 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -59,7 +59,7 @@
-
@@ -72,14 +72,9 @@ -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.settings.deploy_key_deletion"}} -
-
-

{{ctx.Locale.Tr "repo.settings.deploy_key_deletion_desc"}}

-
+ diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index f6f82fb52d..4c7ef364d2 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -50,7 +50,7 @@ {{if and .CanWriteWiki (not .Repository.IsMirror)}} {{ctx.Locale.Tr "repo.wiki.edit_page_button"}} {{ctx.Locale.Tr "repo.wiki.new_page_button"}} - {{ctx.Locale.Tr "repo.wiki.delete_page_button"}} + {{ctx.Locale.Tr "repo.wiki.delete_page_button"}} {{end}}
@@ -96,14 +96,9 @@ -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.wiki.delete_page_button"}} -
-
-

{{ctx.Locale.Tr "repo.wiki.delete_page_notice_1" $title}}

-
+
+
{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.wiki.delete_page_button"}}
+

{{ctx.Locale.Tr "repo.wiki.delete_page_notice_1" $title}}

{{template "base/modal_actions_confirm" .}}
diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts index 22a7890857..3b112b116b 100644 --- a/web_src/js/features/common-button.ts +++ b/web_src/js/features/common-button.ts @@ -145,11 +145,12 @@ function onShowModalClick(el: HTMLElement, e: MouseEvent) { const attrTargetCombo = attrib.name.substring(modalAttrPrefix.length); const [attrTargetName, attrTargetProp] = attrTargetCombo.split('.'); - // try to find target by: "#target" -> "[name=target]" -> ".target" -> " tag" + // try to find target by: "#target" -> "[name=target]" -> ".target" -> " tag", and then try the modal itself const attrTarget = elModal.querySelector(`#${attrTargetName}`) || elModal.querySelector(`[name=${attrTargetName}]`) || elModal.querySelector(`.${attrTargetName}`) || - elModal.querySelector(`${attrTargetName}`); + elModal.querySelector(`${attrTargetName}`) || + (elModal.matches(`${attrTargetName}`) || elModal.matches(`#${attrTargetName}`) || elModal.matches(`.${attrTargetName}`) ? elModal : null); if (!attrTarget) { if (!window.config.runModeIsProd) throw new Error(`attr target "${attrTargetCombo}" not found for modal`); continue;