Use shared template for webhook icons (#26242) (#26246)

Backport #26242 by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/26241
Co-authored-by: silverwind <me@silverwind.io>

diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index 1abdd4c813a28717462ca0e275cfa5399da233ab..e72e7bba620884dbf8c22b3f9453e49739e1981d 100644 (file)
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -11,29 +11,7 @@
                                {{.locale.Tr "admin.defaulthooks.update_webhook"}}
                        {{end}}
                        <div class="ui right">
-                               {{if eq .HookType "gitea"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-                               {{else if eq .HookType "gogs"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-                               {{else if eq .HookType "slack"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-                               {{else if eq .HookType "discord"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-                               {{else if eq .HookType "dingtalk"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-                               {{else if eq .HookType "telegram"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-                               {{else if eq .HookType "msteams"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-                               {{else if eq .HookType "feishu"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-                               {{else if eq .HookType "matrix"}}
-                                       {{svg "gitea-matrix" 26}}
-                               {{else if eq .HookType "wechatwork"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-                               {{else if eq .HookType "packagist"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-                               {{end}}
+                               {{template "shared/webhook/icon" .}}
                        </div>
                </h4>
                <div class="ui attached segment">

diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 1bf74fb7ba0e3138bacbdcb9b5d4f2d07f2ac906..4a1323568abb4c8f86cad89743afef3bcf7dd6e4 100644 (file)
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -3,29 +3,7 @@
                                <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">
-                                               {{if eq .HookType "gitea"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-                                               {{else if eq .HookType "gogs"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-                                               {{else if eq .HookType "slack"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-                                               {{else if eq .HookType "discord"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-                                               {{else if eq .HookType "dingtalk"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-                                               {{else if eq .HookType "telegram"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-                                               {{else if eq .HookType "msteams"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-                                               {{else if eq .HookType "feishu"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-                                               {{else if eq .HookType "matrix"}}
-                                                       {{svg "gitea-matrix" 26}}
-                                               {{else if eq .HookType "wechatwork"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-                                               {{else if eq .HookType "packagist"}}
-                                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-                                               {{end}}
+                                               {{template "shared/webhook/icon" .}}
                                        </div>
                                </h4>
                                <div class="ui attached segment">

diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl
index 663fde1528f45908719e86f5419242d182ae96ff..06610a2e55e6315a77ed07d6f1b22a4cf421f010 100644 (file)
--- a/templates/repo/settings/webhook/base_list.tmpl
+++ b/templates/repo/settings/webhook/base_list.tmpl
@@ -5,37 +5,48 @@
                        <div class="ui primary tiny button">{{.locale.Tr "repo.settings.add_webhook"}}</div>
                        <div class="menu">
                                <a class="item" href="{{.BaseLinkNew}}/gitea/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/gitea.svg">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/gogs/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/gogs.ico">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/slack/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/slack.png">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/discord/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/discord.png">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/dingtalk/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/dingtalk.ico">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/telegram/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/telegram.png">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/msteams/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/msteams.png">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/feishu/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/feishu.png">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/matrix/new">
-                                       {{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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/wechatwork/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/wechatwork.png">{{.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"}}
                                </a>
                                <a class="item" href="{{.BaseLinkNew}}/packagist/new">
-                                       <img width="20" height="20" src="{{AssetUrlPrefix}}/img/packagist.png">{{.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"}}
                                </a>
                        </div>
                </div>

diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index 73d6726a575796bf829f0b86130be886cd805abc..1b0474222171cbffe82f2e81269de86509312bcc 100644 (file)
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -3,29 +3,7 @@
                <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">
-                               {{if eq .HookType "gitea"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-                               {{else if eq .HookType "gogs"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-                               {{else if eq .HookType "slack"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-                               {{else if eq .HookType "discord"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-                               {{else if eq .HookType "dingtalk"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-                               {{else if eq .HookType "telegram"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-                               {{else if eq .HookType "msteams"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-                               {{else if eq .HookType "feishu"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-                               {{else if eq .HookType "matrix"}}
-                                       {{svg "gitea-matrix" 26}}
-                               {{else if eq .HookType "wechatwork"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-                               {{else if eq .HookType "packagist"}}
-                                       <img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-                               {{end}}
+                               {{template "shared/webhook/icon" .}}
                        </div>
                </h4>
                <div class="ui attached segment">

diff --git a/templates/shared/webhook/icon.tmpl b/templates/shared/webhook/icon.tmpl
new file mode 100644 (file)
index 0000000..84f9de2
--- /dev/null
+++ b/templates/shared/webhook/icon.tmpl
@@ -0,0 +1,27 @@
+{{$size := 26}}
+{{if .Size}}
+       {{$size = .Size}}
+{{end}}
+{{if eq .HookType "gitea"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gitea.svg">
+{{else if eq .HookType "gogs"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gogs.ico">
+{{else if eq .HookType "slack"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/slack.png">
+{{else if eq .HookType "discord"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/discord.png">
+{{else if eq .HookType "dingtalk"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
+{{else if eq .HookType "telegram"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/telegram.png">
+{{else if eq .HookType "msteams"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/msteams.png">
+{{else if eq .HookType "feishu"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/feishu.png">
+{{else if eq .HookType "matrix"}}
+       {{svg "gitea-matrix" $size "img"}}
+{{else if eq .HookType "wechatwork"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/wechatwork.png">
+{{else if eq .HookType "packagist"}}
+       <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/packagist.png">
+{{end}}

diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index ac32cdd8c8bf0432d57582c64dba358228f003c8..83ae4801b499f723d685701fb0e125aa35173295 100644 (file)
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -4,29 +4,7 @@
                                <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">
-                                       {{if eq .HookType "gitea"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-                                       {{else if eq .HookType "gogs"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-                                       {{else if eq .HookType "slack"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-                                       {{else if eq .HookType "discord"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-                                       {{else if eq .HookType "dingtalk"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-                                       {{else if eq .HookType "telegram"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-                                       {{else if eq .HookType "msteams"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-                                       {{else if eq .HookType "feishu"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-                                       {{else if eq .HookType "matrix"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
-                                       {{else if eq .HookType "wechatwork"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-                                       {{else if eq .HookType "packagist"}}
-                                               <img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-                                       {{end}}
+                                       {{template "shared/webhook/icon" .}}
                                </div>
                        </h4>
                        <div class="ui attached segment">