Browse Source

Merge pull request #2383 from exmex/develop

Added organization display on profile
pull/2277/merge
Unknwon 9 years ago
parent
commit
f75b5f4287
  1. 7
      routers/user/profile.go
  2. 9
      templates/user/profile.tmpl

7
routers/user/profile.go

@ -74,6 +74,13 @@ func Profile(ctx *middleware.Context) {
ctx.Data["Title"] = u.DisplayName()
ctx.Data["PageIsUserProfile"] = true
ctx.Data["Owner"] = u
orgs, err := models.GetOwnedOrgsByUserIDDesc(u.Id, "updated")
if err != nil {
ctx.Handle(500, "GetOwnedOrgsByUserIDDesc", err)
return
}
ctx.Data["Orgs"] = orgs
tab := ctx.Query("tab")
ctx.Data["TabName"] = tab

9
templates/user/profile.tmpl

@ -40,7 +40,7 @@
{{end}}
<li><i class="icon octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}</li>
<li>
<i class="user icon"></i>
<i class="icon octicon octicon-person"></i>
<a href="{{.Owner.HomeLink}}/followers">
{{.Owner.NumFollowers}} {{.i18n.Tr "user.followers"}}
</a>
@ -51,12 +51,17 @@
</li>
{{/*
<li>
<i class="octicon octicon-star"></i>
<i class="icon octicon octicon-star"></i>
<a href="{{.Owner.HomeLink}}/stars">
{{.Owner.NumStars}} {{.i18n.Tr "user.starred"}}
</a>
</li>
*/}}
<li>
{{range .Orgs}}
<a href="{{.HomeLink}}"><img class="ui mini image" src="{{.AvatarLink}}"></a>
{{end}}
</li>
{{if and .IsSigned (ne .SignedUserName .Owner.Name)}}
<li class="follow">
{{if .SignedUser.IsFollowing .Owner.Id}}

Loading…
Cancel
Save