summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-21 21:06:05 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-21 21:06:05 +0800
commitecc61ced413a60fcfdc432b921dc2c1b3cab0366 (patch)
tree86b5686aae93d5d301ba956bcc2e629bf25f77e5
parente4053f5e982f627d983a08bf3fe6bb2b20b904b5 (diff)
downloadgitea-ecc61ced413a60fcfdc432b921dc2c1b3cab0366.tar.gz
gitea-ecc61ced413a60fcfdc432b921dc2c1b3cab0366.zip
update admin nav ui
-rwxr-xr-xpublic/css/gogs.css21
-rw-r--r--routers/admin/user.go2
-rw-r--r--templates/admin/nav.tmpl2
-rw-r--r--templates/base/footer.tmpl2
4 files changed, 25 insertions, 2 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css
index b799882352..aec8f1b328 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -324,6 +324,27 @@ html, body {
color: #444;
}
+.gogs-admin-nav{
+ background-color: #FFF;
+ padding-top: 10px;
+ padding-left: 0;
+ padding-right: 0;
+ border:1px solid #D8D8D8;
+}
+
+.gogs-admin-nav li{
+ margin-bottom: 8px;
+ border-left: 4px solid transparent;
+}
+
+.gogs-admin-nav li:hover{
+ border-left-color: #EEE;
+}
+
+.gogs-admin-nav li.active:hover{
+ border-left: 4px solid #DD4B39;
+}
+
/* gogits user ssh keys */
#gogs-ssh-keys .list-group-item {
diff --git a/routers/admin/user.go b/routers/admin/user.go
index 47eec5c914..d6f8523218 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -18,6 +18,7 @@ import (
func NewUser(ctx *middleware.Context, form auth.RegisterForm) {
ctx.Data["Title"] = "New Account"
+ ctx.Data["PageIsUsers"] = true
if ctx.Req.Method == "GET" {
ctx.HTML(200, "admin/users/new")
@@ -67,6 +68,7 @@ func NewUser(ctx *middleware.Context, form auth.RegisterForm) {
func EditUser(ctx *middleware.Context, params martini.Params, form auth.AdminEditUserForm) {
ctx.Data["Title"] = "Edit Account"
+ ctx.Data["PageIsUsers"] = true
uid, err := base.StrTo(params["userid"]).Int()
if err != nil {
diff --git a/templates/admin/nav.tmpl b/templates/admin/nav.tmpl
index bb704ee3fb..72f008acc7 100644
--- a/templates/admin/nav.tmpl
+++ b/templates/admin/nav.tmpl
@@ -1,4 +1,4 @@
-<div id="gogs-user-setting-nav" class="col-md-3">
+<div id="gogs-user-setting-nav" class="col-md-3 gogs-admin-nav">
<ul class="list-group" data-init="tabs">
<li class="list-group-item{{if .PageIsDashboard}} active{{end}}"><a href="/admin"><i class="fa fa-tachometer fa-lg"></i> Dashboard</a></li>
<li class="list-group-item{{if .PageIsUsers}} active{{end}}"><a href="/admin/users"><i class="fa fa-users fa-lg"></i> Users</a></li>
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
index 5ae5c96d68..6c2da63e5d 100644
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -4,7 +4,7 @@
<div class="container footer-wrap">
<div class="row">
<div class="col-md-6">
- <p>© 2014 Gogs · Version: {{AppVer}} ·
+ <p>© 2014 GoGits · Version: {{AppVer}} ·
Page: <b>{{LoadTimes .PageStartTime}}</b> ·
Template: <b>{{call .TmplLoadTimes}}</b>
</p>