update admin nav ui

diff --git a/public/css/gogs.css b/public/css/gogs.css
index b799882352d88bc37773b19a93bd6e33bbdae9bd..aec8f1b328ab7c56a027e0c949fd4a61ac69461e 100755 (executable)
--- 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 47eec5c9140c7f928de771274d4fc217dda38aa9..d6f852321860f48417c872520d363676288aa3cb 100644 (file)
--- 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 bb704ee3fb4877b4ea5ee7190e8a10b775984e9a..72f008acc73adc5cd301c37106ce77b5cea7d3e6 100644 (file)
--- 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 5ae5c96d688b1a46d3b59ff5aecdbd74be974b7b..6c2da63e5da5efbb4370e289d368ecbb59dda9af 100644 (file)
--- 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>