display bare repo page

This commit is contained in:
slene 2014-03-30 11:38:41 +08:00
parent cd800d7837
commit 578d981d7e
4 changed files with 57 additions and 55 deletions

View file

@ -73,11 +73,30 @@ func RepoAssignment(redirect bool) martini.Handler {
gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName)) gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName))
if err != nil { if err != nil {
ctx.Handle(404, "RepoAssignment Invalid repo", err) ctx.Handle(404, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err)
return return
} }
ctx.Repo.GitRepo = gitRepo ctx.Repo.GitRepo = gitRepo
ctx.Repo.Owner = user
ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name
ctx.Data["Title"] = user.Name + "/" + repo.Name
ctx.Data["Repository"] = repo
ctx.Data["Owner"] = user
ctx.Data["RepoLink"] = ctx.Repo.RepoLink
ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner
ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName)
ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName)
ctx.Data["CloneLink"] = ctx.Repo.CloneLink
if repo.IsBare {
ctx.Data["IsBareRepo"] = true
ctx.HTML(200, "repo/single_bare")
return
}
detect: detect:
if len(branchName) > 0 { if len(branchName) > 0 {
// TODO check tag // TODO check tag
@ -117,19 +136,8 @@ func RepoAssignment(redirect bool) martini.Handler {
ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id)
} }
ctx.Repo.Owner = user
ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName)
ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName)
ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name
ctx.Data["BranchName"] = ctx.Repo.BranchName ctx.Data["BranchName"] = ctx.Repo.BranchName
ctx.Data["CommitId"] = ctx.Repo.CommitId ctx.Data["CommitId"] = ctx.Repo.CommitId
ctx.Data["Repository"] = repo
ctx.Data["Owner"] = user
ctx.Data["Title"] = user.Name + "/" + repo.Name
ctx.Data["CloneLink"] = ctx.Repo.CloneLink
ctx.Data["RepoLink"] = ctx.Repo.RepoLink
ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner
ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching
} }
} }

View file

@ -77,10 +77,6 @@ func Single(ctx *middleware.Context, params martini.Params) {
if err != nil { if err != nil {
ctx.Handle(404, "repo.Single(GetBranches)", err) ctx.Handle(404, "repo.Single(GetBranches)", err)
return return
} else if ctx.Repo.Repository.IsBare {
ctx.Data["IsBareRepo"] = true
ctx.HTML(200, "repo/single")
return
} }
ctx.Data["Branches"] = brs ctx.Data["Branches"] = brs
@ -264,12 +260,6 @@ func Setting(ctx *middleware.Context, params martini.Params) {
ctx.Data["IsRepoToolbarSetting"] = true ctx.Data["IsRepoToolbarSetting"] = true
if ctx.Repo.Repository.IsBare {
ctx.Data["IsBareRepo"] = true
ctx.HTML(200, "repo/setting")
return
}
var title string var title string
if t, ok := ctx.Data["Title"].(string); ok { if t, ok := ctx.Data["Title"].(string); ok {
title = t title = t

View file

@ -4,9 +4,6 @@
{{template "repo/toolbar" .}} {{template "repo/toolbar" .}}
<div id="body" class="container"> <div id="body" class="container">
<div id="source"> <div id="source">
{{if .IsBareRepo}}
{{template "repo/single_bare" .}}
{{else}}
<div class="source-toolbar"> <div class="source-toolbar">
{{ $n := len .Treenames}} {{ $n := len .Treenames}}
{{if not .IsFile}}<button class="btn btn-default pull-right hidden"><i class="fa fa-plus-square"></i>Add File</button>{{end}} {{if not .IsFile}}<button class="btn btn-default pull-right hidden"><i class="fa fa-plus-square"></i>Add File</button>{{end}}
@ -38,7 +35,6 @@
{{else}} {{else}}
{{template "repo/single_list" .}} {{template "repo/single_list" .}}
{{end}} {{end}}
{{end}}
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

View file

@ -1,3 +1,8 @@
{{template "base/head" .}}
{{template "base/navbar" .}}
{{template "repo/nav" .}}
<div id="body" class="container">
<div id="source">
<div class="panel panel-default guide-box clone-group-btn"> <div class="panel panel-default guide-box clone-group-btn">
<div class="panel-heading guide-head"> <div class="panel-heading guide-head">
<h4>Quick Guide</h4> <h4>Quick Guide</h4>
@ -29,3 +34,6 @@ git push -u origin master</code></pre>
git push -u origin master</code></pre> git push -u origin master</code></pre>
</div> </div>
</div> </div>
</div>
</div>
{{template "base/footer" .}}