Description list instead of div's in admin Dashboard & Configuration.

diff --git a/public/css/gogs.css b/public/css/gogs.css
index 965c90962c8a657f4e4bd95d91ace926007c2846..40712204660a2fce2c594513ea054b2d04778378 100755 (executable)
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1231,3 +1231,13 @@ html, body {
 #footer a {
     color: #000;
 }
+
+/* admin dashboard/configuration */
+
+.dl-horizontal > dt {
+    width: 320px;
+}
+
+.dl-horizontal > dd {
+    margin-left: 340px;
+}

diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index ab805d8dea14515a0cef887277fd0ff113d1fe49..d7c3ba761d327257a1257e9e33fc099baddf5c77 100644 (file)
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -9,15 +9,24 @@
             </div>
 
             <div class="panel-body">
-                <div><b>Application Name:</b> {{AppName}}</div>
-                <div><b>Application Version:</b> {{AppVer}}</div>
-                <div><b>Application URL:</b> {{.AppUrl}}</div>
-                <div><b>Domain:</b> {{.Domain}}</div>
-                <hr/>
-                <div><b>Run User:</b> {{.RunUser}}</div>
-                <div><b>Run Mode:</b> {{.RunMode}}</div>
-                <hr/>
-                <div><b>Repository Root Path:</b> {{.RepoRootPath}}</div>
+                <dl class="dl-horizontal">
+                    <dt>Application Name</dt>
+                    <dd>{{AppName}}</dd>
+                    <dt>Application Version</dt>
+                    <dd>{{AppVer}}</dd>
+                    <dt>Application URL</dt>
+                    <dd>{{.AppUrl}}</dd>
+                    <dt>Domain</dt>
+                    <dd>{{.Domain}}</dd>
+                    <hr/>
+                    <dt>Run User</dt>
+                    <dd>{{.RunUser}}</dd>
+                    <dt>Run Mode</dt>
+                    <dd>{{.RunMode}}</dd>
+                    <hr/>
+                    <dt>Repository Root Path</dt>
+                    <dd>{{.RepoRootPath}}</dd>
+                </dl>
             </div>
         </div>
 
@@ -27,12 +36,20 @@
             </div>
 
             <div class="panel-body">
-                <div><b>Type:</b> {{.DbCfg.Type}}</div>
-                <div><b>Host:</b> {{.DbCfg.Host}}</div>
-                <div><b>Name:</b> {{.DbCfg.Name}}</div>
-                <div><b>User:</b> {{.DbCfg.User}}</div>
-                <div><b>SslMode:</b> {{.DbCfg.SslMode}} (for "postgres" only)</div>
-                <div><b>Path:</b> {{.DbCfg.Path}} (for "sqlite3" only)</div>
+                <dl class="dl-horizontal">
+                    <dt>Type</dt>
+                    <dd>{{.DbCfg.Type}}</dd>
+                    <dt>Host</dt>
+                    <dd>{{.DbCfg.Host}}</dd>
+                    <dt>Name</dt>
+                    <dd>{{.DbCfg.Name}}</dd>
+                    <dt>User</dt>
+                    <dd>{{.DbCfg.User}}</dd>
+                    <dt>SslMode</dt>
+                    <dd>{{.DbCfg.SslMode}} (for "postgres" only)</dd>
+                    <dt>Path</dt>
+                    <dd>{{.DbCfg.Path}} (for "sqlite3" only)</dd>
+                </dl>
             </div>
         </div>
 
@@ -42,14 +59,23 @@
             </div>
 
             <div class="panel-body">
-                <div><b>Register Email Confirmation:</b> <i class="fa fa{{if .Service.RegisterEmailConfirm}}-check{{end}}-square-o"></i></div>
-                <div><b>Disenable Registeration:</b> <i class="fa fa{{if .Service.DisenableRegisteration}}-check{{end}}-square-o"></i></div>
-                <div><b>Require Sign In View:</b> <i class="fa fa{{if .Service.RequireSignInView}}-check{{end}}-square-o"></i></div>
-                <div><b>Mail Notification:</b> <i class="fa fa{{if .Service.NotifyMail}}-check{{end}}-square-o"></i></div>
-                <div><b>Enable Cache Avatar:</b> <i class="fa fa{{if .Service.EnableCacheAvatar}}-check{{end}}-square-o"></i></div>
-                <hr/>
-                <div><b>Active Code Lives:</b> {{.Service.ActiveCodeLives}} minutes</div>
-                <div><b>Reset Password Code Lives:</b> {{.Service.ResetPwdCodeLives}} minutes</div>
+                <dl class="dl-horizontal">
+                    <dt>Register Email Confirmation</dt>
+                    <dd><i class="fa fa{{if .Service.RegisterEmailConfirm}}-check{{end}}-square-o"></i></dd>
+                    <dt>Disenable Registeration</dt>
+                    <dd><i class="fa fa{{if .Service.DisenableRegisteration}}-check{{end}}-square-o"></i></dd>
+                    <dt>Require Sign In View</dt>
+                    <dd><i class="fa fa{{if .Service.RequireSignInView}}-check{{end}}-square-o"></i></dd>
+                    <dt>Mail Notification</dt>
+                    <dd><i class="fa fa{{if .Service.NotifyMail}}-check{{end}}-square-o"></i></dd>
+                    <dt>Enable Cache Avatar</dt>
+                    <dd><i class="fa fa{{if .Service.EnableCacheAvatar}}-check{{end}}-square-o"></i></dd>
+                    <hr/>
+                    <dt>Active Code Lives</dt>
+                    <dd>{{.Service.ActiveCodeLives}} minutes</dd>
+                    <dt>Reset Password Code Lives</dt>
+                    <dd>{{.Service.ResetPwdCodeLives}} minutes</dd>
+                </dl>
             </div>
         </div>
 
@@ -59,10 +85,16 @@
             </div>
 
             <div class="panel-body">
-                <div><b>Enabled:</b> <i class="fa fa{{if .MailerEnabled}}-check{{end}}-square-o"></i></div>
-                <div><b>Name:</b> {{.Mailer.Name}}</div>
-                <div><b>Host:</b> {{.Mailer.Host}}</div>
-                <div><b>User:</b> {{.Mailer.User}}</div>
+                <dl class="dl-horizontal">
+                    <dt>Enabled</dt>
+                    <dd><i class="fa fa{{if .MailerEnabled}}-check{{end}}-square-o"></i></dd>
+                    <dt>Name</dt>
+                    <dd>{{.Mailer.Name}}</dd>
+                    <dt>Host</dt>
+                    <dd>{{.Mailer.Host}}</dd>
+                    <dt>User</dt>
+                    <dd>{{.Mailer.User}}</dd>
+                </dl>
             </div>
         </div>
 
@@ -72,9 +104,12 @@
             </div>
 
             <div class="panel-body">
-                <div><b>Cache Adapter:</b> {{.CacheAdapter}}</div>
-                <div><b>Cache Config:</b></div>
-                <div style="padding-top: 5px;"><pre>{{.CacheConfig}}</pre></div>
+                <dl class="dl-horizontal">
+                    <dt>Cache Adapter</dt>
+                    <dd>{{.CacheAdapter}}</dd>
+                    <dt>Cache Config</dt>
+                    <dd><div style="padding-top: 5px;"><pre>{{.CacheConfig}}</pre></div></dd>
+                </dl>
             </div>
         </div>
 
@@ -84,16 +119,28 @@
             </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>
+                <dl class="dl-horizontal">
+                    <dt>Session Provider</dt>
+                    <dd>{{.SessionProvider}}</dd>
+                    <dt>Cookie Name</dt>
+                    <dd>{{.SessionConfig.CookieName}}</dd>
+                    <dt>Enable Set Cookie</dt>
+                    <dd><i class="fa fa{{if .SessionConfig.EnableSetCookie}}-check{{end}}-square-o"></i></dd>
+                    <dt>GC Interval Time</dt>
+                    <dd>{{.SessionConfig.GcIntervalTime}} seconds</dd>
+                    <dt>Session Life Time</dt>
+                    <dd>{{.SessionConfig.SessionLifeTime}} seconds</dd>
+                    <dt>HTTPS Only</dt>
+                    <dd><i class="fa fa{{if .SessionConfig.CookieSecure}}-check{{end}}-square-o"></i></dd>
+                    <dt>Cookie Life Time</dt>
+                    <dd>{{.SessionConfig.CookieLifeTime}} seconds</dd>
+                    <dt>Session ID Hash Function</dt>
+                    <dd>{{.SessionConfig.SessionIDHashFunc}}</dd>
+                    <dt>Session ID Hash Key</dt>
+                    <dd>{{.SessionConfig.SessionIDHashKey}}</dd>
+                    <dt>Provider Config</dt>
+                    <dd>{{.SessionConfig.ProviderConfig}}</dd>
+                </dl>
             </div>
         </div>
 
@@ -103,7 +150,10 @@
             </div>
 
             <div class="panel-body">
-                <div><b>Picture Service:</b> {{.PictureService}}</div>
+                <dl class="dl-horizontal">
+                    <dt>Picture Service</dt>
+                    <dd>{{.PictureService}}</dd>
+                </dl>
             </div>
         </div>
 
@@ -113,9 +163,14 @@
             </div>
 
             <div class="panel-body">
-                <div><b>Log Mode:</b> {{.LogMode}}</div>
-                <div><b>Log Config:</b></div>
-                <div style="padding-top: 5px;"><pre>{{.LogConfig}}</pre></div>
+                <dl class="dl-horizontal">
+                    <dt>Log Mode</dt>
+                    <dd>{{.LogMode}}</dd>
+                    <dt>Log Config</dt>
+                    <dd>
+                        <div style="padding-top: 5px;"><pre>{{.LogConfig}}</pre></div>
+                    </dd>
+                </dl>
                 
             </div>
         </div>

diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index e0b31817aa2ff8394ed070fb6aa944b529021eb4..ef64e57916ea0d108a7a21da43430bcae9537a04 100644 (file)
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -19,38 +19,95 @@
             </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>
-                <div>Total Memory Allocated: <b>{{.SysStatus.MemTotal}}</b></div>
-                <div>Memory Obtained: <b>{{.SysStatus.MemSys}}</b></div>
-                <div>Pointer Lookup Times: <b>{{.SysStatus.Lookups}}</b></div>
-                <div>Memory Allocate Times: <b>{{.SysStatus.MemMallocs}}</b></div>
-                <div>Memory Free Times: <b>{{.SysStatus.MemFrees}}</b></div>
-                <hr/>
-                <div>Current Heap Usage: <b>{{.SysStatus.HeapAlloc}}</b></div>
-                <div>Heap Memory Obtained: <b>{{.SysStatus.HeapSys}}</b></div>
-                <div>Heap Memory Idle: <b>{{.SysStatus.HeapIdle}}</b></div>
-                <div>Heap Memory In Use: <b>{{.SysStatus.HeapInuse}}</b></div>
-                <div>Heap Memory Released: <b>{{.SysStatus.HeapReleased}}</b></div>
-                <div>Heap Objects: <b>{{.SysStatus.HeapObjects}}</b></div>
-                <hr/>
-                <div>Bootstrap Stack Usage: <b>{{.SysStatus.StackInuse}}</b></div>
-                <div>Stack Memory Obtained: <b>{{.SysStatus.StackSys}}</b></div>
-                <div>MSpan Structures Usage: <b>{{.SysStatus.MSpanInuse}}</b></div>
-                <div>MSpan Structures Obtained: <b>{{.SysStatus.HeapSys}}</b></div>
-                <div>MCache Structures Usage: <b>{{.SysStatus.MCacheInuse}}</b></div>
-                <div>MCache Structures Obtained: <b>{{.SysStatus.MCacheSys}}</b></div>
-                <div>Profiling Bucket Hash Table Obtained: <b>{{.SysStatus.BuckHashSys}}</b></div>
-                <div>GC Metadada Obtained: <b>{{.SysStatus.GCSys}}</b></div>
-                <div>Other System Allocation Obtained: <b>{{.SysStatus.OtherSys}}</b></div>
-                <hr/>
-                <div>Next GC Recycle: <b>{{.SysStatus.NextGC}}</b></div>
-                <div>Last GC Time: <b>{{.SysStatus.LastGC}} ago</b></div>
-                <div>Total GC Pause: <b>{{.SysStatus.PauseTotalNs}}</b></div>
-                <div>Last GC Pause: <b>{{.SysStatus.PauseNs}}</b></div>
-                <div>GC Times: <b>{{.SysStatus.NumGC}}</b></div>
+                <dl class="dl-horizontal">
+                    <dt>Server Uptime</dt>
+                    <dd>{{.SysStatus.Uptime}}</dd>
+
+                    <dt>Current Goroutines</dt>
+                    <dd>{{.SysStatus.NumGoroutine}}</dd>
+
+                    <hr/>
+                    <dt>Current Memory Usage</dt>
+                    <dd>{{.SysStatus.MemAllocated}}</dd>
+
+                    <dt>Total Memory Allocated</dt>
+                    <dd>{{.SysStatus.MemTotal}}</dd>
+
+                    <dt>Memory Obtained</dt>
+                    <dd>{{.SysStatus.MemSys}}</dd>
+
+                    <dt>Pointer Lookup Times</dt>
+                    <dd>{{.SysStatus.Lookups}}</dd>
+
+                    <dt>Memory Allocate Times</dt>
+                    <dd>{{.SysStatus.MemMallocs}}</dd>
+
+                    <dt>Memory Free Times</dt>
+                    <dd>{{.SysStatus.MemFrees}}</dd>
+
+                    <hr/>
+                    <dt>Current Heap Usage</dt>
+                    <dd>{{.SysStatus.HeapAlloc}}</dd>
+
+                    <dt>Heap Memory Obtained</dt>
+                    <dd>{{.SysStatus.HeapSys}}</dd>
+
+                    <dt>Heap Memory Idle</dt>
+                    <dd>{{.SysStatus.HeapIdle}}</dd>
+
+                    <dt>Heap Memory In Use</dt>
+                    <dd>{{.SysStatus.HeapInuse}}</dd>
+
+                    <dt>Heap Memory Released</dt>
+                    <dd>{{.SysStatus.HeapReleased}}</dd>
+
+                    <dt>Heap Objects</dt>
+                    <dd>{{.SysStatus.HeapObjects}}</dd>
+
+                    <hr/>
+                    <dt>Bootstrap Stack Usage</dt>
+                    <dd>{{.SysStatus.StackInuse}}</dd>
+
+                    <dt>Stack Memory Obtained</dt>
+                    <dd>{{.SysStatus.StackSys}}</dd>
+
+                    <dt>MSpan Structures Usage</dt>
+                    <dd>{{.SysStatus.MSpanInuse}}</dd>
+
+                    <dt>MSpan Structures Obtained</dt>
+                    <dd>{{.SysStatus.HeapSys}}</dd>
+
+                    <dt>MCache Structures Usage</dt>
+                    <dd>{{.SysStatus.MCacheInuse}}</dd>
+
+                    <dt>MCache Structures Obtained</dt>
+                    <dd>{{.SysStatus.MCacheSys}}</dd>
+
+                    <dt>Profiling Bucket Hash Table Obtained</dt>
+                    <dd>{{.SysStatus.BuckHashSys}}</dd>
+
+                    <dt>GC Metadada Obtained</dt>
+                    <dd>{{.SysStatus.GCSys}}</dd>
+
+                    <dt>Other System Allocation Obtained</dt>
+                    <dd>{{.SysStatus.OtherSys}}</dd>
+
+                    <hr/>
+                    <dt>Next GC Recycle</dt>
+                    <dd>{{.SysStatus.NextGC}}</dd>
+
+                    <dt>Last GC Time</dt>
+                    <dd>{{.SysStatus.LastGC}} ago</dd>
+
+                    <dt>Total GC Pause</dt>
+                    <dd>{{.SysStatus.PauseTotalNs}}</dd>
+
+                    <dt>Last GC Pause</dt>
+                    <dd>{{.SysStatus.PauseNs}}</dd>
+
+                    <dt>GC Times</dt>
+                    <dd>{{.SysStatus.NumGC}}</dd>
+                </dl>
             </div>
         </div>
     </div>