Added organization display on profile
Fixed "Follower" Icon too big
This commit is contained in:
parent
fc4a4d38d1
commit
f610bfa8a2
2 changed files with 14 additions and 2 deletions
|
@ -74,6 +74,13 @@ func Profile(ctx *middleware.Context) {
|
||||||
ctx.Data["Title"] = u.DisplayName()
|
ctx.Data["Title"] = u.DisplayName()
|
||||||
ctx.Data["PageIsUserProfile"] = true
|
ctx.Data["PageIsUserProfile"] = true
|
||||||
ctx.Data["Owner"] = u
|
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")
|
tab := ctx.Query("tab")
|
||||||
ctx.Data["TabName"] = tab
|
ctx.Data["TabName"] = tab
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
<li><i class="icon octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}</li>
|
<li><i class="icon octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}</li>
|
||||||
<li>
|
<li>
|
||||||
<i class="user icon"></i>
|
<i class="icon octicon octicon-person"></i>
|
||||||
<a href="{{.Owner.HomeLink}}/followers">
|
<a href="{{.Owner.HomeLink}}/followers">
|
||||||
{{.Owner.NumFollowers}} {{.i18n.Tr "user.followers"}}
|
{{.Owner.NumFollowers}} {{.i18n.Tr "user.followers"}}
|
||||||
</a>
|
</a>
|
||||||
|
@ -51,12 +51,17 @@
|
||||||
</li>
|
</li>
|
||||||
{{/*
|
{{/*
|
||||||
<li>
|
<li>
|
||||||
<i class="octicon octicon-star"></i>
|
<i class="icon octicon octicon-star"></i>
|
||||||
<a href="{{.Owner.HomeLink}}/stars">
|
<a href="{{.Owner.HomeLink}}/stars">
|
||||||
{{.Owner.NumStars}} {{.i18n.Tr "user.starred"}}
|
{{.Owner.NumStars}} {{.i18n.Tr "user.starred"}}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
*/}}
|
*/}}
|
||||||
|
<li>
|
||||||
|
{{range .Orgs}}
|
||||||
|
<img class="ui mini image" src="{{.AvatarLink}}">
|
||||||
|
{{end}}
|
||||||
|
</li>
|
||||||
{{if and .IsSigned (ne .SignedUserName .Owner.Name)}}
|
{{if and .IsSigned (ne .SignedUserName .Owner.Name)}}
|
||||||
<li class="follow">
|
<li class="follow">
|
||||||
{{if .SignedUser.IsFollowing .Owner.Id}}
|
{{if .SignedUser.IsFollowing .Owner.Id}}
|
||||||
|
|
Reference in a new issue