Extract common code to new template (#26903)

I noticed that the code of several new webhook pages is highly
repetitive, so I pulled out the common parts to a new template, unified
reference, unified maintenance

---------

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>

diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 4a1323568abb4c8f86cad89743afef3bcf7dd6e4..d4343f8c680f67f0248cfda90b67b2d38ff3d8d3 100644 (file)
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,26 +1,5 @@
 {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
-                       <div class="org-setting-content">
-                               <h4 class="ui top attached header">
-                                       {{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
-                                       <div class="ui right">
-                                               {{template "shared/webhook/icon" .}}
-                                       </div>
-                               </h4>
-                               <div class="ui attached segment">
-                                       {{template "repo/settings/webhook/gitea" .}}
-                                       {{template "repo/settings/webhook/gogs" .}}
-                                       {{template "repo/settings/webhook/slack" .}}
-                                       {{template "repo/settings/webhook/discord" .}}
-                                       {{template "repo/settings/webhook/dingtalk" .}}
-                                       {{template "repo/settings/webhook/telegram" .}}
-                                       {{template "repo/settings/webhook/msteams" .}}
-                                       {{template "repo/settings/webhook/feishu" .}}
-                                       {{template "repo/settings/webhook/matrix" .}}
-                                       {{template "repo/settings/webhook/wechatwork" .}}
-                                       {{template "repo/settings/webhook/packagist" .}}
-                               </div>
-
-                               {{template "repo/settings/webhook/history" .}}
-                       </div>
-
+       <div class="org-setting-content">
+               {{template "webhook/new" .}}
+       </div>
 {{template "org/settings/layout_footer" .}}

diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index 1b0474222171cbffe82f2e81269de86509312bcc..79fd4bd2ff77cbdeef4a8f1f76d447d789422cb6 100644 (file)
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,25 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings new webhook")}}
        <div class="repo-setting-content">
-               <h4 class="ui top attached header">
-                       {{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
-                       <div class="ui right">
-                               {{template "shared/webhook/icon" .}}
-                       </div>
-               </h4>
-               <div class="ui attached segment">
-                       {{template "repo/settings/webhook/gitea" .}}
-                       {{template "repo/settings/webhook/gogs" .}}
-                       {{template "repo/settings/webhook/slack" .}}
-                       {{template "repo/settings/webhook/discord" .}}
-                       {{template "repo/settings/webhook/dingtalk" .}}
-                       {{template "repo/settings/webhook/telegram" .}}
-                       {{template "repo/settings/webhook/msteams" .}}
-                       {{template "repo/settings/webhook/feishu" .}}
-                       {{template "repo/settings/webhook/matrix" .}}
-                       {{template "repo/settings/webhook/wechatwork" .}}
-                       {{template "repo/settings/webhook/packagist" .}}
-               </div>
-
-               {{template "repo/settings/webhook/history" .}}
+               {{template "webhook/new" .}}
        </div>
 {{template "repo/settings/layout_footer" .}}

diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index 83ae4801b499f723d685701fb0e125aa35173295..4d3ddf03834690330df5f60ab54ddc162b06a078 100644 (file)
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,27 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
        <div class="user-setting-content">
-               <div class="user-setting-content">
-                               <h4 class="ui top attached header">
-                               {{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
-                               <div class="ui right">
-                                       {{template "shared/webhook/icon" .}}
-                               </div>
-                       </h4>
-                       <div class="ui attached segment">
-                               {{template "repo/settings/webhook/gitea" .}}
-                               {{template "repo/settings/webhook/gogs" .}}
-                               {{template "repo/settings/webhook/slack" .}}
-                               {{template "repo/settings/webhook/discord" .}}
-                               {{template "repo/settings/webhook/dingtalk" .}}
-                               {{template "repo/settings/webhook/telegram" .}}
-                               {{template "repo/settings/webhook/msteams" .}}
-                               {{template "repo/settings/webhook/feishu" .}}
-                               {{template "repo/settings/webhook/matrix" .}}
-                               {{template "repo/settings/webhook/wechatwork" .}}
-                               {{template "repo/settings/webhook/packagist" .}}
-                       </div>
-
-                       {{template "repo/settings/webhook/history" .}}
-               </div>
+               {{template "webhook/new" .}}
        </div>
 {{template "user/settings/layout_footer" .}}

diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl
new file mode 100644 (file)
index 0000000..b5878fc
--- /dev/null
+++ b/templates/webhook/new.tmpl
@@ -0,0 +1,20 @@
+<h4 class="ui top attached header">
+       {{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
+       <div class="ui right">
+               {{template "shared/webhook/icon" .}}
+       </div>
+</h4>
+<div class="ui attached segment">
+       {{template "repo/settings/webhook/gitea" .}}
+       {{template "repo/settings/webhook/gogs" .}}
+       {{template "repo/settings/webhook/slack" .}}
+       {{template "repo/settings/webhook/discord" .}}
+       {{template "repo/settings/webhook/dingtalk" .}}
+       {{template "repo/settings/webhook/telegram" .}}
+       {{template "repo/settings/webhook/msteams" .}}
+       {{template "repo/settings/webhook/feishu" .}}
+       {{template "repo/settings/webhook/matrix" .}}
+       {{template "repo/settings/webhook/wechatwork" .}}
+       {{template "repo/settings/webhook/packagist" .}}
+</div>
+{{template "repo/settings/webhook/history" .}}