Render data in commit list page

diff --git a/modules/base/template.go b/modules/base/template.go
index 5268da64903cd3c1e96dbe1ba5e342c5201b031d..e596d1dada650151d936f60abb901f0d45bfaffd 100644 (file)
--- 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 fb54d4ef8ba9fc03258982385945403b7b0a75fb..b38473b18a05ea06f3c80c289426e2d50f79ad1e 100644 (file)
--- 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 0bfc8ffb24a5cc69ede998b60e919c1652d5fb38..285c5277af88810bd260f604b5a0e89d23b9a4e7 100644 (file)
--- 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 53c14d364ab79e32c0ddb8470a557bc5e8fce688..04ca19afc88e949cd8608bea1c7ad8f301dc5ca9 100644 (file)
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -13,41 +13,28 @@
             </div>
             <table class="panel-footer table commit-list table table-striped">
                 <thead>
-                <tr>
-                    <th class="author">Author</th>
-                    <th class="sha">Commit</th>
-                    <th class="message">Message</th>
-                    <th class="date">Date</th>
-                </tr>
+                    <tr>
+                        <th class="author">Author</th>
+                        <th class="sha">Commit</th>
+                        <th class="message">Message</th>
+                        <th class="date">Date</th>
+                    </tr>
                 </thead>
                 <tbody>
+                {{ $username := .Username}}
+                {{ $reponame := .Reponame}}
+                {{$r := List .Commits}}
+                {{range $r}}
                 <tr>
-                    <td class="author"><img class="avatar" src="#" alt=""/>CommitUser</td>
-                    <td class="sha"><a class="label label-success" href="#">d91b380</a></td>
-                    <td class="message">Fix Synchronize to delete service objects in subduers upon move</td>
-                    <td class="date">3 years ago</td>
-                </tr>
-                <tr>
-                    <td class="author"><img class="avatar" src="#" alt=""/>CommitUser</td>
-                    <td class="sha"><a class="label label-success" href="#">d91b380</a></td>
-                    <td class="message">Fix Synchronize to delete service objects in subduers upon move</td>
-                    <td class="date">3 years ago</td>
-                </tr>
-                <tr>
-                    <td class="author"><img class="avatar" src="#" alt=""/>CommitUser</td>
-                    <td class="sha"><a class="label label-success" href="#">d91b380</a></td>
-                    <td class="message">Fix Synchronize to delete service objects in subduers upon move</td>
-                    <td class="date">3 years ago</td>
+                    <td class="author"><img class="avatar" src="{{AvatarLink .Committer.Email}}" alt=""/>{{.Committer.Name}}</td>
+                    <td class="sha"><a class="label label-success" href="/{{$username}}/{{$reponame}}/commit/{{.Id}} ">{{SubStr .Id.String 0 7}} </a></td>
+                    <td class="message">{{.Message}} </td>
+                    <td class="date">{{TimeSince .Committer.When}}</td>
                 </tr>
+                {{end}}
                 </tbody>
             </table>
         </div>
-    <ul>
-    {{$r := List .Commits}}
-    {{range $r}}
-                   <li>{{.Committer.Name}} - {{.Id}} - {{.Message}} - {{.Committer.When}}</li>
-    {{end}}
-    </ul>
     </div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file