diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/admin/config.tmpl | 4 | ||||
| -rw-r--r-- | templates/admin/dashboard.tmpl | 25 | ||||
| -rw-r--r-- | templates/base/footer.tmpl | 8 | ||||
| -rw-r--r-- | templates/status/404.tmpl | 3 | ||||
| -rw-r--r-- | templates/status/500.tmpl | 2 |
5 files changed, 33 insertions, 9 deletions
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index e7f7c3a0..4d90172c 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -12,8 +12,6 @@ <dl class="dl-horizontal admin-dl-horizontal"> <dt>{{.i18n.Tr "admin.config.app_name"}}</dt> <dd>{{AppName}}</dd> - <dt>{{.i18n.Tr "admin.config.app_ver"}}</dt> - <dd>{{AppVer}}</dd> <dt>{{.i18n.Tr "admin.config.app_url"}}</dt> <dd>{{.AppURL}}</dd> <dt>{{.i18n.Tr "admin.config.domain"}}</dt> @@ -267,8 +265,6 @@ </h4> <div class="ui attached table segment"> <dl class="dl-horizontal admin-dl-horizontal"> - <dt>{{.i18n.Tr "admin.config.git_version"}}</dt> - <dd>{{.GitVersion}}</dd> <dt>{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}</dt> <dd><i class="fa fa{{if .Git.DisableDiffHighlight}}-check{{end}}-square-o"></i></dd> <dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt> diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 968ed78c..49bc3609 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -6,6 +6,30 @@ <div class="twelve wide column content"> {{template "base/alert" .}} <h4 class="ui top attached header"> + {{.i18n.Tr "admin.dashboard.build_info"}} + </h4> + <div class="ui attached table segment"> + <dl class="dl-horizontal admin-dl-horizontal"> + <dt>{{.i18n.Tr "admin.dashboard.app_ver"}}</dt> + <dd>{{AppVer}}</dd> + <dt>{{.i18n.Tr "admin.dashboard.git_version"}}</dt> + <dd>{{.GitVersion}}</dd> + <dt>{{.i18n.Tr "admin.dashboard.go_version"}}</dt> + <dd>{{.GoVersion}}</dd> + <dt>{{.i18n.Tr "admin.dashboard.build_time"}}</dt> + <dd>{{.BuildTime}}</dd> + <dt>{{.i18n.Tr "admin.dashboard.build_commit"}}</dt> + <dd> + {{if .BuildCommit}} + <a target="_blank" href="https://github.com/gogs/gogs/commit/{{.BuildCommit}}">{{.BuildCommit}} <i class="fa fa-external-link" aria-hidden="true"></i></a> + {{else}} + N/A + {{end}} + </dd> + </dl> + </div> + + <h4 class="ui top attached header"> {{.i18n.Tr "admin.dashboard.statistic"}} </h4> <div class="ui attached segment"> @@ -13,6 +37,7 @@ {{.i18n.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.LoginSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2HTML}} </p> </div> + <h4 class="ui top attached header"> {{.i18n.Tr "admin.dashboard.operations"}} </h4> diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 2ede29a5..452d6ed0 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -7,9 +7,14 @@ <footer> <div class="ui container"> <div class="ui left"> - © {{Year}} Gogs {{if (or .ShowFooterVersion .PageIsAdmin)}}{{.i18n.Tr "version"}}: {{AppVer}}{{end}} {{if ShowFooterTemplateLoadTime}}{{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong>{{end}} + © {{Year}} Gogs </div> <div class="ui right links"> + {{if ShowFooterTemplateLoadTime}} + <span> + {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong> + </span> + {{end}} {{if .ShowFooterBranding}} <a target="_blank" rel="noopener noreferrer" href="https://github.com/gogs/gogs"><i class="fa fa-github-square"></i><span class="sr-only">GitHub</span></a> <a target="_blank" rel="noopener noreferrer" href="https://twitter.com/GogsHQ"><i class="fa fa-twitter"></i><span class="sr-only">Twitter</span></a> @@ -26,7 +31,6 @@ </div> <a href="/assets/librejs/librejs.html" style="display:none" data-jslicense="1">Javascript Licenses</a> <a target="_blank" rel="noopener noreferrer" href="https://gogs.io">{{.i18n.Tr "website"}}</a> - {{if (or .ShowFooterVersion .PageIsAdmin)}}<span class="version">{{GoVer}}</span>{{end}} </div> </div> </footer> diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index e90e8be8..9834fa28 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -3,7 +3,6 @@ <p style="margin-top: 100px"><img src="{{AppSubURL}}/img/404.png" alt="404"/></p> <div class="ui divider"></div> <br> - {{if .ShowFooterVersion}}<p>Application Version: {{AppVer}}</p>{{end}} - <p>If you think this is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p> + <p>If you think this is an error, please open an issue on <a href="https://github.com/gogs/gogs/issues/new">GitHub</a>.</p> </div> {{template "base/footer" .}} diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index b42dedb9..0bf11ab8 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -4,6 +4,6 @@ <div class="ui divider"></div> <br> {{if .ErrorMsg}}<p>An error has occurred : {{.ErrorMsg}}</p>{{end}} - {{if .ShowFooterVersion}}<p>Application Version: {{AppVer}}</p>{{end}} + {{if .IsAdmin}}<p>Application Version: {{AppVer}}</p>{{end}} </div> {{template "base/footer" .}} |