diff options
| author | Lauris BH <lauris@nix.lv> | 2021-01-15 01:24:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 01:24:03 +0200 |
| commit | 6eee9f0f4e56e620b2eacfc9c2b59c6448308290 (patch) | |
| tree | 8aa10ddcc6c7ae19ce0e6f28edff93a16949058a /templates/admin | |
| parent | 84b147c7f0c2575723d3471783cb24078232fe7a (diff) | |
| download | gitea-6eee9f0f4e56e620b2eacfc9c2b59c6448308290.tar.gz gitea-6eee9f0f4e56e620b2eacfc9c2b59c6448308290.zip | |
Merge default and system webhooks under one menu (#14244)
Diffstat (limited to 'templates/admin')
| -rw-r--r-- | templates/admin/hook_new.tmpl | 10 | ||||
| -rw-r--r-- | templates/admin/hooks.tmpl | 7 | ||||
| -rw-r--r-- | templates/admin/navbar.tmpl | 5 |
3 files changed, 14 insertions, 8 deletions
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index c6f02ee20e..9b251ec4cb 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -4,10 +4,14 @@ <div class="ui container"> {{template "base/alert" .}} <h4 class="ui top attached header"> - {{if .PageIsAdminHooksNew}} - {{.i18n.Tr "admin.hooks.add_webhook"}} + {{if .PageIsAdminDefaultHooksNew}} + {{.i18n.Tr "admin.defaulthooks.add_webhook"}} + {{else if .PageIsAdminSystemHooksNew}} + {{.i18n.Tr "admin.systemhooks.add_webhook"}} + {{else if .Webhook.IsSystemWebhook}} + {{.i18n.Tr "admin.systemhooks.update_webhook"}} {{else}} - {{.i18n.Tr "admin.hooks.update_webhook"}} + {{.i18n.Tr "admin.defaulthooks.update_webhook"}} {{end}} <div class="ui right"> {{if eq .HookType "gitea"}} diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl index c09c6fcafe..a23cff4342 100644 --- a/templates/admin/hooks.tmpl +++ b/templates/admin/hooks.tmpl @@ -2,7 +2,12 @@ <div class="page-content admin hooks"> {{template "admin/navbar" .}} <div class="ui container"> - {{template "repo/settings/webhook/list" .}} + {{template "base/alert" .}} + + {{template "repo/settings/webhook/base_list" .SystemWebhooks}} + {{template "repo/settings/webhook/base_list" .DefaultWebhooks}} + + {{template "repo/settings/webhook/delete_modal" .}} </div> </div> {{template "base/footer" .}} diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 8c895b8c27..953076d808 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -12,12 +12,9 @@ <a class="{{if .PageIsAdminRepositories}}active{{end}} item" href="{{AppSubUrl}}/admin/repos"> {{.i18n.Tr "admin.repositories"}} </a> - <a class="{{if .PageIsAdminHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/hooks"> + <a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/hooks"> {{.i18n.Tr "admin.hooks"}} </a> - <a class="{{if .PageIsAdminSystemHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/system-hooks"> - {{.i18n.Tr "admin.systemhooks"}} - </a> <a class="{{if .PageIsAdminAuthentications}}active{{end}} item" href="{{AppSubUrl}}/admin/auths"> {{.i18n.Tr "admin.authentication"}} </a> |