From 3549fb0ea8c4e039ec55caf90e8cabf78cde87a2 Mon Sep 17 00:00:00 2001 From: Mathieu Gagnon Date: Sat, 13 Sep 2014 03:52:51 -0400 Subject: [PATCH] Remove APP_LOGO setting --- conf/app.ini | 1 - modules/mailer/mail.go | 1 - modules/setting/setting.go | 2 -- routers/dev/template.go | 1 - templates/mail/auth/active.tmpl | 2 +- templates/mail/auth/register_success.tmpl | 2 +- templates/mail/auth/reset_passwd.tmpl | 2 +- 7 files changed, 3 insertions(+), 8 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index 3e7e191c3..be49e0641 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -1,6 +1,5 @@ ; App name that shows on every page title APP_NAME = Gogs: Go Git Service -APP_LOGO = img/favicon.png ; Change it if you run locally RUN_USER = git ; Either "dev", "prod" or "test", default is "dev" diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index 5a662b901..6c73e7e58 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -45,7 +45,6 @@ func GetMailTmplData(u *models.User) map[interface{}]interface{} { data["AppName"] = setting.AppName data["AppVer"] = setting.AppVer data["AppUrl"] = setting.AppUrl - data["AppLogo"] = setting.AppLogo data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60 data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60 if u != nil { diff --git a/modules/setting/setting.go b/modules/setting/setting.go index ebc1020a3..199b4f2c2 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -32,7 +32,6 @@ var ( // App settings. AppVer string AppName string - AppLogo string AppUrl string // Server settings. @@ -155,7 +154,6 @@ func NewConfigContext() { } AppName = Cfg.MustValue("", "APP_NAME", "Gogs: Go Git Service") - AppLogo = Cfg.MustValue("", "APP_LOGO", "img/favicon.png") AppUrl = Cfg.MustValue("server", "ROOT_URL", "http://localhost:3000/") if AppUrl[len(AppUrl)-1] != '/' { AppUrl += "/" diff --git a/routers/dev/template.go b/routers/dev/template.go index e4f2429ae..9528c74c6 100644 --- a/routers/dev/template.go +++ b/routers/dev/template.go @@ -16,7 +16,6 @@ func TemplatePreview(ctx *middleware.Context) { ctx.Data["AppName"] = setting.AppName ctx.Data["AppVer"] = setting.AppVer ctx.Data["AppUrl"] = setting.AppUrl - ctx.Data["AppLogo"] = setting.AppLogo ctx.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374" ctx.Data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60 ctx.Data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60 diff --git a/templates/mail/auth/active.tmpl b/templates/mail/auth/active.tmpl index 72d9948bd..b9dacc757 100644 --- a/templates/mail/auth/active.tmpl +++ b/templates/mail/auth/active.tmpl @@ -9,7 +9,7 @@
-

{{.AppName}}

+

{{.AppName}}

Hi {{.User.Name}}, diff --git a/templates/mail/auth/register_success.tmpl b/templates/mail/auth/register_success.tmpl index ffbe2c973..5e4cb84ba 100644 --- a/templates/mail/auth/register_success.tmpl +++ b/templates/mail/auth/register_success.tmpl @@ -9,7 +9,7 @@
-

{{.AppName}}

+

{{.AppName}}

Hi {{.User.Name}}, this is your registration email for {{.AppName}}! diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index c85fc6179..bf0b9cd3e 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -9,7 +9,7 @@
-

{{.AppName}}

+

{{.AppName}}

Hi {{.User.Name}},