diff options
| author | slene <vslene@gmail.com> | 2014-03-16 00:15:26 +0800 |
|---|---|---|
| committer | slene <vslene@gmail.com> | 2014-03-16 00:15:26 +0800 |
| commit | 3d032dfb5a287f333f78748546f9737f20edeb50 (patch) | |
| tree | 9086775d52839c7bf493ccdcc124957b10c76764 | |
| parent | f18c8fc4d98bfb09719d7be0f246934257725142 (diff) | |
| parent | f026ae86528bd77c6af5a72aa780e1b9d6064524 (diff) | |
| download | gitea-3d032dfb5a287f333f78748546f9737f20edeb50.tar.gz gitea-3d032dfb5a287f333f78748546f9737f20edeb50.zip | |
Merge branch 'master' of github.com:gogits/gogs
| -rw-r--r-- | routers/repo/repo.go | 17 | ||||
| -rw-r--r-- | routers/repo/single.go | 1 | ||||
| -rw-r--r-- | routers/user/user.go | 7 | ||||
| -rw-r--r-- | templates/user/dashboard.tmpl | 8 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 8 | ||||
| -rw-r--r-- | web.go | 1 |
6 files changed, 17 insertions, 25 deletions
diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 23f8ea107c..116c199b7d 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -67,20 +67,3 @@ func Delete(ctx *middleware.Context, form auth.DeleteRepoForm) { ctx.Render.Redirect("/", 302) } - -func List(ctx *middleware.Context) { - if ctx.User != nil { - ctx.Render.Redirect("/") - return - } - - ctx.Data["Title"] = "Repositories" - repos, err := models.GetRepositories(ctx.User) - if err != nil { - ctx.Handle(200, "repo.List", err) - return - } - - ctx.Data["Repos"] = repos - ctx.Render.HTML(200, "repo/list", ctx.Data) -} diff --git a/routers/repo/single.go b/routers/repo/single.go index bd5cfa1196..a7f07898f0 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -43,7 +43,6 @@ func Single(ctx *middleware.Context, params martini.Params) { ctx.Data["Treenames"] = treenames ctx.Data["IsRepoToolbarSource"] = true ctx.Data["Files"] = files - ctx.Render.HTML(200, "repo/single", ctx.Data) } diff --git a/routers/user/user.go b/routers/user/user.go index 4ba7da1615..8d8691a39f 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -60,7 +60,12 @@ func Profile(ctx *middleware.Context, params martini.Params) { } ctx.Data["Feeds"] = feeds default: - + repos, err := models.GetRepositories(user) + if err != nil { + ctx.Handle(200, "user.Profile", err) + return + } + ctx.Data["Repos"] = repos } ctx.Render.HTML(200, "user/profile", ctx.Data) diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl index 306c3bc15d..547e8ab556 100644 --- a/templates/user/dashboard.tmpl +++ b/templates/user/dashboard.tmpl @@ -4,9 +4,9 @@ <div class="container"> <ul class="nav nav-pills pull-right"> <li class="active"><a href="/">Feed</a></li> - <li><a href="/issues/">Issues</a></li> - <li><a href="/pulls/">Pull Requests</a></li> - <li><a href="/stars/">Stars</a></li> + <li><a href="/issues">Issues</a></li> + <li><a href="/pulls">Pull Requests</a></li> + <li><a href="/stars">Stars</a></li> </ul> <h3>News Feed</h3> </div> @@ -29,7 +29,7 @@ <div id="gogs-feed-right" class="col-md-4"> <div class="panel panel-default repo-panel"> <div class="panel-heading">Your Repositories - <a class="btn btn-success pull-right btn-sm" href="/repo/create/"><i class="fa fa-plus-square"></i>New Repo</a> + <a class="btn btn-success pull-right btn-sm" href="/repo/create"><i class="fa fa-plus-square"></i>New Repo</a> </div> <div class="panel-body"> <ul class="list-group">{{range .MyRepos}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 9444452012..aa15cb88bb 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -44,7 +44,13 @@ </ul> </div> {{else}} - <div class="tab-pane active">repo</div> + {{$owner := .Owner}} + <div class="tab-pane active"> + {{range .Repos}} + <h4><a href="/{{$owner.Name}}/{{.LowerName}}">{{.LowerName}}</a> <small>Star:{{.NumStars}} Fork:{{.NumForks}}</small></h4> + <p>{{.Description}}</p> + {{end}} + </div> {{end}} </div> </div> @@ -66,7 +66,6 @@ func runWeb(*cli.Context) { m.Any("/repo/create", middleware.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create) m.Any("/repo/delete", middleware.SignInRequire(true), binding.Bind(auth.DeleteRepoForm{}), repo.Delete) - m.Any("/repo/list", middleware.SignInRequire(false), repo.List) m.Get("/:username/:reponame/settings", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Setting) m.Get("/:username/:reponame/tree/:branchname/**", |