From e1c04f043b9e40c8edc54eab6ccc3189aa2b4a9f Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Tue, 13 Oct 2015 01:40:35 +0200 Subject: [PATCH] Implement new ui to dashboard --- public/less/_admin.less | 21 +++++++++ templates/admin/dashboard.tmpl | 81 ++++++++++++++++------------------ 2 files changed, 60 insertions(+), 42 deletions(-) diff --git a/public/less/_admin.less b/public/less/_admin.less index d0c65129ca..f1f236d93e 100644 --- a/public/less/_admin.less +++ b/public/less/_admin.less @@ -25,4 +25,25 @@ max-width: 200px; } } + + .admin-desc,.admin-table { + padding: 20px; + } + + dl.admin-dl-horizontal { + padding: 20px; + margin: 0; + dd{ + margin-left: 240px; + } + dt { + font-weight: bolder; + float: left; + width: 250px; + clear: left; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } } \ No newline at end of file diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 847f488095..33dd5be980 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -1,28 +1,26 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -
-
-
- {{template "admin/nav" .}} -
-
- {{template "ng/base/alert" .}} -
-
-
- {{.i18n.Tr "admin.dashboard.statistic"}} -
-
-

- {{.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.operations"}} -
-
+{{template "base/head" .}} +
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.dashboard.statistic"}} +

+
+

+ {{.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.operations"}} +

+
+
@@ -49,16 +47,16 @@
-
-
-
-
-
- {{.i18n.Tr "admin.dashboard.system_status"}} -
-
-
-
{{.i18n.Tr "admin.dashboard.server_uptime"}}
+
+
+ + +

+ {{.i18n.Tr "admin.dashboard.statistic"}} +

+
+
+
{{.i18n.Tr "admin.dashboard.server_uptime"}}
{{.SysStatus.Uptime}}
{{.i18n.Tr "admin.dashboard.current_goroutine"}}
@@ -145,13 +143,12 @@
{{.i18n.Tr "admin.dashboard.gc_times"}}
{{.SysStatus.NumGC}}
-
-
-
-
-
-
+
+
+ +
+
-{{template "ng/base/footer" .}} +{{template "base/footer" .}}