diff options
| -rw-r--r-- | conf/app.ini | 2 | ||||
| -rw-r--r-- | modules/middleware/context.go | 1 | ||||
| -rw-r--r-- | modules/setting/setting.go | 2 | ||||
| -rw-r--r-- | templates/base/footer.tmpl | 6 | ||||
| -rw-r--r-- | templates/ng/base/footer.tmpl | 6 |
5 files changed, 11 insertions, 6 deletions
diff --git a/conf/app.ini b/conf/app.ini index 5c7ce69834..d9d29c9ef9 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -334,3 +334,5 @@ it-IT = it [other] SHOW_FOOTER_BRANDING = false +; Show version information about gogs and go in the footer +SHOW_FOOTER_VERSION = true diff --git a/modules/middleware/context.go b/modules/middleware/context.go index 3910a20521..4839ccf99e 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -245,6 +245,7 @@ func Contexter() macaron.Handler { ctx.Data["ShowRegistrationButton"] = setting.Service.ShowRegistrationButton ctx.Data["ShowFooterBranding"] = setting.ShowFooterBranding + ctx.Data["ShowFooterVersion"] = setting.ShowFooterVersion c.Map(ctx) } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index a77267228f..fac0199074 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -178,6 +178,7 @@ var ( // Other settings. ShowFooterBranding bool + ShowFooterVersion bool // Global setting objects. Cfg *ini.File @@ -425,6 +426,7 @@ func NewContext() { dateLangs = Cfg.Section("i18n.datelang").KeysHash() ShowFooterBranding = Cfg.Section("other").Key("SHOW_FOOTER_BRANDING").MustBool() + EnableShowVersion = Cfg.Section("other").Key("ENABLE_SHOW_VERSION").MustBool() HasRobotsTxt = com.IsFile(path.Join(CustomPath, "robots.txt")) } diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 686b82f24d..f3eb250618 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -2,7 +2,7 @@ <footer> <div class="ui container"> <div class="ui left"> - © 2015 Gogs {{.i18n.Tr "version"}}: {{AppVer}} {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong> + © 2015 Gogs {{ if .ShowFooterVersion }}{{.i18n.Tr "version"}}: {{AppVer}}{{ end }} {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong> </div> <div class="ui right links"> {{if .ShowFooterBranding}} @@ -20,7 +20,7 @@ </div> </div> <a target="_blank" href="http://gogs.io">{{.i18n.Tr "website"}}</a> - <span class="version">{{GoVer}}</span> + {{ if .ShowFooterVersion }}<span class="version">{{GoVer}}</span>{{ end }} </div> </div> </footer> @@ -46,4 +46,4 @@ <script src="{{AppSubUrl}}/js/libs/emojify-1.1.0.min.js"></script> <script src="{{AppSubUrl}}/js/libs/clipboard-1.5.3.min.js"></script> -</html>
\ No newline at end of file +</html> diff --git a/templates/ng/base/footer.tmpl b/templates/ng/base/footer.tmpl index bafcc46ef7..695a145f72 100644 --- a/templates/ng/base/footer.tmpl +++ b/templates/ng/base/footer.tmpl @@ -1,7 +1,7 @@ </div> <footer id="footer"> <div class="container clear"> - <p class="left" id="footer-rights">© 2015 Gogs · {{.i18n.Tr "version"}}: {{AppVer}} · {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> · + <p class="left" id="footer-rights">© 2015 Gogs · {{ if .ShowFooterVersion }}{{.i18n.Tr "version"}}: {{AppVer}}{{ end }} · {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> · {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong></p> <div class="right" id="footer-links"> @@ -21,9 +21,9 @@ </div> </div> <a target="_blank" href="http://gogs.io">{{.i18n.Tr "website"}}</a> - <span class="version">{{GoVer}}</span> + {{ if .ShowVersionFooter }}<span class="version">{{GoVer}}</span>{{ end }} </div> </div> </footer> </body> -</html>
\ No newline at end of file +</html> |