diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 8f1362afc..fed15d67d 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -60,7 +60,7 @@ func NewFuncMap() []template.FuncMap { "AppSubUrl": func() string { return setting.AppSubURL }, - "StaticUrlPrefix": func() string { + "AssetUrlPrefix": func() string { return setting.StaticURLPrefix + "/assets" }, "AppUrl": func() string { diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 9b251ec4c..01e9e429a 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -15,23 +15,23 @@ {{end}}
{{if eq .HookType "gitea"}} - + {{else if eq .HookType "gogs"}} - + {{else if eq .HookType "slack"}} - + {{else if eq .HookType "discord"}} - + {{else if eq .HookType "dingtalk"}} - + {{else if eq .HookType "telegram"}} - + {{else if eq .HookType "msteams"}} - + {{else if eq .HookType "feishu"}} - + {{else if eq .HookType "matrix"}} - + {{end}}
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index bc45315ef..25e163b19 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -12,17 +12,17 @@ {{template "base/footer_content" .}} {{if .RequireSimpleMDE}} - - - + + + {{end}} {{if .RequireU2F}} - + {{end}} {{if .EnableCaptcha}} {{if eq .CaptchaType "recaptcha"}} @@ -32,7 +32,7 @@ {{end}} {{end}} - + {{template "custom/footer" .}} diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index f0d8a6f5a..e30fe7076 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -16,7 +16,7 @@ {{end}} - {{.i18n.Tr "licenses"}} + {{.i18n.Tr "licenses"}} {{if .EnableSwagger}}API{{end}} {{.i18n.Tr "website"}} {{template "custom/extra_links_footer" .}} diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index d4de8f790..10fc2bad4 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -29,7 +29,7 @@ window.config = { AppVer: '{{AppVer}}', AppSubUrl: '{{AppSubUrl}}', - StaticUrlPrefix: '{{StaticUrlPrefix}}', + AssetUrlPrefix: '{{AssetUrlPrefix}}', UseServiceWorker: {{UseServiceWorker}}, csrf: '{{.CsrfToken}}', HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}}, @@ -61,12 +61,12 @@ {{end}} }; - - + + {{if .RequireSimpleMDE}} - + {{end}} - +