playground
/
gogs
mirror of https://github.com/gogits/gogs.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

repo/branches: overview and all (#2310)

pull/4280/head
Unknwon 8 years ago
parent
3eb57370a6
commit
5c7cb1594b
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
13 changed files with 269 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      cmd/web.go
  2. 12
      conf/locale/locale_en-US.ini
  3. 2
      gogs.go
  4. 17
      models/repo_branch.go
  5. 4
      modules/bindata/bindata.go
  6. 29
      public/css/gogs.css
  7. 32
      public/less/_repository.less
  8. 91
      routers/repo/branch.go
  9. 2
      templates/.VERSION
  10. 31
      templates/repo/branches/all.tmpl
  11. 4
      templates/repo/branches/navbar.tmpl
  12. 62
      templates/repo/branches/overview.tmpl
  13. 3
      templates/repo/home.tmpl

7
cmd/web.go
Unescape View File

@ -575,8 +575,11 @@ func runWeb(ctx *cli.Context) error {
m.Get("/milestones", repo.Milestones)
}, context.RepoRef())
// m.Get("/branches", repo.Branches)
m.Post("/branches/delete/*", reqSignIn, reqRepoWriter, repo.DeleteBranchPost)
m.Group("/branches", func() {
m.Get("", repo.Branches)
m.Get("/all", repo.AllBranches)
m.Post("/delete/*", reqSignIn, reqRepoWriter, repo.DeleteBranchPost)
})
m.Group("/wiki", func() {
m.Get("/?:page", repo.Wiki)

12
conf/locale/locale_en-US.ini
Unescape View File

@ -426,8 +426,9 @@ issues = Issues
pulls = Pull Requests
labels = Labels
milestones = Milestones
commits = commits
releases = releases
commits = Commits
git_branches = Branches
releases = Releases
file_raw = Raw
file_history = History
file_view_raw = View Raw
@ -435,6 +436,13 @@ file_permalink = Permalink
file_too_large = This file is too large to be shown
video_not_supported_in_browser = Your browser doesn't support HTML5 video tag.
branches.overview = Overview
branches.active_branches = Active Branches
branches.stale_branches = Stale Branches
branches.all = All Branches
branches.updated_by = Updated %[1]s by %[2]s
branches.change_default_branch = Change Default Branch
editor.new_file = New file
editor.upload_file = Upload file
editor.edit_file = Edit file

2
gogs.go
Unescape View File

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.10.14.0310"
const APP_VER = "0.10.15.0311"
func init() {
setting.AppVer = APP_VER

17
models/repo_branch.go
Unescape View File

@ -15,8 +15,11 @@ import (
)
type Branch struct {
Path string
Name string
RepoPath string
Name string
IsProtected bool
Commit *git.Commit
}
func GetBranchesByPath(path string) ([]*Branch, error) {
@ -33,8 +36,8 @@ func GetBranchesByPath(path string) ([]*Branch, error) {
branches := make([]*Branch, len(brs))
for i := range brs {
branches[i] = &Branch{
Path: path,
Name: brs[i],
RepoPath: path,
Name: brs[i],
}
}
return branches, nil
@ -45,8 +48,8 @@ func (repo *Repository) GetBranch(br string) (*Branch, error) {
return nil, ErrBranchNotExist{br}
}
return &Branch{
Path: repo.RepoPath(),
Name: br,
RepoPath: repo.RepoPath(),
Name: br,
}, nil
}
@ -55,7 +58,7 @@ func (repo *Repository) GetBranches() ([]*Branch, error) {
}
func (br *Branch) GetCommit() (*git.Commit, error) {
gitRepo, err := git.OpenRepository(br.Path)
gitRepo, err := git.OpenRepository(br.RepoPath)
if err != nil {
return nil, err
}

4
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

29
public/css/gogs.css
Unescape View File

@ -1227,6 +1227,33 @@ footer .ui.language .menu {
right: 0!important;
left: auto!important;
}
.repository.branches .ui.list {
padding: 0;
}
.repository.branches .ui.list > .item {
margin: 0;
line-height: 2em;
}
.repository.branches .ui.list > .item:not(:last-child) {
border-bottom: 1px solid #DDD;
}
.repository.branches .ui.list > .item .column {
padding: 5px 15px;
}
.repository.branches .ui.list > .item .column .octicon {
vertical-align: text-bottom;
}
.repository.branches .ui.list > .item .column code {
padding: 4px 0;
font-size: 12px;
}
.repository.branches .ui.list > .item .column .ui.text:not(i) {
font-size: 12px;
}
.repository.branches .ui.list > .item .column .ui.button {
font-size: 12px;
padding: 8px 10px;
}
.repository.file.list #repo-desc {
font-size: 1.2em;
}
@ -1249,7 +1276,7 @@ footer .ui.language .menu {
}
.repository.file.list #git-stats .list .item {
margin-left: 0;
width: 50%;
width: 33.33%;
}
.repository.file.list #git-stats .list .item .text b {
font-size: 15px;

32
public/less/_repository.less
Unescape View File

@ -150,6 +150,36 @@
}
}
&.branches {
.ui.list {
padding: 0;
>.item {
margin: 0;
line-height: 2em;
&:not(:last-child) {
border-bottom: 1px solid #DDD;
}
.column {
padding: 5px 15px;
.octicon {
vertical-align: text-bottom;
}
code {
padding: 4px 0;
font-size: 12px;
}
.ui.text:not(i) {
font-size: 12px;
}
.ui.button {
font-size: 12px;
padding: 8px 10px;
}
}
}
}
}
&.file.list {
#repo-desc {
font-size: 1.2em;
@ -174,7 +204,7 @@
width: 100%;
.item {
margin-left: 0;
width: 50%;
width: 33.33%;
.text b {
font-size: 15px;
}

91
routers/repo/branch.go
Unescape View File

@ -5,33 +5,104 @@
package repo
import (
"time"
log "gopkg.in/clog.v1"
"github.com/gogits/git-module"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
)
const (
BRANCH base.TplName = "repo/branch"
BRANCHES_OVERVIEW base.TplName = "repo/branches/overview"
BRANCHES_ALL base.TplName = "repo/branches/all"
)
func Branches(ctx *context.Context) {
ctx.Data["Title"] = "Branches"
ctx.Data["IsRepoToolbarBranches"] = true
type Branch struct {
Name string
Commit *git.Commit
IsProtected bool
}
brs, err := ctx.Repo.GitRepo.GetBranches()
func loadBranches(ctx *context.Context) []*Branch {
rawBranches, err := ctx.Repo.Repository.GetBranches()
if err != nil {
ctx.Handle(500, "repo.Branches(GetBranches)", err)
ctx.Handle(500, "GetBranches", err)
return nil
}
protectBranches, err := models.GetProtectBranchesByRepoID(ctx.Repo.Repository.ID)
if err != nil {
ctx.Handle(500, "GetProtectBranchesByRepoID", err)
return nil
}
branches := make([]*Branch, len(rawBranches))
for i := range rawBranches {
commit, err := rawBranches[i].GetCommit()
if err != nil {
ctx.Handle(500, "GetCommit", err)
return nil
}
branches[i] = &Branch{
Name: rawBranches[i].Name,
Commit: commit,
}
for j := range protectBranches {
if branches[i].Name == protectBranches[j].Name {
branches[i].IsProtected = true
break
}
}
}
return branches
}
func Branches(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("repo.git_branches")
ctx.Data["PageIsBranchesOverview"] = true
branches := loadBranches(ctx)
if ctx.Written() {
return
} else if len(brs) == 0 {
ctx.Handle(404, "repo.Branches(GetBranches)", nil)
}
now := time.Now()
activeBranches := make([]*Branch, 0, 3)
staleBranches := make([]*Branch, 0, 3)
for i := range branches {
switch {
case branches[i].Name == ctx.Repo.BranchName:
ctx.Data["DefaultBranch"] = branches[i]
case branches[i].Commit.Committer.When.Add(30 * 24 * time.Hour).After(now): // 30 days
activeBranches = append(activeBranches, branches[i])
case branches[i].Commit.Committer.When.Add(3 * 30 * 24 * time.Hour).Before(now): // 90 days
staleBranches = append(staleBranches, branches[i])
}
}
ctx.Data["ActiveBranches"] = activeBranches
ctx.Data["StaleBranches"] = staleBranches
ctx.HTML(200, BRANCHES_OVERVIEW)
}
func AllBranches(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("repo.git_branches")
ctx.Data["PageIsBranchesAll"] = true
branches := loadBranches(ctx)
if ctx.Written() {
return
}
ctx.Data["Branches"] = branches
ctx.Data["Branches"] = brs
ctx.HTML(200, BRANCH)
ctx.HTML(200, BRANCHES_ALL)
}
func DeleteBranchPost(ctx *context.Context) {

2
templates/.VERSION
Unescape View File

@ -1 +1 @@
0.10.14.0310
0.10.15.0311

31
templates/repo/branches/all.tmpl
Unescape View File

@ -0,0 +1,31 @@
{{template "base/head" .}}
<div class="repository branches all">
{{template "repo/header" .}}
<div class="ui container">
<div class="navbar">
{{template "repo/branches/navbar" .}}
</div>
<div class="ui top attached header">
{{.i18n.Tr "repo.branches.all"}}
</div>
<div class="ui attached segment list">
{{range .Branches}}
<div class="item ui grid">
<div class="ui eleven wide column">
{{if .IsProtected}}<i class="octicon octicon-shield"></i> {{end}}<a class="markdown" href="{{$.RepoLink}}/src/{{.Name}}"><code>{{.Name}}</code></a>
{{$timeSince := TimeSince .Commit.Committer.When $.Lang}}
<span class="ui text light grey">{{$.i18n.Tr "repo.branches.updated_by" $timeSince .Commit.Committer.Name | Safe}}</span>
</div>
<div class="ui four wide column">
{{if eq $.BranchName .Name}}
<a class="ui basic blue button" href="{{$.RepoLink}}/settings/branches">{{$.i18n.Tr "repo.branches.change_default_branch"}}</a>
{{else}}
<a class="ui basic button" href="{{$.RepoLink}}/compare/{{$.DefaultBranch.Name}}...{{.Name}}"><i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.pulls.new"}}</a>
{{end}}
</div>
</div>
{{end}}
</div>
</div>
</div>
{{template "base/footer" .}}

4
templates/repo/branches/navbar.tmpl
Unescape View File

@ -0,0 +1,4 @@
<div class="ui compact small menu">
<a class="{{if .PageIsBranchesOverview}}active{{end}} item" href="{{.RepoLink}}/branches">{{.i18n.Tr "repo.branches.overview"}}</a>
<a class="{{if .PageIsBranchesAll}}active{{end}} item" href="{{.RepoLink}}/branches/all">{{.i18n.Tr "repo.branches.all"}}</a>
</div>

62
templates/repo/branches/overview.tmpl
Unescape View File

@ -0,0 +1,62 @@
{{template "base/head" .}}
<div class="repository branches overview">
{{template "repo/header" .}}
<div class="ui container">
<div class="navbar">
{{template "repo/branches/navbar" .}}
</div>
<div class="ui top attached header">
{{.i18n.Tr "repo.settings.default_branch"}}
</div>
<div class="ui attached segment list">
<div class="item ui grid">
<div class="ui eleven wide column">
{{if .DefaultBranch.IsProtected}}<i class="octicon octicon-shield"></i> {{end}}<a class="markdown" href="{{$.RepoLink}}/src/{{.DefaultBranch.Name}}"><code>{{.DefaultBranch.Name}}</code></a>
{{$timeSince := TimeSince .DefaultBranch.Commit.Committer.When $.Lang}}
<span class="ui text light grey">{{$.i18n.Tr "repo.branches.updated_by" $timeSince .DefaultBranch.Commit.Committer.Name | Safe}}</span>
</div>
<div class="ui four wide column">
<a class="ui basic blue button" href="{{$.RepoLink}}/settings/branches">{{.i18n.Tr "repo.branches.change_default_branch"}}</a>
</div>
</div>
</div>
{{if .ActiveBranches}}
<div class="ui top attached header">
{{.i18n.Tr "repo.branches.active_branches"}}
</div>
<div class="ui attached segment list">
{{range .ActiveBranches}}
<div class="item ui grid">
<div class="ui eleven wide column">
{{if .IsProtected}}<i class="octicon octicon-shield"></i> {{end}}<a class="markdown" href="{{$.RepoLink}}/src/{{.Name}}"><code>{{.Name}}</code></a>
{{$timeSince := TimeSince .Commit.Committer.When $.Lang}}
<span class="ui text light grey">{{$.i18n.Tr "repo.branches.updated_by" $timeSince .Commit.Committer.Name | Safe}}</span>
</div>
<div class="ui four wide column">
<a class="ui basic button" href="{{$.RepoLink}}/compare/{{$.DefaultBranch.Name}}...{{.Name}}"><i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.pulls.new"}}</a>
</div>
</div>
{{end}}
</div>
{{end}}
{{if .StaleBranches}}
<div class="ui top attached header">
{{.i18n.Tr "repo.branches.stale_branches"}}
</div>
<div class="ui attached segment list">
{{range .StaleBranches}}
<div class="item ui grid">
<div class="ui fourteen wide column">
{{if .IsProtected}}<i class="octicon octicon-shield"></i> {{end}}<a class="markdown" href="{{$.RepoLink}}/src/{{.Name}}"><code>{{.Name}}</code></a>
{{$timeSince := TimeSince .Commit.Committer.When $.Lang}}
<span class="ui text light grey">{{$.i18n.Tr "repo.branches.updated_by" $timeSince .Commit.Committer.Name | Safe}}</span>
</div>
</div>
{{end}}
</div>
{{end}}
</div>
</div>
{{template "base/footer" .}}

3
templates/repo/home.tmpl
Unescape View File

@ -14,6 +14,9 @@
<a href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}"><span class="ui text black"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr "repo.commits"}}</span> </a>
</div>
<div class="item">
<a href="{{.RepoLink}}/branches"><span class="ui text black"><i class="octicon octicon-git-branch"></i><b>{{.BrancheCount}}</b> {{.i18n.Tr "repo.git_branches"}}</span> </a>
</div>
<div class="item">
<a href="{{.RepoLink}}/releases"><span class="ui text black"><i class="octicon octicon-tag"></i> <b>{{.Repository.NumTags}}</b> {{.i18n.Tr "repo.releases"}}</span> </a>
</div>
</div>

Write Preview
Loading…
Cancel
Save