From c6e12d256833095d76bbb5755261507ecbdaada9 Mon Sep 17 00:00:00 2001 From: Gogs Date: Wed, 19 Mar 2014 23:23:30 +0800 Subject: add up url in file list --- routers/repo/single.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'routers/repo') diff --git a/routers/repo/single.go b/routers/repo/single.go index 171b0952..0bfc8ffb 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -5,6 +5,7 @@ package repo import ( + "fmt" "strings" "github.com/codegangsta/martini" @@ -87,6 +88,11 @@ func Single(ctx *middleware.Context, params martini.Params) { for i, _ := range treenames { Paths = append(Paths, strings.Join(treenames[0:i+1], "/")) } + + ctx.Data["HasParentPath"] = true + if len(Paths)-2 >= 0 { + ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2] + } } // Get latest commit according username and repo name @@ -126,6 +132,8 @@ func Single(ctx *middleware.Context, params martini.Params) { } } + fmt.Println(Paths) + ctx.Data["Paths"] = Paths ctx.Data["Treenames"] = treenames ctx.Data["IsRepoToolbarSource"] = true -- cgit v1.2.3 From 757f360949989214a9161f17a82aedf2b647457a Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Mar 2014 13:14:56 -0400 Subject: Render data in commit list page --- modules/base/template.go | 3 +++ routers/repo/repo.go | 6 +++--- routers/repo/single.go | 2 ++ templates/repo/commits.tmpl | 43 +++++++++++++++---------------------------- 4 files changed, 23 insertions(+), 31 deletions(-) (limited to 'routers/repo') diff --git a/modules/base/template.go b/modules/base/template.go index 5268da64..e596d1da 100644 --- a/modules/base/template.go +++ b/modules/base/template.go @@ -58,4 +58,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{ "Mail2Domain": func(mail string) string { return "mail." + strings.Split(mail, "@")[1] }, + "SubStr": func(str string, start, length int) string { + return str[start : start+length] + }, } diff --git a/routers/repo/repo.go b/routers/repo/repo.go index fb54d4ef..b38473b1 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -13,11 +13,11 @@ import ( func Create(ctx *middleware.Context, form auth.CreateRepoForm) { ctx.Data["Title"] = "Create repository" + ctx.Data["PageIsNewRepo"] = true // For navbar arrow. + ctx.Data["LanguageIgns"] = models.LanguageIgns + ctx.Data["Licenses"] = models.Licenses if ctx.Req.Method == "GET" { - ctx.Data["PageIsNewRepo"] = true // For navbar arrow. - ctx.Data["LanguageIgns"] = models.LanguageIgns - ctx.Data["Licenses"] = models.Licenses ctx.HTML(200, "repo/create", ctx.Data) return } diff --git a/routers/repo/single.go b/routers/repo/single.go index 0bfc8ffb..285c5277 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -186,6 +186,8 @@ func Commits(ctx *middleware.Context, params martini.Params) { ctx.Error(404) return } + ctx.Data["Username"] = params["username"] + ctx.Data["Reponame"] = params["reponame"] ctx.Data["Commits"] = commits ctx.HTML(200, "repo/commits", ctx.Data) } diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 53c14d36..04ca19af 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -13,41 +13,28 @@ - - - - - - + + + + + + + {{ $username := .Username}} + {{ $reponame := .Reponame}} + {{$r := List .Commits}} + {{range $r}} - - - - - - - - - - - - - - - - + + + + + {{end}}
AuthorCommitMessageDate
AuthorCommitMessageDate
CommitUserd91b380Fix Synchronize to delete service objects in subduers upon move3 years ago
CommitUserd91b380Fix Synchronize to delete service objects in subduers upon move3 years ago
CommitUserd91b380Fix Synchronize to delete service objects in subduers upon move3 years ago{{.Committer.Name}}{{SubStr .Id.String 0 7}} {{.Message}} {{TimeSince .Committer.When}}
- {{template "base/footer" .}} \ No newline at end of file -- cgit v1.2.3 From 601c10309dd93c55c3c825c5a5c2384d46493589 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Mar 2014 13:24:46 -0400 Subject: Bug fix --- modules/base/conf.go | 3 ++- routers/repo/single.go | 1 + templates/repo/commits.tmpl | 2 +- web.go | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) (limited to 'routers/repo') diff --git a/modules/base/conf.go b/modules/base/conf.go index 41226459..b003dea5 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -172,8 +172,9 @@ func init() { AppUrl = Cfg.MustValue("server", "ROOT_URL") Domain = Cfg.MustValue("server", "DOMAIN") SecretKey = Cfg.MustValue("security", "SECRET_KEY") +} - // Extensions. +func NewServices() { newService() newLogService() newMailService() diff --git a/routers/repo/single.go b/routers/repo/single.go index 285c5277..1c9b3594 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -188,6 +188,7 @@ func Commits(ctx *middleware.Context, params martini.Params) { } ctx.Data["Username"] = params["username"] ctx.Data["Reponame"] = params["reponame"] + ctx.Data["CommitCount"] = commits.Len() ctx.Data["Commits"] = commits ctx.HTML(200, "repo/commits", ctx.Data) } diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 04ca19af..8b4e41f7 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -9,7 +9,7 @@
-

Commits

+

{{.CommitCount}} Commits

diff --git a/web.go b/web.go index 2cf3ba09..2a9df17c 100644 --- a/web.go +++ b/web.go @@ -58,6 +58,7 @@ func newMartini() *martini.ClassicMartini { } func runWeb(*cli.Context) { + base.NewServices() checkRunMode() log.Info("%s %s", base.AppName, base.AppVer) -- cgit v1.2.3