Skip to content

Extract common code to new template #26903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Sep 5, 2023
Merged

Extract common code to new template #26903

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3df5b76
Extract common code to new template
kerwin612 Sep 5, 2023
f23a14a
Merge branch 'main' into patch-1
kerwin612 Sep 5, 2023
d64d2c2
Update hook_new.tmpl
kerwin612 Sep 5, 2023
8bdc539
Merge branch 'main' into patch-1
KN4CK3R Sep 5, 2023
ee74fef
Update hook_new.tmpl
KN4CK3R Sep 5, 2023
4fd22c3
Update new.tmpl
KN4CK3R Sep 5, 2023
64a935a
Update hook_new.tmpl
KN4CK3R Sep 5, 2023
da64219
Update new.tmpl
KN4CK3R Sep 5, 2023
1d12224
Merge branch 'main' into patch-1
GiteaBot Sep 5, 2023
f4fcff0
Merge branch 'main' into patch-1
GiteaBot Sep 5, 2023
980f701
Merge branch 'main' into patch-1
GiteaBot Sep 5, 2023
ffb8d44
Merge branch 'main' into patch-1
GiteaBot Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions templates/org/settings/hook_new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
<div class="org-setting-content">
<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">
{{template "shared/webhook/icon" .}}
</div>
</h4>
<div class="ui attached segment">
{{template "repo/settings/webhook/gitea" .}}
{{template "repo/settings/webhook/gogs" .}}
{{template "repo/settings/webhook/slack" .}}
{{template "repo/settings/webhook/discord" .}}
{{template "repo/settings/webhook/dingtalk" .}}
{{template "repo/settings/webhook/telegram" .}}
{{template "repo/settings/webhook/msteams" .}}
{{template "repo/settings/webhook/feishu" .}}
{{template "repo/settings/webhook/matrix" .}}
{{template "repo/settings/webhook/wechatwork" .}}
{{template "repo/settings/webhook/packagist" .}}
</div>

{{template "repo/settings/webhook/history" .}}
</div>

<div class="org-setting-content">
{{template "webhook/new" .}}
</div>
{{template "org/settings/layout_footer" .}}

27 changes: 4 additions & 23 deletions templates/repo/settings/webhook/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings new webhook")}}
<div class="repo-setting-content">
<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">
{{template "shared/webhook/icon" .}}
</div>
</h4>
<div class="ui attached segment">
{{template "repo/settings/webhook/gitea" .}}
{{template "repo/settings/webhook/gogs" .}}
{{template "repo/settings/webhook/slack" .}}
{{template "repo/settings/webhook/discord" .}}
{{template "repo/settings/webhook/dingtalk" .}}
{{template "repo/settings/webhook/telegram" .}}
{{template "repo/settings/webhook/msteams" .}}
{{template "repo/settings/webhook/feishu" .}}
{{template "repo/settings/webhook/matrix" .}}
{{template "repo/settings/webhook/wechatwork" .}}
{{template "repo/settings/webhook/packagist" .}}
</div>

{{template "repo/settings/webhook/history" .}}
</div>
<div class="repo-setting-content">
{{template "webhook/new" .}}
</div>
{{template "repo/settings/layout_footer" .}}

31 changes: 6 additions & 25 deletions templates/user/settings/hook_new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
<div class="user-setting-content">
<div class="user-setting-content">
<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">
{{template "shared/webhook/icon" .}}
</div>
</h4>
<div class="ui attached segment">
{{template "repo/settings/webhook/gitea" .}}
{{template "repo/settings/webhook/gogs" .}}
{{template "repo/settings/webhook/slack" .}}
{{template "repo/settings/webhook/discord" .}}
{{template "repo/settings/webhook/dingtalk" .}}
{{template "repo/settings/webhook/telegram" .}}
{{template "repo/settings/webhook/msteams" .}}
{{template "repo/settings/webhook/feishu" .}}
{{template "repo/settings/webhook/matrix" .}}
{{template "repo/settings/webhook/wechatwork" .}}
{{template "repo/settings/webhook/packagist" .}}
</div>

{{template "repo/settings/webhook/history" .}}
</div>
</div>
<div class="user-setting-content">
<div class="user-setting-content">
{{template "webhook/new" .}}
</div>
</div>
{{template "user/settings/layout_footer" .}}

21 changes: 21 additions & 0 deletions templates/webhook/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<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">
{{template "shared/webhook/icon" .}}
</div>
</h4>
<div class="ui attached segment">
{{template "repo/settings/webhook/gitea" .}}
{{template "repo/settings/webhook/gogs" .}}
{{template "repo/settings/webhook/slack" .}}
{{template "repo/settings/webhook/discord" .}}
{{template "repo/settings/webhook/dingtalk" .}}
{{template "repo/settings/webhook/telegram" .}}
{{template "repo/settings/webhook/msteams" .}}
{{template "repo/settings/webhook/feishu" .}}
{{template "repo/settings/webhook/matrix" .}}
{{template "repo/settings/webhook/wechatwork" .}}
{{template "repo/settings/webhook/packagist" .}}
</div>
{{template "repo/settings/webhook/history" .}}