From 4e64e71e28dcfb9ef41d7cbc63ff1474ad8e5126 Mon Sep 17 00:00:00 2001
From: Unknwon
Date: Thu, 16 Mar 2017 15:50:18 -0400
Subject: templates/repo/webhook: move to its own directory
---
routers/repo/webhook.go | 4 +-
templates/org/settings/webhook_new.tmpl | 8 +-
templates/org/settings/webhooks.tmpl | 2 +-
templates/repo/settings/webhook/base.tmpl | 11 ++
templates/repo/settings/webhook/delete_modal.tmpl | 19 ++++
templates/repo/settings/webhook/discord.tmpl | 24 +++++
templates/repo/settings/webhook/gogs.tmpl | 29 +++++
templates/repo/settings/webhook/history.tmpl | 73 +++++++++++++
templates/repo/settings/webhook/list.tmpl | 55 ++++++++++
templates/repo/settings/webhook/new.tmpl | 30 ++++++
templates/repo/settings/webhook/settings.tmpl | 126 ++++++++++++++++++++++
templates/repo/settings/webhook/slack.tmpl | 28 +++++
templates/repo/settings/webhook_delete_modal.tmpl | 19 ----
templates/repo/settings/webhook_discord.tmpl | 24 -----
templates/repo/settings/webhook_gogs.tmpl | 29 -----
templates/repo/settings/webhook_history.tmpl | 73 -------------
templates/repo/settings/webhook_list.tmpl | 55 ----------
templates/repo/settings/webhook_new.tmpl | 30 ------
templates/repo/settings/webhook_settings.tmpl | 126 ----------------------
templates/repo/settings/webhook_slack.tmpl | 28 -----
templates/repo/settings/webhooks.tmpl | 11 --
21 files changed, 402 insertions(+), 402 deletions(-)
create mode 100644 templates/repo/settings/webhook/base.tmpl
create mode 100644 templates/repo/settings/webhook/delete_modal.tmpl
create mode 100644 templates/repo/settings/webhook/discord.tmpl
create mode 100644 templates/repo/settings/webhook/gogs.tmpl
create mode 100644 templates/repo/settings/webhook/history.tmpl
create mode 100644 templates/repo/settings/webhook/list.tmpl
create mode 100644 templates/repo/settings/webhook/new.tmpl
create mode 100644 templates/repo/settings/webhook/settings.tmpl
create mode 100644 templates/repo/settings/webhook/slack.tmpl
delete mode 100644 templates/repo/settings/webhook_delete_modal.tmpl
delete mode 100644 templates/repo/settings/webhook_discord.tmpl
delete mode 100644 templates/repo/settings/webhook_gogs.tmpl
delete mode 100644 templates/repo/settings/webhook_history.tmpl
delete mode 100644 templates/repo/settings/webhook_list.tmpl
delete mode 100644 templates/repo/settings/webhook_new.tmpl
delete mode 100644 templates/repo/settings/webhook_settings.tmpl
delete mode 100644 templates/repo/settings/webhook_slack.tmpl
delete mode 100644 templates/repo/settings/webhooks.tmpl
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index 6ea4548d..506acec7 100644
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -23,8 +23,8 @@ import (
)
const (
- WEBHOOKS base.TplName = "repo/settings/webhooks"
- WEBHOOK_NEW base.TplName = "repo/settings/webhook_new"
+ WEBHOOKS base.TplName = "repo/settings/webhook/base"
+ WEBHOOK_NEW base.TplName = "repo/settings/webhook/new"
ORG_WEBHOOK_NEW base.TplName = "org/settings/webhook_new"
)
diff --git a/templates/org/settings/webhook_new.tmpl b/templates/org/settings/webhook_new.tmpl
index fddfb87e..d9a6b156 100644
--- a/templates/org/settings/webhook_new.tmpl
+++ b/templates/org/settings/webhook_new.tmpl
@@ -17,12 +17,12 @@
- {{template "repo/settings/webhook_gogs" .}}
- {{template "repo/settings/webhook_slack" .}}
- {{template "repo/settings/webhook_discord" .}}
+ {{template "repo/settings/webhook/gogs" .}}
+ {{template "repo/settings/webhook/slack" .}}
+ {{template "repo/settings/webhook/discord" .}}
- {{template "repo/settings/webhook_history" .}}
+ {{template "repo/settings/webhook/history" .}}
diff --git a/templates/org/settings/webhooks.tmpl b/templates/org/settings/webhooks.tmpl
index 0d32f95b..283a0600 100644
--- a/templates/org/settings/webhooks.tmpl
+++ b/templates/org/settings/webhooks.tmpl
@@ -4,7 +4,7 @@
{{template "org/settings/navbar" .}}
- {{template "repo/settings/webhook_list" .}}
+ {{template "repo/settings/webhook/list" .}}
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
new file mode 100644
index 00000000..b45a6222
--- /dev/null
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -0,0 +1,11 @@
+{{template "base/head" .}}
+
+ {{template "repo/header" .}}
+
+
+ {{template "repo/settings/navbar" .}}
+ {{template "repo/settings/webhook/list" .}}
+
+
+
+{{template "base/footer" .}}
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
new file mode 100644
index 00000000..2a2a7c8d
--- /dev/null
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -0,0 +1,19 @@
+
+
+
+
{{.i18n.Tr "repo.settings.webhook_deletion_desc"}}
+
+
+
+
+ {{.i18n.Tr "modal.no"}}
+
+
+
+ {{.i18n.Tr "modal.yes"}}
+
+
+
diff --git a/templates/repo/settings/webhook/discord.tmpl b/templates/repo/settings/webhook/discord.tmpl
new file mode 100644
index 00000000..e1253b97
--- /dev/null
+++ b/templates/repo/settings/webhook/discord.tmpl
@@ -0,0 +1,24 @@
+{{if eq .HookType "discord"}}
+ {{.i18n.Tr "repo.settings.add_discord_hook_desc" "https://discordapp.com/" | Str2html}}
+
+{{end}}
diff --git a/templates/repo/settings/webhook/gogs.tmpl b/templates/repo/settings/webhook/gogs.tmpl
new file mode 100644
index 00000000..368f3a22
--- /dev/null
+++ b/templates/repo/settings/webhook/gogs.tmpl
@@ -0,0 +1,29 @@
+{{if eq .HookType "gogs"}}
+ {{.i18n.Tr "repo.settings.add_webhook_desc" "https://gogs.io/docs/features/webhook.html" | Str2html}}
+
+{{end}}
diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl
new file mode 100644
index 00000000..b41fefaf
--- /dev/null
+++ b/templates/repo/settings/webhook/history.tmpl
@@ -0,0 +1,73 @@
+{{if .PageIsSettingsHooksEdit}}
+
+
+
+ {{range .History}}
+
+
+
+
+
+ {{if .RequestInfo}}
+
{{$.i18n.Tr "repo.settings.webhook.headers"}}
+
Request URL: {{.URL}}
+Request method: POST
+{{ range $key, $val := .RequestInfo.Headers }}{{$key}}: {{$val}}
+{{end}}
+
{{$.i18n.Tr "repo.settings.webhook.payload"}}
+
{{.PayloadContent}}
+ {{else}}
+ N/A
+ {{end}}
+
+
+ {{if .ResponseInfo}}
+
{{$.i18n.Tr "repo.settings.webhook.headers"}}
+
{{ range $key, $val := .ResponseInfo.Headers }}{{$key}}: {{$val}}
+{{end}}
+
{{$.i18n.Tr "repo.settings.webhook.body"}}
+
{{.ResponseInfo.Body}}
+ {{else}}
+ N/A
+ {{end}}
+
+
+
+ {{end}}
+
+
+{{end}}
diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl
new file mode 100644
index 00000000..3599172d
--- /dev/null
+++ b/templates/repo/settings/webhook/list.tmpl
@@ -0,0 +1,55 @@
+
+ {{template "base/alert" .}}
+
+
+
+
+ {{.Description | Str2html}}
+
+ {{range .Webhooks}}
+
+ {{if eq .LastStatus 1}}
+
+ {{else if eq .LastStatus 2}}
+
+ {{else}}
+
+ {{end}}
+
{{.URL}}
+
+
+ {{end}}
+
+
+
+
+{{template "repo/settings/webhook/delete_modal" .}}
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
new file mode 100644
index 00000000..f7e23631
--- /dev/null
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -0,0 +1,30 @@
+{{template "base/head" .}}
+
+ {{template "repo/header" .}}
+
+
+ {{template "repo/settings/navbar" .}}
+
+ {{template "base/alert" .}}
+
+
+ {{template "repo/settings/webhook/gogs" .}}
+ {{template "repo/settings/webhook/slack" .}}
+ {{template "repo/settings/webhook/discord" .}}
+
+
+ {{template "repo/settings/webhook/history" .}}
+
+
+
+
+{{template "base/footer" .}}
diff --git a/templates/repo/settings/webhook/settings.tmpl b/templates/repo/settings/webhook/settings.tmpl
new file mode 100644
index 00000000..2e57338d
--- /dev/null
+++ b/templates/repo/settings/webhook/settings.tmpl
@@ -0,0 +1,126 @@
+
+
{{.i18n.Tr "repo.settings.event_desc"}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_create_desc"}}
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_delete_desc"}}
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_fork_desc"}}
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_push_desc"}}
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_issues_desc"}}
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_issue_comment_desc"}}
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_pull_request_desc"}}
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.event_release_desc"}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.active_helper"}}
+
+
+
+
+{{template "repo/settings/webhook/delete_modal" .}}
diff --git a/templates/repo/settings/webhook/slack.tmpl b/templates/repo/settings/webhook/slack.tmpl
new file mode 100644
index 00000000..63255f2b
--- /dev/null
+++ b/templates/repo/settings/webhook/slack.tmpl
@@ -0,0 +1,28 @@
+{{if eq .HookType "slack"}}
+ {{.i18n.Tr "repo.settings.add_slack_hook_desc" "https://slack.com" | Str2html}}
+
+{{end}}
diff --git a/templates/repo/settings/webhook_delete_modal.tmpl b/templates/repo/settings/webhook_delete_modal.tmpl
deleted file mode 100644
index 2a2a7c8d..00000000
--- a/templates/repo/settings/webhook_delete_modal.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
{{.i18n.Tr "repo.settings.webhook_deletion_desc"}}
-
-
-
-
- {{.i18n.Tr "modal.no"}}
-
-
-
- {{.i18n.Tr "modal.yes"}}
-
-
-
diff --git a/templates/repo/settings/webhook_discord.tmpl b/templates/repo/settings/webhook_discord.tmpl
deleted file mode 100644
index bcf184b1..00000000
--- a/templates/repo/settings/webhook_discord.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{{if eq .HookType "discord"}}
- {{.i18n.Tr "repo.settings.add_discord_hook_desc" "https://discordapp.com/" | Str2html}}
-
-{{end}}
diff --git a/templates/repo/settings/webhook_gogs.tmpl b/templates/repo/settings/webhook_gogs.tmpl
deleted file mode 100644
index baf0f9e0..00000000
--- a/templates/repo/settings/webhook_gogs.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-{{if eq .HookType "gogs"}}
- {{.i18n.Tr "repo.settings.add_webhook_desc" "https://gogs.io/docs/features/webhook.html" | Str2html}}
-
-{{end}}
diff --git a/templates/repo/settings/webhook_history.tmpl b/templates/repo/settings/webhook_history.tmpl
deleted file mode 100644
index b41fefaf..00000000
--- a/templates/repo/settings/webhook_history.tmpl
+++ /dev/null
@@ -1,73 +0,0 @@
-{{if .PageIsSettingsHooksEdit}}
-
-
-
- {{range .History}}
-
-
-
-
-
- {{if .RequestInfo}}
-
{{$.i18n.Tr "repo.settings.webhook.headers"}}
-
Request URL: {{.URL}}
-Request method: POST
-{{ range $key, $val := .RequestInfo.Headers }}{{$key}}: {{$val}}
-{{end}}
-
{{$.i18n.Tr "repo.settings.webhook.payload"}}
-
{{.PayloadContent}}
- {{else}}
- N/A
- {{end}}
-
-
- {{if .ResponseInfo}}
-
{{$.i18n.Tr "repo.settings.webhook.headers"}}
-
{{ range $key, $val := .ResponseInfo.Headers }}{{$key}}: {{$val}}
-{{end}}
-
{{$.i18n.Tr "repo.settings.webhook.body"}}
-
{{.ResponseInfo.Body}}
- {{else}}
- N/A
- {{end}}
-
-
-
- {{end}}
-
-
-{{end}}
diff --git a/templates/repo/settings/webhook_list.tmpl b/templates/repo/settings/webhook_list.tmpl
deleted file mode 100644
index 9fbd0032..00000000
--- a/templates/repo/settings/webhook_list.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-
- {{template "base/alert" .}}
-
-
-
-
- {{.Description | Str2html}}
-
- {{range .Webhooks}}
-
- {{if eq .LastStatus 1}}
-
- {{else if eq .LastStatus 2}}
-
- {{else}}
-
- {{end}}
-
{{.URL}}
-
-
- {{end}}
-
-
-
-
-{{template "repo/settings/webhook_delete_modal" .}}
diff --git a/templates/repo/settings/webhook_new.tmpl b/templates/repo/settings/webhook_new.tmpl
deleted file mode 100644
index a2a420a4..00000000
--- a/templates/repo/settings/webhook_new.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{template "base/head" .}}
-
- {{template "repo/header" .}}
-
-
- {{template "repo/settings/navbar" .}}
-
- {{template "base/alert" .}}
-
-
- {{template "repo/settings/webhook_gogs" .}}
- {{template "repo/settings/webhook_slack" .}}
- {{template "repo/settings/webhook_discord" .}}
-
-
- {{template "repo/settings/webhook_history" .}}
-
-
-
-
-{{template "base/footer" .}}
diff --git a/templates/repo/settings/webhook_settings.tmpl b/templates/repo/settings/webhook_settings.tmpl
deleted file mode 100644
index 235d73c3..00000000
--- a/templates/repo/settings/webhook_settings.tmpl
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
{{.i18n.Tr "repo.settings.event_desc"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_create_desc"}}
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_delete_desc"}}
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_fork_desc"}}
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_push_desc"}}
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_issues_desc"}}
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_issue_comment_desc"}}
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_pull_request_desc"}}
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.event_release_desc"}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{.i18n.Tr "repo.settings.active_helper"}}
-
-
-
-
-{{template "repo/settings/webhook_delete_modal" .}}
diff --git a/templates/repo/settings/webhook_slack.tmpl b/templates/repo/settings/webhook_slack.tmpl
deleted file mode 100644
index 5a68d823..00000000
--- a/templates/repo/settings/webhook_slack.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{if eq .HookType "slack"}}
- {{.i18n.Tr "repo.settings.add_slack_hook_desc" "https://slack.com" | Str2html}}
-
-{{end}}
diff --git a/templates/repo/settings/webhooks.tmpl b/templates/repo/settings/webhooks.tmpl
deleted file mode 100644
index fd3ea349..00000000
--- a/templates/repo/settings/webhooks.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{template "base/head" .}}
-
- {{template "repo/header" .}}
-
-
- {{template "repo/settings/navbar" .}}
- {{template "repo/settings/webhook_list" .}}
-
-
-
-{{template "base/footer" .}}
--
cgit v1.2.3