summaryrefslogtreecommitdiffstats
path: root/templates/admin
diff options
context:
space:
mode:
authorslene <vslene@gmail.com>2014-03-23 01:45:21 +0800
committerslene <vslene@gmail.com>2014-03-23 01:45:21 +0800
commit5edd57e4822804aef2af64b1ede99cd6e977b143 (patch)
tree2c7bcd573d072771f64685d05a95ddcdcb9754d5 /templates/admin
parent076fc98d981aea3533eea363ca1c7e43f77b9802 (diff)
parentcd070b56d2f5b34236174ff04ccc459d15c4cd17 (diff)
downloadgitea-5edd57e4822804aef2af64b1ede99cd6e977b143.tar.gz
gitea-5edd57e4822804aef2af64b1ede99cd6e977b143.zip
Merge branch 'master' of github.com:gogits/gogs
Diffstat (limited to 'templates/admin')
-rw-r--r--templates/admin/config.tmpl19
-rw-r--r--templates/admin/dashboard.tmpl1
2 files changed, 20 insertions, 0 deletions
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index e3f69ee6ea..048740e617 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -79,6 +79,25 @@
<div class="panel panel-default">
<div class="panel-heading">
+ Session Configuration
+ </div>
+
+ <div class="panel-body">
+ <div><b>Session Provider:</b> {{.SessionProvider}}</div>
+ <div><b>Cookie Name:</b> {{.SessionConfig.CookieName}}</div>
+ <div><b>Enable Set Cookie:</b> <i class="fa fa{{if .SessionConfig.EnableSetCookie}}-check{{end}}-square-o"></i></div>
+ <div><b>GC Interval Time:</b> {{.SessionConfig.GcIntervalTime}} seconds</div>
+ <div><b>Session Life Time:</b> {{.SessionConfig.SessionLifeTime}} seconds</div>
+ <div><b>HTTPS Only:</b> <i class="fa fa{{if .SessionConfig.CookieSecure}}-check{{end}}-square-o"></i></div>
+ <div><b>Cookie Life Time:</b> {{.SessionConfig.CookieLifeTime}} seconds</div>
+ <div><b>Session ID Hash Function:</b> {{.SessionConfig.SessionIDHashFunc}}</div>
+ <div><b>Session ID Hash Key:</b> {{.SessionConfig.SessionIDHashKey}}</div>
+ <div><b>Provider Config:</b> {{.SessionConfig.ProviderConfig}}</div>
+ </div>
+ </div>
+
+ <div class="panel panel-default">
+ <div class="panel-heading">
Picture Configuration
</div>
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 0bebf8318f..2a5a161e03 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -19,6 +19,7 @@
</div>
<div class="panel-body">
+ <div>Server Uptime: <b>{{.SysStatus.Uptime}}</b></div>
<div>Current Goroutines: <b>{{.SysStatus.NumGoroutine}}</b></div>
<hr/>
<div>Current Memory Usage: <b>{{.SysStatus.MemAllocated}}</b></div>