+
diff --git a/routers/web/admin/branding.go b/routers/web/admin/branding.go index 2e4c038c47..48919ec8f5 100644 --- a/routers/web/admin/branding.go +++ b/routers/web/admin/branding.go @@ -29,7 +29,7 @@ func Branding(ctx *context.Context) { imgDir := brandingImageDir() ctx.Data["HasNavIcon"] = fileExists(filepath.Join(imgDir, "logo-small.png")) - ctx.Data["HasLogo"] = fileExists(filepath.Join(imgDir, "logo.png")) + ctx.Data["HasLoginLogo"] = fileExists(filepath.Join(imgDir, "login-logo.png")) ctx.Data["HasFavicon"] = fileExists(filepath.Join(imgDir, "favicon.png")) ctx.Data["MetaDescription"] = setting.UI.Meta.Description @@ -105,8 +105,8 @@ func BrandingUpload(ctx *context.Context) { switch imageType { case "nav-icon": filename = "logo-small.png" - case "logo": - filename = "logo.png" + case "login-logo": + filename = "login-logo.png" case "favicon": filename = "favicon.png" default: @@ -173,8 +173,8 @@ func BrandingReset(ctx *context.Context) { switch imageType { case "nav-icon": filename = "logo-small.png" - case "logo": - filename = "logo.png" + case "login-logo": + filename = "login-logo.png" case "favicon": filename = "favicon.png" default: diff --git a/templates/admin/branding.tmpl b/templates/admin/branding.tmpl index 38ba384508..819075e1ce 100644 --- a/templates/admin/branding.tmpl +++ b/templates/admin/branding.tmpl @@ -73,20 +73,20 @@
+ {{if .HasLoginLogo}}
{{else}}Not set{{end}}
+