diff options
author | Tim-Nicas Oelschläger <72873130+zokkis@users.noreply.github.com> | 2024-02-15 14:59:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-15 14:59:48 +0100 |
commit | 374e886f5113a996e1e927a60d1775e77262c364 (patch) | |
tree | 2ccc171cb3f4efc300e7ecab78dfd27627c08b73 | |
parent | 542480a9b0d5cdb497dbfa99752d59fd016df0d6 (diff) | |
download | gitea-374e886f5113a996e1e927a60d1775e77262c364.tar.gz gitea-374e886f5113a996e1e927a60d1775e77262c364.zip |
Change webhook-type in create-view (#29114)
It's now possible to change webhook-type in create-view.
before:
![image](https://github.com/go-gitea/gitea/assets/72873130/9ee1b9fb-843b-4f28-b8d6-6361e5d184f1)
after:
![image](https://github.com/go-gitea/gitea/assets/72873130/9dbf058f-5912-43af-9acd-487271212f2d)
---------
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
-rw-r--r-- | routers/web/repo/setting/webhook.go | 1 | ||||
-rw-r--r-- | templates/repo/settings/webhook/base_list.tmpl | 47 | ||||
-rw-r--r-- | templates/repo/settings/webhook/link_menu.tmpl | 50 | ||||
-rw-r--r-- | templates/shared/webhook/icon.tmpl | 2 | ||||
-rw-r--r-- | templates/webhook/new.tmpl | 9 | ||||
-rw-r--r-- | web_src/css/base.css | 7 |
6 files changed, 67 insertions, 49 deletions
diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index ab3c70006f..c12d7e82a6 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -151,6 +151,7 @@ func WebhooksNew(ctx *context.Context) { } } ctx.Data["BaseLink"] = orCtx.LinkNew + ctx.Data["BaseLinkNew"] = orCtx.LinkNew ctx.HTML(http.StatusOK, orCtx.NewTemplate) } diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index ed6e670d60..5a3fc0e7b8 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -3,52 +3,7 @@ <div class="ui right"> <div class="ui jump dropdown"> <div class="ui primary tiny button">{{ctx.Locale.Tr "repo.settings.add_webhook"}}</div> - <div class="menu"> - <a class="item" href="{{.BaseLinkNew}}/gitea/new"> - {{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/gogs/new"> - {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/slack/new"> - {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/discord/new"> - {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/dingtalk/new"> - {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/telegram/new"> - {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/msteams/new"> - {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/feishu/new"> - {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/matrix/new"> - {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/wechatwork/new"> - {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} - </a> - <a class="item" href="{{.BaseLinkNew}}/packagist/new"> - {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" 20)}} - {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} - </a> - </div> + {{template "repo/settings/webhook/link_menu" .}} </div> </div> </h4> diff --git a/templates/repo/settings/webhook/link_menu.tmpl b/templates/repo/settings/webhook/link_menu.tmpl new file mode 100644 index 0000000000..e2c86dcc3c --- /dev/null +++ b/templates/repo/settings/webhook/link_menu.tmpl @@ -0,0 +1,50 @@ +{{$size := 20}} +{{if .Size}} + {{$size = .Size}} +{{end}} +<div class="menu"> + <a class="item" href="{{.BaseLinkNew}}/gitea/new"> + {{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gitea"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/gogs/new"> + {{template "shared/webhook/icon" (dict "HookType" "gogs" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_gogs"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/slack/new"> + {{template "shared/webhook/icon" (dict "HookType" "slack" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_slack"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/discord/new"> + {{template "shared/webhook/icon" (dict "HookType" "discord" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_discord"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/dingtalk/new"> + {{template "shared/webhook/icon" (dict "HookType" "dingtalk" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_dingtalk"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/telegram/new"> + {{template "shared/webhook/icon" (dict "HookType" "telegram" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_telegram"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/msteams/new"> + {{template "shared/webhook/icon" (dict "HookType" "msteams" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_msteams"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/feishu/new"> + {{template "shared/webhook/icon" (dict "HookType" "feishu" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/matrix/new"> + {{template "shared/webhook/icon" (dict "HookType" "matrix" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_matrix"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/wechatwork/new"> + {{template "shared/webhook/icon" (dict "HookType" "wechatwork" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_wechatwork"}} + </a> + <a class="item" href="{{.BaseLinkNew}}/packagist/new"> + {{template "shared/webhook/icon" (dict "HookType" "packagist" "Size" $size)}} + {{ctx.Locale.Tr "repo.settings.web_hook_name_packagist"}} + </a> +</div> diff --git a/templates/shared/webhook/icon.tmpl b/templates/shared/webhook/icon.tmpl index 84f9de266f..0f80787c57 100644 --- a/templates/shared/webhook/icon.tmpl +++ b/templates/shared/webhook/icon.tmpl @@ -3,7 +3,7 @@ {{$size = .Size}} {{end}} {{if eq .HookType "gitea"}} - <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gitea.svg"> + {{svg "gitea-gitea" $size "img"}} {{else if eq .HookType "gogs"}} <img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gogs.ico"> {{else if eq .HookType "slack"}} diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl index a185c42b51..305133c03a 100644 --- a/templates/webhook/new.tmpl +++ b/templates/webhook/new.tmpl @@ -1,7 +1,12 @@ <h4 class="ui top attached header"> {{.CustomHeaderTitle}} - <div class="ui right"> - {{template "shared/webhook/icon" .ctxData}} + <div class="ui right type dropdown"> + <div class="text gt-df gt-ac"> + {{template "shared/webhook/icon" (dict "Size" 20 "HookType" .ctxData.HookType)}} + {{ctx.Locale.Tr (print "repo.settings.web_hook_name_" .ctxData.HookType)}} + </div> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{template "repo/settings/webhook/link_menu" .ctxData}} </div> </h4> <div class="ui attached segment"> diff --git a/web_src/css/base.css b/web_src/css/base.css index ea32aac6f7..0d547f16ff 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -413,6 +413,13 @@ ol.ui.list li, color: var(--color-text-light-2); } +/* extend fomantic style '.ui.dropdown > .text > img' to include svg.img */ +.ui.dropdown > .text > .img { + margin-left: 0; + float: none; + margin-right: 0.78571429rem; +} + .ui.dropdown > .text > .description, .ui.dropdown .menu > .item > .description { color: var(--color-text-light-2); |