From 3df5b763e58c765fa8a6bead8d129c18cd5384e5 Mon Sep 17 00:00:00 2001
From: kerwin612 <kerwin612@qq.com>
Date: Tue, 5 Sep 2023 10:45:55 +0800
Subject: [PATCH 1/6] Extract common code to new template

---
 templates/org/settings/hook_new.tmpl     | 28 +++------------------
 templates/repo/settings/webhook/new.tmpl | 27 +++------------------
 templates/user/settings/hook_new.tmpl    | 31 +++++-------------------
 templates/webhook/new.tmpl               | 21 ++++++++++++++++
 4 files changed, 35 insertions(+), 72 deletions(-)
 create mode 100644 templates/webhook/new.tmpl

diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 4a1323568abb4..12d483785c375 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,26 +1,6 @@
 {{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 1b0474222171c..41d6701323968 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,25 +1,6 @@
 {{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" .}}
-	</div>
+    <div class="repo-setting-content">
+        {{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 83ae4801b499f..3e9b1a1571c35 100644
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,27 +1,8 @@
 {{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>
-	</div>
+    <div class="user-setting-content">
+        <div class="user-setting-content">
+            {{template "webhook/new" .}}
+        </div>
+    </div>
 {{template "user/settings/layout_footer" .}}
+
diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl
new file mode 100644
index 0000000000000..da805a8d07e09
--- /dev/null
+++ b/templates/webhook/new.tmpl
@@ -0,0 +1,21 @@
+<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" .}}
+

From d64d2c2807c4b8404cbab24424c4a3b816abf41d Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Tue, 5 Sep 2023 12:20:18 +0800
Subject: [PATCH 2/6] Update hook_new.tmpl

---
 templates/user/settings/hook_new.tmpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index 3e9b1a1571c35..a139c6619478c 100644
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,8 +1,6 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
     <div class="user-setting-content">
-        <div class="user-setting-content">
-            {{template "webhook/new" .}}
-        </div>
+        {{template "webhook/new" .}}
     </div>
 {{template "user/settings/layout_footer" .}}
 

From ee74fef0d6f84032712ab7ab2b285a22847cd8fa Mon Sep 17 00:00:00 2001
From: KN4CK3R <admin@oldschoolhack.me>
Date: Tue, 5 Sep 2023 09:28:11 +0200
Subject: [PATCH 3/6] Update hook_new.tmpl

---
 templates/org/settings/hook_new.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 12d483785c375..d4343f8c680f6 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,6 +1,5 @@
 {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
-    <div class="org-setting-content">
-        {{template "webhook/new" .}}
-    </div>
+	<div class="org-setting-content">
+		{{template "webhook/new" .}}
+	</div>
 {{template "org/settings/layout_footer" .}}
-

From 4fd22c38a59d47643042d87b726e0e45a13a8ef9 Mon Sep 17 00:00:00 2001
From: KN4CK3R <admin@oldschoolhack.me>
Date: Tue, 5 Sep 2023 09:28:44 +0200
Subject: [PATCH 4/6] Update new.tmpl

---
 templates/repo/settings/webhook/new.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index 41d6701323968..79fd4bd2ff77c 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings new webhook")}}
-    <div class="repo-setting-content">
-        {{template "webhook/new" .}}
-    </div>
+	<div class="repo-setting-content">
+		{{template "webhook/new" .}}
+	</div>
 {{template "repo/settings/layout_footer" .}}
-

From 64a935a129fb853ea2360e7f667274d96aa98325 Mon Sep 17 00:00:00 2001
From: KN4CK3R <admin@oldschoolhack.me>
Date: Tue, 5 Sep 2023 09:29:05 +0200
Subject: [PATCH 5/6] Update hook_new.tmpl

---
 templates/user/settings/hook_new.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index a139c6619478c..4d3ddf0383469 100644
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
-    <div class="user-setting-content">
-        {{template "webhook/new" .}}
-    </div>
+	<div class="user-setting-content">
+		{{template "webhook/new" .}}
+	</div>
 {{template "user/settings/layout_footer" .}}
-

From da64219ee61f3e7bf91524ad5cce660ce7c8a4cd Mon Sep 17 00:00:00 2001
From: KN4CK3R <admin@oldschoolhack.me>
Date: Tue, 5 Sep 2023 09:29:55 +0200
Subject: [PATCH 6/6] Update new.tmpl

---
 templates/webhook/new.tmpl | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl
index da805a8d07e09..b5878fc930044 100644
--- a/templates/webhook/new.tmpl
+++ b/templates/webhook/new.tmpl
@@ -1,21 +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>
+	{{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" .}}
+	{{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" .}}
-