Fix commit feed ui

diff --git a/gogs.go b/gogs.go
index 9d1f2032d6ede38b0357ec591ca8bfad4df94e4b..2d5283f3af844def8c5866af56a71eda14c72a99 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -20,7 +20,7 @@ import (
 // Test that go1.1 tag above is included in builds. main.go refers to this definition.
 const go11tag = true
 
-const APP_VER = "0.0.8.0316.1"
+const APP_VER = "0.0.9.0316.1"
 
 func init() {
        base.AppVer = APP_VER

diff --git a/modules/base/tool.go b/modules/base/tool.go
index 5746cc8fb270a1a1255c7665e1f92076e74115fb..10b3fee3753f490c6a572f90e8dcb0bad4dfe5eb 100644 (file)
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -5,6 +5,7 @@
 package base
 
 import (
+       "bytes"
        "crypto/md5"
        "encoding/hex"
        "encoding/json"
@@ -253,16 +254,14 @@ func ActionIcon(opType int) string {
 }
 
 const (
-       TPL_CREATE_REPO = `<a href="/user/%s">%s</a> created repository <a href="/%s/%s">%s</a>`
-       TPL_COMMIT_REPO = `<a href="/user/%s">%s</a> pushed to <a href="/%s/%s/tree/%s">%s</a> at <a href="/%s/%s">%s/%s</a>
-<ul>
-       <li><a href="/%s/%s/commit/%s">%s</a> %s</li>   
-</ul>`
+       TPL_CREATE_REPO    = `<a href="/user/%s">%s</a> created repository <a href="/%s/%s">%s</a>`
+       TPL_COMMIT_REPO    = `<a href="/user/%s">%s</a> pushed to <a href="/%s/%s/tree/%s">%s</a> at <a href="/%s/%s">%s/%s</a>%s`
+       TPL_COMMIT_REPO_LI = `<div><img id="gogs-user-avatar-commit" src="%s?s=16" alt="user-avatar" title="username"/> <a href="/%s/%s/commit/%s">%s</a> %s</div>`
 )
 
 // ActionDesc accepts int that represents action operation type
 // and returns the description.
-func ActionDesc(act Actioner) string {
+func ActionDesc(act Actioner, avatarLink string) string {
        actUserName := act.GetActUserName()
        repoName := act.GetRepoName()
        content := act.GetContent()
@@ -274,8 +273,12 @@ func ActionDesc(act Actioner) string {
                if err := json.Unmarshal([]byte(content), &commits); err != nil {
                        return err.Error()
                }
+               buf := bytes.NewBuffer([]byte("\n"))
+               for _, commit := range commits {
+                       buf.WriteString(fmt.Sprintf(TPL_COMMIT_REPO_LI, avatarLink, actUserName, repoName, commit[0], commit[0][:7], commit[1]) + "\n")
+               }
                return fmt.Sprintf(TPL_COMMIT_REPO, actUserName, actUserName, actUserName, repoName, "master", "master", actUserName, repoName, actUserName, repoName,
-                       actUserName, repoName, commits[0][0], commits[0][0][:7], commits[0][1])
+                       buf.String())
        default:
                return "invalid type"
        }

diff --git a/public/css/gogs.css b/public/css/gogs.css
index 89da6055b82204200d839d43b8b87d778c90bf3d..45ce5d21d5bf1e3a68c7e8b42f6926737e406702 100755 (executable)
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -228,6 +228,12 @@ html, body {
     border-radius: 6px;
 }
 
+#gogs-user-avatar-commit {
+    width: 16px;
+    height: 16px;
+    border-radius: 2px;
+}
+
 #gogs-user-name {
     margin-top: 20px;
     font-size: 1.6em;

diff --git a/routers/user/user.go b/routers/user/user.go
index 0ff5058dcc0a10897e92f4dfd666f68d889a9aa3..c43cf84a24962474070944176e30d1322481a18e 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -195,7 +195,7 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
        feeds := make([]string, len(actions))
        for i := range actions {
                feeds[i] = fmt.Sprintf(feedTpl, base.ActionIcon(actions[i].OpType),
-                       base.TimeSince(actions[i].Created), base.ActionDesc(actions[i]))
+                       base.TimeSince(actions[i].Created), base.ActionDesc(actions[i], ctx.User.AvatarLink()))
        }
        ctx.Render.JSON(200, &feeds)
 }

diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 84d3b13c92d285ded54f47137361a17842cddfc7..24ae76fef852bf8fba44c2a79fdc14263521b7b9 100644 (file)
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -32,10 +32,11 @@
             {{if eq .TabName "activity"}}
             <div class="tab-pane active">
                 <ul class="list-unstyled activity-list">
+                {{$avatarLink := .Owner.AvatarLink}}
                 {{range .Feeds}}
                     <li>
                         <i class="icon fa fa-{{ActionIcon .OpType}}"></i>
-                        <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . | str2html}}</div>
+                        <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $avatarLink | str2html}}</div>
                         <span class="clearfix"></span>
                     </li>
                 {{else}}