Browse Source

fix #1990

pull/1992/head
Unknwon 9 years ago
parent
commit
7a9777ae36
  1. 2
      config.codekit
  2. 2941
      public/css/gogs.css
  3. 13
      public/less/_admin.less
  4. 25
      templates/admin/dashboard.tmpl

2
config.codekit

@ -464,7 +464,7 @@
"ignore": 0, "ignore": 0,
"ignoreWasSetByUser": 0, "ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/public\/less\/gogs.less", "inputAbbreviatedPath": "\/public\/less\/gogs.less",
"outputAbbreviatedPath": "\/public\/css\/gogs.min.css", "outputAbbreviatedPath": "\/public\/css\/gogs.css",
"outputPathIsOutsideProject": 0, "outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 1, "outputPathIsSetByUser": 1,
"outputStyle": 1, "outputStyle": 1,

2941
public/css/gogs.css

File diff suppressed because one or more lines are too long

13
public/less/_admin.less

@ -10,8 +10,8 @@
padding-bottom: 5px; padding-bottom: 5px;
} }
th, td { th, td {
&:first-child { &:first-of-type {
padding-left: 15px; padding-left: 15px !important;
} }
} }
} }
@ -26,17 +26,10 @@
} }
} }
.admin-desc {
padding: 20px;
}
.admin-table{
.table{
width: 100%;
}
}
dl.admin-dl-horizontal { dl.admin-dl-horizontal {
padding: 20px; padding: 20px;
margin: 0; margin: 0;
dd{ dd{
margin-left: 240px; margin-left: 240px;
} }

25
templates/admin/dashboard.tmpl

@ -1,7 +1,5 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="admin monitor"> <div class="admin dashboard">
<div class="ui container"> <div class="ui container">
<div class="ui grid"> <div class="ui grid">
{{template "admin/navbar" .}} {{template "admin/navbar" .}}
@ -10,18 +8,16 @@
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{.i18n.Tr "admin.dashboard.statistic"}} {{.i18n.Tr "admin.dashboard.statistic"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached segment">
<p class="admin-desc"> <p>
{{.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}} {{.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> </p>
</div> </div>
<br>
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{.i18n.Tr "admin.dashboard.operations"}} {{.i18n.Tr "admin.dashboard.operations"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<div class="admin-table"> <table class="ui very basic table">
<table class="table">
<tbody> <tbody>
<tr> <tr>
<td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td> <td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td>
@ -46,8 +42,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<br>
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{.i18n.Tr "admin.dashboard.system_status"}} {{.i18n.Tr "admin.dashboard.system_status"}}
</h4> </h4>
@ -57,7 +52,7 @@
<dd>{{.SysStatus.Uptime}}</dd> <dd>{{.SysStatus.Uptime}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.current_goroutine"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.current_goroutine"}}</dt>
<dd>{{.SysStatus.NumGoroutine}}</dd> <dd>{{.SysStatus.NumGoroutine}}</dd>
<hr/> <div class="ui divider"></div>
<dt>{{.i18n.Tr "admin.dashboard.current_memory_usage"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.current_memory_usage"}}</dt>
<dd>{{.SysStatus.MemAllocated}}</dd> <dd>{{.SysStatus.MemAllocated}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.total_memory_allocated"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.total_memory_allocated"}}</dt>
@ -70,7 +65,7 @@
<dd>{{.SysStatus.MemMallocs}}</dd> <dd>{{.SysStatus.MemMallocs}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.memory_free_times"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.memory_free_times"}}</dt>
<dd>{{.SysStatus.MemFrees}}</dd> <dd>{{.SysStatus.MemFrees}}</dd>
<hr/> <div class="ui divider"></div>
<dt>{{.i18n.Tr "admin.dashboard.current_heap_usage"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.current_heap_usage"}}</dt>
<dd>{{.SysStatus.HeapAlloc}}</dd> <dd>{{.SysStatus.HeapAlloc}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.heap_memory_obtained"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.heap_memory_obtained"}}</dt>
@ -83,7 +78,7 @@
<dd>{{.SysStatus.HeapReleased}}</dd> <dd>{{.SysStatus.HeapReleased}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.heap_objects"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.heap_objects"}}</dt>
<dd>{{.SysStatus.HeapObjects}}</dd> <dd>{{.SysStatus.HeapObjects}}</dd>
<hr/> <div class="ui divider"></div>
<dt>{{.i18n.Tr "admin.dashboard.bootstrap_stack_usage"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.bootstrap_stack_usage"}}</dt>
<dd>{{.SysStatus.StackInuse}}</dd> <dd>{{.SysStatus.StackInuse}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.stack_memory_obtained"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.stack_memory_obtained"}}</dt>
@ -102,7 +97,7 @@
<dd>{{.SysStatus.GCSys}}</dd> <dd>{{.SysStatus.GCSys}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.other_system_allocation_obtained"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.other_system_allocation_obtained"}}</dt>
<dd>{{.SysStatus.OtherSys}}</dd> <dd>{{.SysStatus.OtherSys}}</dd>
<hr> <div class="ui divider"></div>
<dt>{{.i18n.Tr "admin.dashboard.next_gc_recycle"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.next_gc_recycle"}}</dt>
<dd>{{.SysStatus.NextGC}}</dd> <dd>{{.SysStatus.NextGC}}</dd>
<dt>{{.i18n.Tr "admin.dashboard.last_gc_time"}}</dt> <dt>{{.i18n.Tr "admin.dashboard.last_gc_time"}}</dt>
@ -115,10 +110,8 @@
<dd>{{.SysStatus.NumGC}}</dd> <dd>{{.SysStatus.NumGC}}</dd>
</dl> </dl>
</div> </div>
<br>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

Loading…
Cancel
Save