From 3ed2ac249c01b22477d2329271a0e378a12917a7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 31 Jul 2023 00:31:41 +0200 Subject: [PATCH 1/2] Use shared template for webhook icons Fixes: https://github.com/go-gitea/gitea/issues/26241 --- templates/admin/hook_new.tmpl | 24 +----------------------- templates/org/settings/hook_new.tmpl | 24 +----------------------- templates/repo/settings/webhook/new.tmpl | 24 +----------------------- templates/shared/webhook/icon.tmpl | 23 +++++++++++++++++++++++ templates/user/settings/hook_new.tmpl | 24 +----------------------- 5 files changed, 27 insertions(+), 92 deletions(-) create mode 100644 templates/shared/webhook/icon.tmpl diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 1abdd4c813a28..e72e7bba62088 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -11,29 +11,7 @@ {{.locale.Tr "admin.defaulthooks.update_webhook"}} {{end}}
- {{if eq .HookType "gitea"}} - - {{else if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{else if eq .HookType "discord"}} - - {{else if eq .HookType "dingtalk"}} - - {{else if eq .HookType "telegram"}} - - {{else if eq .HookType "msteams"}} - - {{else if eq .HookType "feishu"}} - - {{else if eq .HookType "matrix"}} - {{svg "gitea-matrix" 26}} - {{else if eq .HookType "wechatwork"}} - - {{else if eq .HookType "packagist"}} - - {{end}} + {{template "shared/webhook/icon" .}}
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index 1bf74fb7ba0e3..4a1323568abb4 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -3,29 +3,7 @@

{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
- {{if eq .HookType "gitea"}} - - {{else if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{else if eq .HookType "discord"}} - - {{else if eq .HookType "dingtalk"}} - - {{else if eq .HookType "telegram"}} - - {{else if eq .HookType "msteams"}} - - {{else if eq .HookType "feishu"}} - - {{else if eq .HookType "matrix"}} - {{svg "gitea-matrix" 26}} - {{else if eq .HookType "wechatwork"}} - - {{else if eq .HookType "packagist"}} - - {{end}} + {{template "shared/webhook/icon" .}}

diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 73d6726a57579..1b0474222171c 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -3,29 +3,7 @@

{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
- {{if eq .HookType "gitea"}} - - {{else if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{else if eq .HookType "discord"}} - - {{else if eq .HookType "dingtalk"}} - - {{else if eq .HookType "telegram"}} - - {{else if eq .HookType "msteams"}} - - {{else if eq .HookType "feishu"}} - - {{else if eq .HookType "matrix"}} - {{svg "gitea-matrix" 26}} - {{else if eq .HookType "wechatwork"}} - - {{else if eq .HookType "packagist"}} - - {{end}} + {{template "shared/webhook/icon" .}}

diff --git a/templates/shared/webhook/icon.tmpl b/templates/shared/webhook/icon.tmpl new file mode 100644 index 0000000000000..d8aebefbd5d50 --- /dev/null +++ b/templates/shared/webhook/icon.tmpl @@ -0,0 +1,23 @@ +{{if eq .HookType "gitea"}} + +{{else if eq .HookType "gogs"}} + +{{else if eq .HookType "slack"}} + +{{else if eq .HookType "discord"}} + +{{else if eq .HookType "dingtalk"}} + +{{else if eq .HookType "telegram"}} + +{{else if eq .HookType "msteams"}} + +{{else if eq .HookType "feishu"}} + +{{else if eq .HookType "matrix"}} + {{svg "gitea-matrix" 26}} +{{else if eq .HookType "wechatwork"}} + +{{else if eq .HookType "packagist"}} + +{{end}} diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl index ac32cdd8c8bf0..83ae4801b499f 100644 --- a/templates/user/settings/hook_new.tmpl +++ b/templates/user/settings/hook_new.tmpl @@ -4,29 +4,7 @@

{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
- {{if eq .HookType "gitea"}} - - {{else if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{else if eq .HookType "discord"}} - - {{else if eq .HookType "dingtalk"}} - - {{else if eq .HookType "telegram"}} - - {{else if eq .HookType "msteams"}} - - {{else if eq .HookType "feishu"}} - - {{else if eq .HookType "matrix"}} - - {{else if eq .HookType "wechatwork"}} - - {{else if eq .HookType "packagist"}} - - {{end}} + {{template "shared/webhook/icon" .}}

From d2f65effe7bea9d97b8ac867996c721134295576 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 31 Jul 2023 00:43:51 +0200 Subject: [PATCH 2/2] use for dropdown as well --- .../repo/settings/webhook/base_list.tmpl | 33 ++++++++++++------- templates/shared/webhook/icon.tmpl | 26 ++++++++------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index 8db9a9263e0d8..1bc9447110277 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -5,37 +5,48 @@
{{.locale.Tr "repo.settings.add_webhook"}}
- {{.locale.Tr "repo.settings.web_hook_name_gitea"}} + {{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_gitea"}} - {{.locale.Tr "repo.settings.web_hook_name_gogs"}} + {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_gogs"}} - {{.locale.Tr "repo.settings.web_hook_name_slack"}} + {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_slack"}} - {{.locale.Tr "repo.settings.web_hook_name_discord"}} + {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_discord"}} - {{.locale.Tr "repo.settings.web_hook_name_dingtalk"}} + {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_dingtalk"}} - {{.locale.Tr "repo.settings.web_hook_name_telegram"}} + {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_telegram"}} - {{.locale.Tr "repo.settings.web_hook_name_msteams"}} + {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_msteams"}} - {{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} + {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} - {{svg "gitea-matrix" 20 "img"}}{{.locale.Tr "repo.settings.web_hook_name_matrix"}} + {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_matrix"}} - {{.locale.Tr "repo.settings.web_hook_name_wechatwork"}} + {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_wechatwork"}} - {{.locale.Tr "repo.settings.web_hook_name_packagist"}} + {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" 20)}} + {{.locale.Tr "repo.settings.web_hook_name_packagist"}}
diff --git a/templates/shared/webhook/icon.tmpl b/templates/shared/webhook/icon.tmpl index d8aebefbd5d50..84f9de266fab6 100644 --- a/templates/shared/webhook/icon.tmpl +++ b/templates/shared/webhook/icon.tmpl @@ -1,23 +1,27 @@ +{{$size := 26}} +{{if .Size}} + {{$size = .Size}} +{{end}} {{if eq .HookType "gitea"}} - + {{else if eq .HookType "gogs"}} - + {{else if eq .HookType "slack"}} - + {{else if eq .HookType "discord"}} - + {{else if eq .HookType "dingtalk"}} - + {{else if eq .HookType "telegram"}} - + {{else if eq .HookType "msteams"}} - + {{else if eq .HookType "feishu"}} - + {{else if eq .HookType "matrix"}} - {{svg "gitea-matrix" 26}} + {{svg "gitea-matrix" $size "img"}} {{else if eq .HookType "wechatwork"}} - + {{else if eq .HookType "packagist"}} - + {{end}}