diff options
| author | Unknwon <u@gogs.io> | 2017-11-18 00:38:46 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-11-18 00:38:46 -0500 |
| commit | 0f14b92bce885a2622a1cdbaa2500ce898995cbf (patch) | |
| tree | cefa9d59834b750ba0f92dc83e95d11f2bdcc3ca | |
| parent | 43d6ad5fda4eb978aeec54b49c5b33a096bb31f4 (diff) | |
MISC: minor fixes in webhook
| -rw-r--r-- | models/webhook.go | 9 | ||||
| -rw-r--r-- | public/css/gogs.css | 3 | ||||
| -rw-r--r-- | public/less/_repository.less | 4 | ||||
| -rw-r--r-- | routes/repo/pull.go | 2 | ||||
| -rw-r--r-- | templates/repo/settings/webhook/list.tmpl | 8 |
5 files changed, 18 insertions, 8 deletions
diff --git a/models/webhook.go b/models/webhook.go index 47052cb3..c37a1a47 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -353,9 +353,10 @@ const ( ) var hookTaskTypes = map[string]HookTaskType{ - "gogs": GOGS, - "slack": SLACK, - "discord": DISCORD, + "gogs": GOGS, + "slack": SLACK, + "discord": DISCORD, + "dingtalk": DINGTALK, } // ToHookTaskType returns HookTaskType by given name. @@ -371,6 +372,8 @@ func (t HookTaskType) Name() string { return "slack" case DISCORD: return "discord" + case DINGTALK: + return "dingtalk" } return "" } diff --git a/public/css/gogs.css b/public/css/gogs.css index c1fc48a2..a9c3249c 100644 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -2399,6 +2399,9 @@ footer .ui.language .menu { .repository.settings.webhooks .types .menu .item { padding: 10px !important; } +.repository.settings.webhooks .logo.item img { + margin-top: -4px; +} .repository.settings.webhook .text.desc { margin-top: 5px; } diff --git a/public/less/_repository.less b/public/less/_repository.less index 7167c4cf..04053c8b 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -1407,6 +1407,10 @@ padding: 10px !important; } } + + .logo.item img { + margin-top: -4px; + } } &.webhook { diff --git a/routes/repo/pull.go b/routes/repo/pull.go index c6652c7f..71199ee2 100644 --- a/routes/repo/pull.go +++ b/routes/repo/pull.go @@ -275,7 +275,7 @@ func ViewPullCommits(c *context.Context) { if c.Written() { return } else if prInfo == nil { - c.Handle(404, "ViewPullCommits", nil) + c.NotFound() return } commits = prInfo.Commits diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl index 4e0a586f..c8c6b378 100644 --- a/templates/repo/settings/webhook/list.tmpl +++ b/templates/repo/settings/webhook/list.tmpl @@ -9,19 +9,19 @@ <div class="menu"> {{range .Types}} {{if eq . "gogs"}} - <a class="item" href="{{$.BaseLink}}/settings/hooks/gogs/new"> + <a class="item logo" href="{{$.BaseLink}}/settings/hooks/gogs/new"> <img class="img-12" src="{{AppSubURL}}/img/favicon.png">Gogs </a> {{else if eq . "slack"}} - <a class="item" href="{{$.BaseLink}}/settings/hooks/slack/new"> + <a class="item logo" href="{{$.BaseLink}}/settings/hooks/slack/new"> <img class="img-12" src="{{AppSubURL}}/img/slack.png">Slack </a> {{else if eq . "discord"}} - <a class="item" href="{{$.BaseLink}}/settings/hooks/discord/new"> + <a class="item logo" href="{{$.BaseLink}}/settings/hooks/discord/new"> <img class="img-12" src="{{AppSubURL}}/img/discord.png">Discord </a> {{else if eq . "dingtalk"}} - <a class="item" href="{{$.BaseLink}}/settings/hooks/dingtalk/new"> + <a class="item logo" href="{{$.BaseLink}}/settings/hooks/dingtalk/new"> <img class="img-12" src="{{AppSubURL}}/img/dingtalk.png">Dingtalk </a> {{end}} |