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

This commit is contained in:
Unknown 2014-03-25 23:53:04 -04:00
commit a3d0d29496
3 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
<div id="user-setting-nav" class="col-md-3 admin-nav">
<ul class="list-group" data-init="tabs">
<ul class="list-group">
<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>
<li class="list-group-item{{if .PageIsRepos}} active{{end}}"><a href="/admin/repos"><i class="fa fa-book fa-lg"></i> Repositories</a></li>

View File

@ -4,7 +4,7 @@
{{template "repo/toolbar" .}}
<div id="body" class="container">
<div id="user-setting-nav" class="col-md-3">
<ul class="list-group" data-init="tabs">
<ul class="list-group">
<li class="list-group-item active"><a href="/{{.Owner.Name}}/{{.Repository.Name}}/settings">Options</a></li>
<!--<li class="list-group-item"><a href="#">Collaborators</a></li>
<li class="list-group-item"><a href="#">Notifications</a></li>-->

View File

@ -24,7 +24,7 @@
</div>
</div>
<div id="user-activity" class="col-md-9">
<ul class="nav nav-tabs" id="user-act-tabs" data-init="tabs">
<ul class="nav nav-tabs" id="user-act-tabs">
<li{{if not .TabName}} class="active"{{end}}><a href="{{.Owner.HomeLink}}"><i class="fa fa-gittip"></i>Repositories</a></li>
<li{{if eq .TabName "activity"}} class="active"{{end}}><a href="{{.Owner.HomeLink}}?tab=activity"><i class="fa fa-rss"></i>Public Activity</a></li>
</ul>