diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index afd613af590dc..770511129e809 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2222,6 +2222,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/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 37dcc49d535ac..e88a5705f1205 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -1,13 +1,17 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := ctx.Locale.Tr "admin.defaulthooks.update_webhook"}} {{if .PageIsAdminDefaultHooksNew}} + {{$IsNew = true}} {{$CustomHeaderTitle = ctx.Locale.Tr "admin.defaulthooks.add_webhook"}} {{else if .PageIsAdminSystemHooksNew}} + {{$IsNew = true}} {{$CustomHeaderTitle = ctx.Locale.Tr "admin.systemhooks.add_webhook"}} {{else if .Webhook.IsSystemWebhook}} + {{$IsNew = false}} {{$CustomHeaderTitle = ctx.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 f89ee5f2b85f7..9e64ba5a3a46c 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -1,7 +1,11 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} - {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{if .PageIsSettingsHooksNew}} + {{$IsNew = true}} + {{$CustomHeaderTitle = ctx.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 e56929b70f34c..d3832503af02d 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -3,7 +3,7 @@
{{ctx.Locale.Tr "repo.settings.add_webhook"}}
- {{template "repo/settings/webhook/link_menu" .}} + {{template "webhook/selector" .}}
diff --git a/templates/repo/settings/webhook/dingtalk.tmpl b/templates/repo/settings/webhook/dingtalk.tmpl index 0ba99e98eee37..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/discord.tmpl b/templates/repo/settings/webhook/discord.tmpl index 104346e04219b..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/feishu.tmpl b/templates/repo/settings/webhook/feishu.tmpl index d80deab26f3a4..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")}}

-

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

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/gitea.tmpl b/templates/repo/settings/webhook/gitea.tmpl index e6eb61ea92b35..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")}}

{{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} diff --git a/templates/repo/settings/webhook/gogs.tmpl b/templates/repo/settings/webhook/gogs.tmpl index e91a3279e4856..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")}}

{{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} diff --git a/templates/repo/settings/webhook/matrix.tmpl b/templates/repo/settings/webhook/matrix.tmpl index 7f1c9f08e62a4..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/msteams.tmpl b/templates/repo/settings/webhook/msteams.tmpl index 62ea24e763f2a..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index b04a44213af88..0a58c25f1e8c0 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -1,7 +1,11 @@ {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} - {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{if .PageIsSettingsHooksNew}} + {{$IsNew = true}} + {{$CustomHeaderTitle = ctx.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/repo/settings/webhook/packagist.tmpl b/templates/repo/settings/webhook/packagist.tmpl index 25aba2a435b3d..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/slack.tmpl b/templates/repo/settings/webhook/slack.tmpl index e7cae92d4bf16..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/telegram.tmpl b/templates/repo/settings/webhook/telegram.tmpl index f92c2be0db846..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/wechatwork.tmpl b/templates/repo/settings/webhook/wechatwork.tmpl index 78a161712330b..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")}}

{{.CsrfTokenHtml}}
diff --git a/templates/shared/webhook/type_name.tmpl b/templates/shared/webhook/type_name.tmpl new file mode 100644 index 0000000000000..5c7cc6c2a553a --- /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/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl index be21f59b9c4de..90cbba17b746d 100644 --- a/templates/user/settings/hook_new.tmpl +++ b/templates/user/settings/hook_new.tmpl @@ -1,7 +1,11 @@ {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
+ {{$IsNew := false}} {{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} - {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{if .PageIsSettingsHooksNew}} + {{$IsNew = true}} + {{$CustomHeaderTitle = ctx.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 62% rename from templates/webhook/new.tmpl rename to templates/webhook/form.tmpl index 305133c03a164..322efbbd469c8 100644 --- a/templates/webhook/new.tmpl +++ b/templates/webhook/form.tmpl @@ -1,15 +1,21 @@

{{.CustomHeaderTitle}} -
-
- {{template "shared/webhook/icon" (dict "Size" 20 "HookType" .ctxData.HookType)}} - {{ctx.Locale.Tr (print "repo.settings.web_hook_name_" .ctxData.HookType)}} -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} - {{template "repo/settings/webhook/link_menu" .ctxData}} +
+ {{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}} diff --git a/templates/webhook/helps.tmpl b/templates/webhook/helps.tmpl new file mode 100644 index 0000000000000..e89aee6fda309 --- /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")}} +{{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")}} +{{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")}} +{{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")}} +{{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")}} +{{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")}} +{{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")}} +{{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")}} +
+ {{ctx.Locale.Tr "repo.settings.add_web_hook_desc" "https://larksuite.com" (ctx.Locale.Tr "repo.settings.web_hook_name_larksuite")}} +{{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")}} +{{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")}} +{{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")}} +{{end}} + diff --git a/templates/repo/settings/webhook/link_menu.tmpl b/templates/webhook/selector.tmpl similarity index 73% rename from templates/repo/settings/webhook/link_menu.tmpl rename to templates/webhook/selector.tmpl index e2c86dcc3c089..1603ff96228c1 100644 --- a/templates/repo/settings/webhook/link_menu.tmpl +++ b/templates/webhook/selector.tmpl @@ -3,47 +3,47 @@ {{$size = .Size}} {{end}}
- + {{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} - + {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} - + {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} - + {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} - + {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} - + {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} - + {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} - + {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} - + {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} - + {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} - + {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" $size)}} {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} diff --git a/templates/webhook/selector_without_icons.tmpl b/templates/webhook/selector_without_icons.tmpl new file mode 100644 index 0000000000000..accf4e4768aa6 --- /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"}} + +