From 9e977009d2282497ee5912b47d9bc6f91325dfa9 Mon Sep 17 00:00:00 2001 From: kerwin612 Date: Mon, 18 Sep 2023 17:23:42 +0800 Subject: [PATCH 1/5] Separate the webhook type selection module into a common template, New webhook page supports quick switching type --- routers/web/repo/setting/webhook.go | 4 +- templates/admin/hook_new.tmpl | 7 ++- templates/org/settings/hook_new.tmpl | 9 +++- .../repo/settings/webhook/base_list.tmpl | 48 +------------------ templates/repo/settings/webhook/new.tmpl | 9 +++- templates/user/settings/hook_new.tmpl | 9 +++- templates/webhook/{new.tmpl => form.tmpl} | 16 +++++-- templates/webhook/selector.tmpl | 47 ++++++++++++++++++ 8 files changed, 91 insertions(+), 58 deletions(-) rename templates/webhook/{new.tmpl => form.tmpl} (71%) create mode 100644 templates/webhook/selector.tmpl diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index 33ea2c206b6fc..544c74f85793c 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -149,7 +149,7 @@ func WebhooksNew(ctx *context.Context) { "Username": "Gitea", } } - ctx.Data["BaseLink"] = orCtx.LinkNew + ctx.Data["BaseLinkNew"] = orCtx.LinkNew ctx.HTML(http.StatusOK, orCtx.NewTemplate) } @@ -211,7 +211,7 @@ func createWebhook(ctx *context.Context, params webhookParams) { ctx.ServerError("getOwnerRepoCtx", err) return } - ctx.Data["BaseLink"] = orCtx.LinkNew + ctx.Data["BaseLinkNew"] = orCtx.LinkNew if ctx.HasError() { ctx.HTML(http.StatusOK, orCtx.NewTemplate) diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index f565318b8b37e..c9cdc0e76c870 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -1,13 +1,18 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := .locale.Tr "admin.defaulthooks.update_webhook"}} {{if .PageIsAdminDefaultHooksNew}} + {{$IsNew = true}} {{$CustomHeaderTitle = .locale.Tr "admin.defaulthooks.add_webhook"}} {{else if .PageIsAdminSystemHooksNew}} + {{$IsNew = true}} {{$CustomHeaderTitle = .locale.Tr "admin.systemhooks.add_webhook"}} {{else if .Webhook.IsSystemWebhook}} + {{$IsNew = false}} {{$CustomHeaderTitle = .locale.Tr "admin.systemhooks.update_webhook"}} {{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
{{template "admin/layout_footer" .}} + diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index ea477c997583e..f5ee56ec0a58e 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -1,7 +1,12 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := .locale.Tr "repo.settings.update_webhook"}} - {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{if .PageIsSettingsHooksNew}} + {{$IsNew = true}} + {{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}} + {{end}} + {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
{{template "org/settings/layout_footer" .}} + diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index b0e8ace410673..de7347552f834 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -3,52 +3,7 @@
{{.locale.Tr "repo.settings.add_webhook"}}
-
- - {{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_gitea"}} - - - {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_gogs"}} - - - {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_slack"}} - - - {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_discord"}} - - - {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_dingtalk"}} - - - {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_telegram"}} - - - {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_msteams"}} - - - {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} - - - {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_matrix"}} - - - {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_wechatwork"}} - - - {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_packagist"}} - -
+ {{template "webhook/selector" .}}
@@ -69,3 +24,4 @@ {{end}} + diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 67a5f7296f99c..1a0248422c79a 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -1,7 +1,12 @@ {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := .locale.Tr "repo.settings.update_webhook"}} - {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{if .PageIsSettingsHooksNew}} + {{$IsNew = true}} + {{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}} + {{end}} + {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
{{template "repo/settings/layout_footer" .}} + diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl index 9a857db85c9b8..7bfe3843eb75a 100644 --- a/templates/user/settings/hook_new.tmpl +++ b/templates/user/settings/hook_new.tmpl @@ -1,7 +1,12 @@ {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := .locale.Tr "repo.settings.update_webhook"}} - {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{if .PageIsSettingsHooksNew}} + {{$IsNew = true}} + {{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}} + {{end}} + {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
{{template "user/settings/layout_footer" .}} + diff --git a/templates/webhook/new.tmpl b/templates/webhook/form.tmpl similarity index 71% rename from templates/webhook/new.tmpl rename to templates/webhook/form.tmpl index a185c42b51ea0..b1c464dc2df01 100644 --- a/templates/webhook/new.tmpl +++ b/templates/webhook/form.tmpl @@ -1,8 +1,17 @@

{{.CustomHeaderTitle}} -
- {{template "shared/webhook/icon" .ctxData}} -
+ {{if .IsNew}} +
+
+ {{template "shared/webhook/icon" .ctxData}} +
+ {{template "webhook/selector" .ctxData}} +
+ {{else}} +
+ {{template "shared/webhook/icon" .ctxData}} +
+ {{end}}

{{template "repo/settings/webhook/gitea" .ctxData}} @@ -18,3 +27,4 @@ {{template "repo/settings/webhook/packagist" .ctxData}}
{{template "repo/settings/webhook/history" .ctxData}} + diff --git a/templates/webhook/selector.tmpl b/templates/webhook/selector.tmpl new file mode 100644 index 0000000000000..a66ded75d0d2b --- /dev/null +++ b/templates/webhook/selector.tmpl @@ -0,0 +1,47 @@ +
+ + {{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_gitea"}} + + + {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_gogs"}} + + + {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_slack"}} + + + {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_discord"}} + + + {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_dingtalk"}} + + + {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_telegram"}} + + + {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_msteams"}} + + + {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} + + + {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_matrix"}} + + + {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_wechatwork"}} + + + {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_packagist"}} + +
+ From a566e3add50aa346cf1f94692605c6ce3e9da619 Mon Sep 17 00:00:00 2001 From: kerwin612 Date: Fri, 3 Nov 2023 12:17:35 +0800 Subject: [PATCH 2/5] Merge #27231 changes --- templates/admin/hook_new.tmpl | 8 +++---- templates/org/settings/hook_new.tmpl | 4 ++-- .../repo/settings/webhook/base_list.tmpl | 2 +- templates/repo/settings/webhook/new.tmpl | 4 ++-- templates/user/settings/hook_new.tmpl | 4 ++-- templates/webhook/selector.tmpl | 22 +++++++++---------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index c9cdc0e76c870..f14760d32c4a4 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -1,16 +1,16 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
{{$IsNew := false}} - {{$CustomHeaderTitle := .locale.Tr "admin.defaulthooks.update_webhook"}} + {{$CustomHeaderTitle := ctx.Locale.Tr "admin.defaulthooks.update_webhook"}} {{if .PageIsAdminDefaultHooksNew}} {{$IsNew = true}} - {{$CustomHeaderTitle = .locale.Tr "admin.defaulthooks.add_webhook"}} + {{$CustomHeaderTitle = ctx.Locale.Tr "admin.defaulthooks.add_webhook"}} {{else if .PageIsAdminSystemHooksNew}} {{$IsNew = true}} - {{$CustomHeaderTitle = .locale.Tr "admin.systemhooks.add_webhook"}} + {{$CustomHeaderTitle = ctx.Locale.Tr "admin.systemhooks.add_webhook"}} {{else if .Webhook.IsSystemWebhook}} {{$IsNew = false}} - {{$CustomHeaderTitle = .locale.Tr "admin.systemhooks.update_webhook"}} + {{$CustomHeaderTitle = ctx.Locale.Tr "admin.systemhooks.update_webhook"}} {{end}} {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index f5ee56ec0a58e..d117587f09424 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -1,10 +1,10 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
{{$IsNew := false}} - {{$CustomHeaderTitle := .locale.Tr "repo.settings.update_webhook"}} + {{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} {{if .PageIsSettingsHooksNew}} {{$IsNew = true}} - {{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}} + {{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}} {{end}} {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index de7347552f834..03cbdeb3d7084 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"}}
+
{{ctx.Locale.Tr "repo.settings.add_webhook"}}
{{template "webhook/selector" .}}
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 1a0248422c79a..703e117f52260 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -1,10 +1,10 @@ {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings new webhook")}}
{{$IsNew := false}} - {{$CustomHeaderTitle := .locale.Tr "repo.settings.update_webhook"}} + {{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} {{if .PageIsSettingsHooksNew}} {{$IsNew = true}} - {{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}} + {{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}} {{end}} {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl index 7bfe3843eb75a..787202d263926 100644 --- a/templates/user/settings/hook_new.tmpl +++ b/templates/user/settings/hook_new.tmpl @@ -1,10 +1,10 @@ {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
{{$IsNew := false}} - {{$CustomHeaderTitle := .locale.Tr "repo.settings.update_webhook"}} + {{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} {{if .PageIsSettingsHooksNew}} {{$IsNew = true}} - {{$CustomHeaderTitle = .locale.Tr "repo.settings.add_webhook"}} + {{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}} {{end}} {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}}
diff --git a/templates/webhook/selector.tmpl b/templates/webhook/selector.tmpl index a66ded75d0d2b..206d82489e50e 100644 --- a/templates/webhook/selector.tmpl +++ b/templates/webhook/selector.tmpl @@ -1,47 +1,47 @@
{{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_gitea"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_gogs"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_slack"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_discord"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_dingtalk"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_telegram"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_msteams"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_matrix"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_wechatwork"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" 20)}} - {{.locale.Tr "repo.settings.web_hook_name_packagist"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}}
From 4447bb1b56e7cb028999231128d9148cf7d65ab1 Mon Sep 17 00:00:00 2001 From: kerwin612 Date: Fri, 3 Nov 2023 13:13:01 +0800 Subject: [PATCH 3/5] Perfect the code, add drop-down styles to types --- routers/web/repo/setting/webhook.go | 4 ++-- templates/admin/hook_new.tmpl | 1 - templates/org/settings/hook_new.tmpl | 1 - .../repo/settings/webhook/base_list.tmpl | 1 - templates/repo/settings/webhook/new.tmpl | 1 - templates/user/settings/hook_new.tmpl | 1 - templates/webhook/form.tmpl | 4 ++-- templates/webhook/selector.tmpl | 23 +++++++++---------- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index 361a43ebaafce..ea5abb0579206 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -149,7 +149,7 @@ func WebhooksNew(ctx *context.Context) { "Username": "Gitea", } } - ctx.Data["BaseLinkNew"] = orCtx.LinkNew + ctx.Data["BaseLink"] = orCtx.LinkNew ctx.HTML(http.StatusOK, orCtx.NewTemplate) } @@ -211,7 +211,7 @@ func createWebhook(ctx *context.Context, params webhookParams) { ctx.ServerError("getOwnerRepoCtx", err) return } - ctx.Data["BaseLinkNew"] = orCtx.LinkNew + ctx.Data["BaseLink"] = orCtx.LinkNew if ctx.HasError() { ctx.HTML(http.StatusOK, orCtx.NewTemplate) diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index f14760d32c4a4..e88a5705f1205 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -15,4 +15,3 @@ {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}} {{template "admin/layout_footer" .}} - diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index d117587f09424..9e64ba5a3a46c 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -9,4 +9,3 @@ {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}} {{template "org/settings/layout_footer" .}} - diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index 03cbdeb3d7084..44d30a7dcbfab 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -24,4 +24,3 @@ {{end}} - diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 703e117f52260..0a58c25f1e8c0 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -9,4 +9,3 @@ {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}} {{template "repo/settings/layout_footer" .}} - diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl index 787202d263926..90cbba17b746d 100644 --- a/templates/user/settings/hook_new.tmpl +++ b/templates/user/settings/hook_new.tmpl @@ -9,4 +9,3 @@ {{template "webhook/form" (dict "ctxData" . "IsNew" $IsNew "CustomHeaderTitle" $CustomHeaderTitle)}} {{template "user/settings/layout_footer" .}} - diff --git a/templates/webhook/form.tmpl b/templates/webhook/form.tmpl index b1c464dc2df01..dbc0409d344d0 100644 --- a/templates/webhook/form.tmpl +++ b/templates/webhook/form.tmpl @@ -2,8 +2,9 @@ {{.CustomHeaderTitle}} {{if .IsNew}}
-
+
{{template "shared/webhook/icon" .ctxData}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{template "webhook/selector" .ctxData}}
@@ -27,4 +28,3 @@ {{template "repo/settings/webhook/packagist" .ctxData}}
{{template "repo/settings/webhook/history" .ctxData}} - diff --git a/templates/webhook/selector.tmpl b/templates/webhook/selector.tmpl index 206d82489e50e..a3b00baf80fee 100644 --- a/templates/webhook/selector.tmpl +++ b/templates/webhook/selector.tmpl @@ -1,47 +1,46 @@
- + {{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} - + {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} - + {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} - + {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} - + {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} - + {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} - + {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} - + {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} - + {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} - + {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} - + {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" 20)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}}
- From d837f0d8cc76f89deb196480cf37e27d5bd9eca4 Mon Sep 17 00:00:00 2001 From: kerwin612 Date: Sun, 5 Nov 2023 13:09:31 +0800 Subject: [PATCH 4/5] Another implementation of PR #26941 --- options/locale/locale_en-US.ini | 1 + templates/repo/settings/webhook/dingtalk.tmpl | 1 - templates/repo/settings/webhook/discord.tmpl | 1 - templates/repo/settings/webhook/feishu.tmpl | 2 - templates/repo/settings/webhook/gitea.tmpl | 1 - templates/repo/settings/webhook/gogs.tmpl | 1 - templates/repo/settings/webhook/matrix.tmpl | 1 - templates/repo/settings/webhook/msteams.tmpl | 1 - .../repo/settings/webhook/packagist.tmpl | 1 - templates/repo/settings/webhook/slack.tmpl | 1 - templates/repo/settings/webhook/telegram.tmpl | 1 - .../repo/settings/webhook/wechatwork.tmpl | 1 - templates/shared/webhook/type_name.tmpl | 23 +++++++++ templates/webhook/form.tmpl | 51 ++++++++++--------- templates/webhook/helps.tmpl | 37 ++++++++++++++ templates/webhook/selector_without_icons.tmpl | 35 +++++++++++++ 16 files changed, 122 insertions(+), 37 deletions(-) create mode 100644 templates/shared/webhook/type_name.tmpl create mode 100644 templates/webhook/helps.tmpl create mode 100644 templates/webhook/selector_without_icons.tmpl diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a7a7a4f4c50f9..03fb131c2833f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2140,6 +2140,7 @@ settings.remove_team_success = The team's access to the repository has been remo settings.add_webhook = Add Webhook settings.add_webhook.invalid_channel_name = Webhook channel name cannot be empty and cannot contain only a # character. settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the webhooks guide. +settings.webhook_type = Webhook Type settings.webhook_deletion = Remove Webhook settings.webhook_deletion_desc = Removing a webhook deletes its settings and delivery history. Continue? settings.webhook_deletion_success = The webhook has been removed. diff --git a/templates/repo/settings/webhook/dingtalk.tmpl b/templates/repo/settings/webhook/dingtalk.tmpl index 32ca0d0807ca9..65f61d82eb6a7 100644 --- a/templates/repo/settings/webhook/dingtalk.tmpl +++ b/templates/repo/settings/webhook/dingtalk.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "dingtalk"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://dingtalk.com" (ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/discord.tmpl b/templates/repo/settings/webhook/discord.tmpl index 25dc219ee1080..48b62722dd6c5 100644 --- a/templates/repo/settings/webhook/discord.tmpl +++ b/templates/repo/settings/webhook/discord.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "discord"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://discord.com" (ctx.Locale.Tr "repo.settings.web_hook_name_discord") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/feishu.tmpl b/templates/repo/settings/webhook/feishu.tmpl index 9683427fbf646..6edd9aa58280b 100644 --- a/templates/repo/settings/webhook/feishu.tmpl +++ b/templates/repo/settings/webhook/feishu.tmpl @@ -1,6 +1,4 @@ {{if eq .HookType "feishu"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://feishu.cn" (ctx.Locale.Tr "repo.settings.web_hook_name_feishu") | Str2html}}

-

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://larksuite.com" (ctx.Locale.Tr "repo.settings.web_hook_name_larksuite") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/gitea.tmpl b/templates/repo/settings/webhook/gitea.tmpl index 4fda6a7b39edd..d8ea13d96d663 100644 --- a/templates/repo/settings/webhook/gitea.tmpl +++ b/templates/repo/settings/webhook/gitea.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "gitea"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gitea") | Str2html}}

{{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} diff --git a/templates/repo/settings/webhook/gogs.tmpl b/templates/repo/settings/webhook/gogs.tmpl index d2bd98c32c66b..45da6f517e464 100644 --- a/templates/repo/settings/webhook/gogs.tmpl +++ b/templates/repo/settings/webhook/gogs.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "gogs"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gogs") | Str2html}}

{{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} diff --git a/templates/repo/settings/webhook/matrix.tmpl b/templates/repo/settings/webhook/matrix.tmpl index a2a9921d7b995..6e71077fa8c47 100644 --- a/templates/repo/settings/webhook/matrix.tmpl +++ b/templates/repo/settings/webhook/matrix.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "matrix"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://matrix.org/" (ctx.Locale.Tr "repo.settings.web_hook_name_matrix") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/msteams.tmpl b/templates/repo/settings/webhook/msteams.tmpl index 0097209db1ac7..7ca930cc4d3db 100644 --- a/templates/repo/settings/webhook/msteams.tmpl +++ b/templates/repo/settings/webhook/msteams.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "msteams"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://teams.microsoft.com" (ctx.Locale.Tr "repo.settings.web_hook_name_msteams") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/packagist.tmpl b/templates/repo/settings/webhook/packagist.tmpl index fc373951d1ab9..a0be20cce968d 100644 --- a/templates/repo/settings/webhook/packagist.tmpl +++ b/templates/repo/settings/webhook/packagist.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "packagist"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://packagist.org" (ctx.Locale.Tr "repo.settings.web_hook_name_packagist") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/slack.tmpl b/templates/repo/settings/webhook/slack.tmpl index b367aed5ec89e..fba7ac48f2bb8 100644 --- a/templates/repo/settings/webhook/slack.tmpl +++ b/templates/repo/settings/webhook/slack.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "slack"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://slack.com" (ctx.Locale.Tr "repo.settings.web_hook_name_slack") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/telegram.tmpl b/templates/repo/settings/webhook/telegram.tmpl index 92bbbef3fd131..f3cbf6d867964 100644 --- a/templates/repo/settings/webhook/telegram.tmpl +++ b/templates/repo/settings/webhook/telegram.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "telegram"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://core.telegram.org/bots" (ctx.Locale.Tr "repo.settings.web_hook_name_telegram") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/wechatwork.tmpl b/templates/repo/settings/webhook/wechatwork.tmpl index 65f12998b15d9..e36d5c0bc4294 100644 --- a/templates/repo/settings/webhook/wechatwork.tmpl +++ b/templates/repo/settings/webhook/wechatwork.tmpl @@ -1,5 +1,4 @@ {{if eq .HookType "wechatwork"}} -

{{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://work.weixin.qq.com" (ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork") | Str2html}}

{{.CsrfTokenHtml}}
diff --git a/templates/shared/webhook/type_name.tmpl b/templates/shared/webhook/type_name.tmpl new file mode 100644 index 0000000000000..c76f5b0ff3844 --- /dev/null +++ b/templates/shared/webhook/type_name.tmpl @@ -0,0 +1,23 @@ +{{if eq .HookType "gitea"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} +{{else if eq .HookType "gogs"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} +{{else if eq .HookType "slack"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} +{{else if eq .HookType "discord"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} +{{else if eq .HookType "dingtalk"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} +{{else if eq .HookType "telegram"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} +{{else if eq .HookType "msteams"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} +{{else if eq .HookType "feishu"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} +{{else if eq .HookType "matrix"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} +{{else if eq .HookType "wechatwork"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} +{{else if eq .HookType "packagist"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} +{{end}} diff --git a/templates/webhook/form.tmpl b/templates/webhook/form.tmpl index dbc0409d344d0..0236b95d0fd14 100644 --- a/templates/webhook/form.tmpl +++ b/templates/webhook/form.tmpl @@ -1,30 +1,31 @@

- {{.CustomHeaderTitle}} - {{if .IsNew}} -
-
- {{template "shared/webhook/icon" .ctxData}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
- {{template "webhook/selector" .ctxData}} -
- {{else}} -
- {{template "shared/webhook/icon" .ctxData}} -
- {{end}} + {{.CustomHeaderTitle}} +
+ {{template "shared/webhook/icon" .ctxData}} +

- {{template "repo/settings/webhook/gitea" .ctxData}} - {{template "repo/settings/webhook/gogs" .ctxData}} - {{template "repo/settings/webhook/slack" .ctxData}} - {{template "repo/settings/webhook/discord" .ctxData}} - {{template "repo/settings/webhook/dingtalk" .ctxData}} - {{template "repo/settings/webhook/telegram" .ctxData}} - {{template "repo/settings/webhook/msteams" .ctxData}} - {{template "repo/settings/webhook/feishu" .ctxData}} - {{template "repo/settings/webhook/matrix" .ctxData}} - {{template "repo/settings/webhook/wechatwork" .ctxData}} - {{template "repo/settings/webhook/packagist" .ctxData}} +
+
+ +
+
{{template "shared/webhook/type_name" .ctxData}}
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{template "webhook/selector_without_icons" .ctxData}} +
+ {{template "webhook/helps" .ctxData}} +
+
+ {{template "repo/settings/webhook/gitea" .ctxData}} + {{template "repo/settings/webhook/gogs" .ctxData}} + {{template "repo/settings/webhook/slack" .ctxData}} + {{template "repo/settings/webhook/discord" .ctxData}} + {{template "repo/settings/webhook/dingtalk" .ctxData}} + {{template "repo/settings/webhook/telegram" .ctxData}} + {{template "repo/settings/webhook/msteams" .ctxData}} + {{template "repo/settings/webhook/feishu" .ctxData}} + {{template "repo/settings/webhook/matrix" .ctxData}} + {{template "repo/settings/webhook/wechatwork" .ctxData}} + {{template "repo/settings/webhook/packagist" .ctxData}}
{{template "repo/settings/webhook/history" .ctxData}} diff --git a/templates/webhook/helps.tmpl b/templates/webhook/helps.tmpl new file mode 100644 index 0000000000000..38df382d89bdd --- /dev/null +++ b/templates/webhook/helps.tmpl @@ -0,0 +1,37 @@ + +{{if eq .HookType "gitea"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gitea") | Str2html}} +{{end}} +{{if eq .HookType "gogs"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gogs") | Str2html}} +{{end}} +{{if eq .HookType "slack"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://slack.com" (ctx.Locale.Tr "repo.settings.web_hook_name_slack") | Str2html}} +{{end}} +{{if eq .HookType "discord"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://discord.com" (ctx.Locale.Tr "repo.settings.web_hook_name_discord") | Str2html}} +{{end}} +{{if eq .HookType "dingtalk"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://dingtalk.com" (ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk") | Str2html}} +{{end}} +{{if eq .HookType "telegram"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://core.telegram.org/bots" (ctx.Locale.Tr "repo.settings.web_hook_name_telegram") | Str2html}} +{{end}} +{{if eq .HookType "msteams"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://teams.microsoft.com" (ctx.Locale.Tr "repo.settings.web_hook_name_msteams") | Str2html}} +{{end}} +{{if eq .HookType "feishu"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://feishu.cn" (ctx.Locale.Tr "repo.settings.web_hook_name_feishu") | Str2html}} +
+ {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://larksuite.com" (ctx.Locale.Tr "repo.settings.web_hook_name_larksuite") | Str2html}} +{{end}} +{{if eq .HookType "matrix"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://matrix.org/" (ctx.Locale.Tr "repo.settings.web_hook_name_matrix") | Str2html}} +{{end}} +{{if eq .HookType "wechatwork"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://work.weixin.qq.com" (ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork") | Str2html}} +{{end}} +{{if eq .HookType "packagist"}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://packagist.org" (ctx.Locale.Tr "repo.settings.web_hook_name_packagist") | Str2html}} +{{end}} + diff --git a/templates/webhook/selector_without_icons.tmpl b/templates/webhook/selector_without_icons.tmpl new file mode 100644 index 0000000000000..c0400f7e42536 --- /dev/null +++ b/templates/webhook/selector_without_icons.tmpl @@ -0,0 +1,35 @@ +
+ + {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} + +
From af02652882a2e655d495c2c794a9db8cf6014e6e Mon Sep 17 00:00:00 2001 From: kerwin612 Date: Tue, 7 Nov 2023 10:09:19 +0800 Subject: [PATCH 5/5] fix lint error --- templates/shared/webhook/type_name.tmpl | 22 +++---- templates/webhook/form.tmpl | 52 +++++++-------- templates/webhook/helps.tmpl | 26 ++++---- templates/webhook/selector_without_icons.tmpl | 66 +++++++++---------- 4 files changed, 83 insertions(+), 83 deletions(-) diff --git a/templates/shared/webhook/type_name.tmpl b/templates/shared/webhook/type_name.tmpl index c76f5b0ff3844..5c7cc6c2a553a 100644 --- a/templates/shared/webhook/type_name.tmpl +++ b/templates/shared/webhook/type_name.tmpl @@ -1,23 +1,23 @@ {{if eq .HookType "gitea"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} {{else if eq .HookType "gogs"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} {{else if eq .HookType "slack"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} {{else if eq .HookType "discord"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} {{else if eq .HookType "dingtalk"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} {{else if eq .HookType "telegram"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} {{else if eq .HookType "msteams"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} {{else if eq .HookType "feishu"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} {{else if eq .HookType "matrix"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} {{else if eq .HookType "wechatwork"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} {{else if eq .HookType "packagist"}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} {{end}} diff --git a/templates/webhook/form.tmpl b/templates/webhook/form.tmpl index 0236b95d0fd14..322efbbd469c8 100644 --- a/templates/webhook/form.tmpl +++ b/templates/webhook/form.tmpl @@ -1,31 +1,31 @@

- {{.CustomHeaderTitle}} -
- {{template "shared/webhook/icon" .ctxData}} -
+ {{.CustomHeaderTitle}} +
+ {{template "shared/webhook/icon" .ctxData}} +

-
-
- -
-
{{template "shared/webhook/type_name" .ctxData}}
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} - {{template "webhook/selector_without_icons" .ctxData}} -
- {{template "webhook/helps" .ctxData}} -
-
- {{template "repo/settings/webhook/gitea" .ctxData}} - {{template "repo/settings/webhook/gogs" .ctxData}} - {{template "repo/settings/webhook/slack" .ctxData}} - {{template "repo/settings/webhook/discord" .ctxData}} - {{template "repo/settings/webhook/dingtalk" .ctxData}} - {{template "repo/settings/webhook/telegram" .ctxData}} - {{template "repo/settings/webhook/msteams" .ctxData}} - {{template "repo/settings/webhook/feishu" .ctxData}} - {{template "repo/settings/webhook/matrix" .ctxData}} - {{template "repo/settings/webhook/wechatwork" .ctxData}} - {{template "repo/settings/webhook/packagist" .ctxData}} +
+
+ +
+
{{template "shared/webhook/type_name" .ctxData}}
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{template "webhook/selector_without_icons" .ctxData}} +
+ {{template "webhook/helps" .ctxData}} +
+
+ {{template "repo/settings/webhook/gitea" .ctxData}} + {{template "repo/settings/webhook/gogs" .ctxData}} + {{template "repo/settings/webhook/slack" .ctxData}} + {{template "repo/settings/webhook/discord" .ctxData}} + {{template "repo/settings/webhook/dingtalk" .ctxData}} + {{template "repo/settings/webhook/telegram" .ctxData}} + {{template "repo/settings/webhook/msteams" .ctxData}} + {{template "repo/settings/webhook/feishu" .ctxData}} + {{template "repo/settings/webhook/matrix" .ctxData}} + {{template "repo/settings/webhook/wechatwork" .ctxData}} + {{template "repo/settings/webhook/packagist" .ctxData}}
{{template "repo/settings/webhook/history" .ctxData}} diff --git a/templates/webhook/helps.tmpl b/templates/webhook/helps.tmpl index 38df382d89bdd..05167ec5b29d3 100644 --- a/templates/webhook/helps.tmpl +++ b/templates/webhook/helps.tmpl @@ -1,37 +1,37 @@ {{if eq .HookType "gitea"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gitea") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gitea") | Str2html}} {{end}} {{if eq .HookType "gogs"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gogs") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (ctx.Locale.Tr "repo.settings.web_hook_name_gogs") | Str2html}} {{end}} {{if eq .HookType "slack"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://slack.com" (ctx.Locale.Tr "repo.settings.web_hook_name_slack") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://slack.com" (ctx.Locale.Tr "repo.settings.web_hook_name_slack") | Str2html}} {{end}} {{if eq .HookType "discord"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://discord.com" (ctx.Locale.Tr "repo.settings.web_hook_name_discord") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://discord.com" (ctx.Locale.Tr "repo.settings.web_hook_name_discord") | Str2html}} {{end}} {{if eq .HookType "dingtalk"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://dingtalk.com" (ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://dingtalk.com" (ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk") | Str2html}} {{end}} {{if eq .HookType "telegram"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://core.telegram.org/bots" (ctx.Locale.Tr "repo.settings.web_hook_name_telegram") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://core.telegram.org/bots" (ctx.Locale.Tr "repo.settings.web_hook_name_telegram") | Str2html}} {{end}} {{if eq .HookType "msteams"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://teams.microsoft.com" (ctx.Locale.Tr "repo.settings.web_hook_name_msteams") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://teams.microsoft.com" (ctx.Locale.Tr "repo.settings.web_hook_name_msteams") | Str2html}} {{end}} {{if eq .HookType "feishu"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://feishu.cn" (ctx.Locale.Tr "repo.settings.web_hook_name_feishu") | Str2html}} -
- {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://larksuite.com" (ctx.Locale.Tr "repo.settings.web_hook_name_larksuite") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://feishu.cn" (ctx.Locale.Tr "repo.settings.web_hook_name_feishu") | Str2html}} +
+ {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://larksuite.com" (ctx.Locale.Tr "repo.settings.web_hook_name_larksuite") | Str2html}} {{end}} {{if eq .HookType "matrix"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://matrix.org/" (ctx.Locale.Tr "repo.settings.web_hook_name_matrix") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://matrix.org/" (ctx.Locale.Tr "repo.settings.web_hook_name_matrix") | Str2html}} {{end}} {{if eq .HookType "wechatwork"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://work.weixin.qq.com" (ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://work.weixin.qq.com" (ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork") | Str2html}} {{end}} {{if eq .HookType "packagist"}} - {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://packagist.org" (ctx.Locale.Tr "repo.settings.web_hook_name_packagist") | Str2html}} + {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://packagist.org" (ctx.Locale.Tr "repo.settings.web_hook_name_packagist") | Str2html}} {{end}} diff --git a/templates/webhook/selector_without_icons.tmpl b/templates/webhook/selector_without_icons.tmpl index c0400f7e42536..accf4e4768aa6 100644 --- a/templates/webhook/selector_without_icons.tmpl +++ b/templates/webhook/selector_without_icons.tmpl @@ -1,35 +1,35 @@
- - {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} - - - {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} - + + {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} + + + {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} +