Skip to content

Commit 2517da9

Browse files
GiteaBotsilverwind
GiteaBot
and
silverwind
authored
Use shared template for webhook icons (#26242) (#26246)
Backport #26242 by @silverwind Fixes: #26241 Co-authored-by: silverwind <me@silverwind.io>
1 parent 0600269 commit 2517da9

File tree

6 files changed

+53
-103
lines changed

6 files changed

+53
-103
lines changed

‎templates/admin/hook_new.tmpl

+1-23
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,7 @@
1111
{{.locale.Tr "admin.defaulthooks.update_webhook"}}
1212
{{end}}
1313
<div class="ui right">
14-
{{if eq .HookType "gitea"}}
15-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
16-
{{else if eq .HookType "gogs"}}
17-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
18-
{{else if eq .HookType "slack"}}
19-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
20-
{{else if eq .HookType "discord"}}
21-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
22-
{{else if eq .HookType "dingtalk"}}
23-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
24-
{{else if eq .HookType "telegram"}}
25-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
26-
{{else if eq .HookType "msteams"}}
27-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
28-
{{else if eq .HookType "feishu"}}
29-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
30-
{{else if eq .HookType "matrix"}}
31-
{{svg "gitea-matrix" 26}}
32-
{{else if eq .HookType "wechatwork"}}
33-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
34-
{{else if eq .HookType "packagist"}}
35-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
36-
{{end}}
14+
{{template "shared/webhook/icon" .}}
3715
</div>
3816
</h4>
3917
<div class="ui attached segment">

‎templates/org/settings/hook_new.tmpl

+1-23
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,7 @@
33
<h4 class="ui top attached header">
44
{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
55
<div class="ui right">
6-
{{if eq .HookType "gitea"}}
7-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
8-
{{else if eq .HookType "gogs"}}
9-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
10-
{{else if eq .HookType "slack"}}
11-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
12-
{{else if eq .HookType "discord"}}
13-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
14-
{{else if eq .HookType "dingtalk"}}
15-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
16-
{{else if eq .HookType "telegram"}}
17-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
18-
{{else if eq .HookType "msteams"}}
19-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
20-
{{else if eq .HookType "feishu"}}
21-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
22-
{{else if eq .HookType "matrix"}}
23-
{{svg "gitea-matrix" 26}}
24-
{{else if eq .HookType "wechatwork"}}
25-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
26-
{{else if eq .HookType "packagist"}}
27-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
28-
{{end}}
6+
{{template "shared/webhook/icon" .}}
297
</div>
308
</h4>
319
<div class="ui attached segment">

‎templates/repo/settings/webhook/base_list.tmpl

+22-11
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,48 @@
55
<div class="ui primary tiny button">{{.locale.Tr "repo.settings.add_webhook"}}</div>
66
<div class="menu">
77
<a class="item" href="{{.BaseLinkNew}}/gitea/new">
8-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gitea.svg">{{.locale.Tr "repo.settings.web_hook_name_gitea"}}
8+
{{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}}
9+
{{.locale.Tr "repo.settings.web_hook_name_gitea"}}
910
</a>
1011
<a class="item" href="{{.BaseLinkNew}}/gogs/new">
11-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gogs.ico">{{.locale.Tr "repo.settings.web_hook_name_gogs"}}
12+
{{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" 20)}}
13+
{{.locale.Tr "repo.settings.web_hook_name_gogs"}}
1214
</a>
1315
<a class="item" href="{{.BaseLinkNew}}/slack/new">
14-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/slack.png">{{.locale.Tr "repo.settings.web_hook_name_slack"}}
16+
{{template "shared/webhook/icon" (dict "HookType" "slack" "Size" 20)}}
17+
{{.locale.Tr "repo.settings.web_hook_name_slack"}}
1518
</a>
1619
<a class="item" href="{{.BaseLinkNew}}/discord/new">
17-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/discord.png">{{.locale.Tr "repo.settings.web_hook_name_discord"}}
20+
{{template "shared/webhook/icon" (dict "HookType" "discord" "Size" 20)}}
21+
{{.locale.Tr "repo.settings.web_hook_name_discord"}}
1822
</a>
1923
<a class="item" href="{{.BaseLinkNew}}/dingtalk/new">
20-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/dingtalk.ico">{{.locale.Tr "repo.settings.web_hook_name_dingtalk"}}
24+
{{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" 20)}}
25+
{{.locale.Tr "repo.settings.web_hook_name_dingtalk"}}
2126
</a>
2227
<a class="item" href="{{.BaseLinkNew}}/telegram/new">
23-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/telegram.png">{{.locale.Tr "repo.settings.web_hook_name_telegram"}}
28+
{{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" 20)}}
29+
{{.locale.Tr "repo.settings.web_hook_name_telegram"}}
2430
</a>
2531
<a class="item" href="{{.BaseLinkNew}}/msteams/new">
26-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/msteams.png">{{.locale.Tr "repo.settings.web_hook_name_msteams"}}
32+
{{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" 20)}}
33+
{{.locale.Tr "repo.settings.web_hook_name_msteams"}}
2734
</a>
2835
<a class="item" href="{{.BaseLinkNew}}/feishu/new">
29-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/feishu.png">{{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}}
36+
{{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" 20)}}
37+
{{.locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}}
3038
</a>
3139
<a class="item" href="{{.BaseLinkNew}}/matrix/new">
32-
{{svg "gitea-matrix" 20 "img"}}{{.locale.Tr "repo.settings.web_hook_name_matrix"}}
40+
{{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" 20)}}
41+
{{.locale.Tr "repo.settings.web_hook_name_matrix"}}
3342
</a>
3443
<a class="item" href="{{.BaseLinkNew}}/wechatwork/new">
35-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/wechatwork.png">{{.locale.Tr "repo.settings.web_hook_name_wechatwork"}}
44+
{{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" 20)}}
45+
{{.locale.Tr "repo.settings.web_hook_name_wechatwork"}}
3646
</a>
3747
<a class="item" href="{{.BaseLinkNew}}/packagist/new">
38-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/packagist.png">{{.locale.Tr "repo.settings.web_hook_name_packagist"}}
48+
{{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" 20)}}
49+
{{.locale.Tr "repo.settings.web_hook_name_packagist"}}
3950
</a>
4051
</div>
4152
</div>

‎templates/repo/settings/webhook/new.tmpl

+1-23
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,7 @@
33
<h4 class="ui top attached header">
44
{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
55
<div class="ui right">
6-
{{if eq .HookType "gitea"}}
7-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
8-
{{else if eq .HookType "gogs"}}
9-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
10-
{{else if eq .HookType "slack"}}
11-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
12-
{{else if eq .HookType "discord"}}
13-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
14-
{{else if eq .HookType "dingtalk"}}
15-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
16-
{{else if eq .HookType "telegram"}}
17-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
18-
{{else if eq .HookType "msteams"}}
19-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
20-
{{else if eq .HookType "feishu"}}
21-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
22-
{{else if eq .HookType "matrix"}}
23-
{{svg "gitea-matrix" 26}}
24-
{{else if eq .HookType "wechatwork"}}
25-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
26-
{{else if eq .HookType "packagist"}}
27-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
28-
{{end}}
6+
{{template "shared/webhook/icon" .}}
297
</div>
308
</h4>
319
<div class="ui attached segment">

‎templates/shared/webhook/icon.tmpl

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{{$size := 26}}
2+
{{if .Size}}
3+
{{$size = .Size}}
4+
{{end}}
5+
{{if eq .HookType "gitea"}}
6+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gitea.svg">
7+
{{else if eq .HookType "gogs"}}
8+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gogs.ico">
9+
{{else if eq .HookType "slack"}}
10+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/slack.png">
11+
{{else if eq .HookType "discord"}}
12+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/discord.png">
13+
{{else if eq .HookType "dingtalk"}}
14+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
15+
{{else if eq .HookType "telegram"}}
16+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/telegram.png">
17+
{{else if eq .HookType "msteams"}}
18+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/msteams.png">
19+
{{else if eq .HookType "feishu"}}
20+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/feishu.png">
21+
{{else if eq .HookType "matrix"}}
22+
{{svg "gitea-matrix" $size "img"}}
23+
{{else if eq .HookType "wechatwork"}}
24+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/wechatwork.png">
25+
{{else if eq .HookType "packagist"}}
26+
<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/packagist.png">
27+
{{end}}

‎templates/user/settings/hook_new.tmpl

+1-23
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,7 @@
44
<h4 class="ui top attached header">
55
{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
66
<div class="ui right">
7-
{{if eq .HookType "gitea"}}
8-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
9-
{{else if eq .HookType "gogs"}}
10-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
11-
{{else if eq .HookType "slack"}}
12-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
13-
{{else if eq .HookType "discord"}}
14-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
15-
{{else if eq .HookType "dingtalk"}}
16-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
17-
{{else if eq .HookType "telegram"}}
18-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
19-
{{else if eq .HookType "msteams"}}
20-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
21-
{{else if eq .HookType "feishu"}}
22-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
23-
{{else if eq .HookType "matrix"}}
24-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
25-
{{else if eq .HookType "wechatwork"}}
26-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
27-
{{else if eq .HookType "packagist"}}
28-
<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
29-
{{end}}
7+
{{template "shared/webhook/icon" .}}
308
</div>
319
</h4>
3210
<div class="ui attached segment">

0 commit comments

Comments
 (0)