merge

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 644403452576e0fd42038e70599bdf7eee1d120b..5769aff7c3a596480e08df0a00d862db132e7f27 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -6,8 +6,6 @@ package repo
 
 import (
        "net/http"
-
-       "github.com/codegangsta/martini"
        "github.com/martini-contrib/render"
        "github.com/martini-contrib/sessions"
 
@@ -87,20 +85,6 @@ func Delete(req *http.Request, r render.Render, data base.TmplData, session sess
        }
 }
 
-func Repo(params martini.Params, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
-       data["Title"] = "Repository"
-       files, err := models.GetReposFiles(params["username"], params["reponame"], "HEAD", "/")
-       if err != nil {
-               data["ErrorMsg"] = err
-               log.Error("repo.List: %v", err)
-               r.HTML(200, "base/error", data)
-               return
-       }
-
-       data["Files"] = files
-       r.HTML(200, "repo/repo", data)
-}
-
 func List(req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
        u := auth.SignedInUser(session)
        if u != nil {

diff --git a/routers/repo/single.go b/routers/repo/single.go
index be27db8e05ce9dae46ed235086f8958393764ef3..811aed39933845e3a0ab527e293673783e965255 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -1,16 +1,17 @@
 package repo
 
 import (
+       "net/http"
+
        "github.com/codegangsta/martini"
        "github.com/gogits/gogs/models"
        "github.com/gogits/gogs/modules/auth"
        "github.com/gogits/gogs/modules/base"
        "github.com/martini-contrib/render"
        "github.com/martini-contrib/sessions"
-       "net/http"
+       "github.com/qiniu/log"
 )
 
-
 func Single(params martini.Params, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
        var (
                user *models.User
@@ -52,5 +53,14 @@ func Single(params martini.Params, req *http.Request, r render.Render, data base
        data["RepositoryLink"] = data["Title"]
        data["IsRepoToolbarSource"] = true
 
+       files, err := models.GetReposFiles(params["username"], params["reponame"], "HEAD", "/")
+       if err != nil {
+               data["ErrorMsg"] = err
+               log.Error("repo.List: %v", err)
+               r.HTML(200, "base/error", data)
+               return
+       }
+
+       data["Files"] = files
        r.HTML(200, "repo/single", data)
 }

diff --git a/templates/repo/repo.tmpl b/templates/repo/repo.tmpl
deleted file mode 100644 (file)
index 5ae3f25..0000000
--- a/templates/repo/repo.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div class="container" id="gogs-body">
-       <ul>
-       {{range .Files}}
-               <li>{{.Name}} - {{.Type}}</li>
-       {{end}}
-       </ul>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl
index ef812f82492b430a905632d6712762f74506d602..9d4a24f851dfb60906c583075c90d8184068dc53 100644 (file)
--- a/templates/repo/single.tmpl
+++ b/templates/repo/single.tmpl
@@ -33,6 +33,10 @@
 </div>
 {{template "repo/toolbar" .}}
 <div id="gogs-body" class="container">
-    repo single dashboard
+    <ul>
+    {{range .Files}}
+        <li>{{.Name}} - {{.Type}}</li>
+    {{end}}
+    </ul>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file

diff --git a/web.go b/web.go
index c8b7ed0d4909fa0b6ab5a3661b00637f711403e3..c204131662c5dfd450b20dc067fd40cdba99937c 100644 (file)
--- a/web.go
+++ b/web.go
@@ -70,8 +70,6 @@ func runWeb(*cli.Context) {
 
        m.Get("/user/:username", auth.SignInRequire(false), user.Profile)
 
-       m.Get("/:username/:reponame", repo.Repo)
-
        m.Any("/repo/create", auth.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
        m.Any("/repo/delete", auth.SignInRequire(true), repo.Delete)
        m.Any("/repo/list", auth.SignInRequire(false), repo.List)