From bc902b8f745efe91e9dce5e4c5f5f2d5d760fbfb Mon Sep 17 00:00:00 2001 From: Thibault Meyer <0xbaadf00d@users.noreply.github.com> Date: Thu, 1 Sep 2016 07:01:32 +0200 Subject: [PATCH] Feature #3492: Add option to hide footer load times (#3562) * Add option to hide footer load times * Rename option variable + minor changes --- conf/app.ini | 4 +++- modules/setting/setting.go | 8 +++++--- modules/template/template.go | 3 +++ templates/base/footer.tmpl | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/conf/app.ini b/conf/app.ini index ce5c270553..36abf40dfd 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -428,5 +428,7 @@ cs-CZ = cs-CZ [other] SHOW_FOOTER_BRANDING = false -; Show version information about gogs and go in the footer +; Show version information about Gogs and Go in the footer SHOW_FOOTER_VERSION = true +; Show time of template execution in the footer +SHOW_FOOTER_TEMPLATE_LOAD_TIME = true diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8de205beca..cff3e7dbc2 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -246,9 +246,10 @@ var ( // Highlight settings are loaded in modules/template/hightlight.go // Other settings - ShowFooterBranding bool - ShowFooterVersion bool - SupportMiniWinService bool + ShowFooterBranding bool + ShowFooterVersion bool + ShowFooterTemplateLoadTime bool + SupportMiniWinService bool // Global setting objects Cfg *ini.File @@ -571,6 +572,7 @@ func NewContext() { ShowFooterBranding = Cfg.Section("other").Key("SHOW_FOOTER_BRANDING").MustBool() ShowFooterVersion = Cfg.Section("other").Key("SHOW_FOOTER_VERSION").MustBool() + ShowFooterTemplateLoadTime = Cfg.Section("other").Key("SHOW_FOOTER_TEMPLATE_LOAD_TIME").MustBool() HasRobotsTxt = com.IsFile(path.Join(CustomPath, "robots.txt")) } diff --git a/modules/template/template.go b/modules/template/template.go index 707697df34..3a6eb042bb 100644 --- a/modules/template/template.go +++ b/modules/template/template.go @@ -52,6 +52,9 @@ func NewFuncMap() []template.FuncMap { "DisableGravatar": func() bool { return setting.DisableGravatar }, + "ShowFooterTemplateLoadTime": func() bool { + return setting.ShowFooterTemplateLoadTime + }, "LoadTimes": func(startTime time.Time) string { return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms" }, diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 28995dcbdf..3f0190528d 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -7,7 +7,7 @@