Remove APP_LOGO setting

diff --git a/conf/app.ini b/conf/app.ini
index 3e7e191c30ee5850a495df2066271cca1d6056e4..be49e06411d3aa4410f4e83f0a62172ca45dbfef 100644 (file)
--- 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 5a662b90100a00ac15fdad2476b3ce71048aabfd..6c73e7e58ffcc65750fab34988f2fd3f5896e4bc 100644 (file)
--- 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 ebc1020a333969ea53b0fbec3c9ddd2d2dfe707f..199b4f2c278f803657423abc572cfae60ad3c1cd 100644 (file)
--- 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 e4f2429ae958643e6cd646369123fef07bc07ed2..9528c74c64103e2527c6d98a43722922f9de9a1e 100644 (file)
--- 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 72d9948bd48f2a9d0988e84a309464ced381a9f0..b9dacc757598c95434d482e289a589fb1186a30b 100644 (file)
--- a/templates/mail/auth/active.tmpl
+++ b/templates/mail/auth/active.tmpl
@@ -9,7 +9,7 @@
     <div style="width:600px;margin:0 auto; padding:40px 0 20px;">
         <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);">
             <div style="padding: 20px 15px;">
-                <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/{{.AppLogo}}" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
+                <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
                 <div style="padding:40px 15px;">
                     <div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
                         Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,

diff --git a/templates/mail/auth/register_success.tmpl b/templates/mail/auth/register_success.tmpl
index ffbe2c973276b73ee545f11559e3f1727818f03a..5e4cb84ba67a0426a616ed39b9a21c6f5a62076b 100644 (file)
--- a/templates/mail/auth/register_success.tmpl
+++ b/templates/mail/auth/register_success.tmpl
@@ -9,7 +9,7 @@
     <div style="width:600px;margin:0 auto; padding:40px 0 20px;">
         <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);">
             <div style="padding: 20px 15px;">
-                <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/{{.AppLogo}}" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
+                <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
                 <div style="padding:40px 15px;">
                     <div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
                         Hi <span style="color: #00BFFF;">{{.User.Name}}</span>, this is your registration email for {{.AppName}}!

diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl
index c85fc61798fc4a93b27339031e1168f6114006c8..bf0b9cd3ec02ef10524b487529cddd4e813c289a 100644 (file)
--- a/templates/mail/auth/reset_passwd.tmpl
+++ b/templates/mail/auth/reset_passwd.tmpl
@@ -9,7 +9,7 @@
     <div style="width:600px;margin:0 auto; padding:40px 0 20px;">
         <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);">
             <div style="padding: 20px 15px;">
-                <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/{{.AppLogo}}" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
+                <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1>
                 <div style="padding:40px 15px;">
                     <div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
                         Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,