Merge branch 'master' of github.com:gogits/gogs

This commit is contained in:
slene 2014-03-21 21:07:06 +08:00
commit 77b612b5ea
4 changed files with 25 additions and 2 deletions

View file

@ -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 {

View file

@ -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 {

View file

@ -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>

View file

@ -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>