@@ -1,8 +1,9 @@ | |||
The issue will be closed without any reasons if it does not satisfy any of following requirements: | |||
1. Please do NOT post questions or config/deploy problems on GitHub, please use our forum: https://discuss.gogs.io | |||
2. Please take a moment to search that an issue doesn't already exist. | |||
3. Please give all relevant information below for bug reports; incomplete details considered invalid report. | |||
1. Please speak English, we have forum in [Chinese](https://discuss.gogs.io/c/getting-help/getting-help-chinese). | |||
2. Please post questions or config/deploy problems on our forum: https://discuss.gogs.io, here are bugs and feature requests only. | |||
3. Please take a moment to search that an issue doesn't already exist. | |||
4. Please give all relevant information below for bug reports; incomplete details considered invalid report. | |||
**You MUST delete above content including this line before posting; too lazy to take this action considered invalid report.** | |||
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra | |||
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) | |||
##### Current tip version: 0.9.61 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) | |||
##### Current tip version: 0.9.62 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) | |||
| Web | UI | Preview | | |||
|:-------------:|:-------:|:-------:| |
@@ -31,6 +31,7 @@ ilko <kontact-mr.k AT outlook DOT com"> | |||
Ilya Makarov | |||
Jamie Mansfield <dev AT jamierocks DOT uk> | |||
Jean THOMAS <contact AT tibounise DOT com> | |||
Joubert RedRat <me+github AT redrat DOT com DOT br> | |||
Juraj Bubniak <contact AT jbub DOT eu> | |||
Lafriks <lafriks AT gmail DOT com> | |||
Lauri Ojansivu <x AT xet7 DOT org> |
@@ -17,7 +17,7 @@ import ( | |||
"github.com/gogits/gogs/modules/setting" | |||
) | |||
const APP_VER = "0.9.61.0804" | |||
const APP_VER = "0.9.62.0805" | |||
func init() { | |||
runtime.GOMAXPROCS(runtime.NumCPU()) |
@@ -288,7 +288,7 @@ func (push *PushCommits) AvatarLink(email string) string { | |||
log.Error(4, "GetUserByEmail: %v", err) | |||
} | |||
} else { | |||
push.avatars[email] = u.AvatarLink() | |||
push.avatars[email] = u.RelAvatarLink() | |||
} | |||
} | |||
@@ -254,11 +254,11 @@ func (u *User) RelAvatarLink() string { | |||
return setting.GravatarSource + u.Avatar | |||
} | |||
// AvatarLink returns user avatar link. | |||
// AvatarLink returns user avatar absolute link. | |||
func (u *User) AvatarLink() string { | |||
link := u.RelAvatarLink() | |||
if link[0] == '/' && link[1] != '/' { | |||
return strings.TrimSuffix(setting.AppUrl, "/") + link | |||
return setting.AppUrl + link[1:] | |||
} | |||
return link | |||
} |
@@ -77,7 +77,7 @@ func retrieveFeeds(ctx *context.Context, ctxUser *models.User, userID, offset in | |||
ctx.Handle(500, "GetUserByName", err) | |||
return | |||
} | |||
unameAvatars[act.ActUserName] = u.AvatarLink() | |||
unameAvatars[act.ActUserName] = u.RelAvatarLink() | |||
} | |||
act.ActAvatar = unameAvatars[act.ActUserName] |
@@ -1 +1 @@ | |||
0.9.61.0804 | |||
0.9.62.0805 |
@@ -90,7 +90,7 @@ | |||
<div class="ui dropdown head link jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted"> | |||
<span class="text avatar"> | |||
<img class="ui small rounded image" src="{{.SignedUser.AvatarLink}}"> | |||
<img class="ui small rounded image" src="{{.SignedUser.RelAvatarLink}}"> | |||
<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span> | |||
<i class="octicon octicon-triangle-down" tabindex="-1"></i> | |||
</span> |
@@ -9,7 +9,7 @@ | |||
<div class="ui user list"> | |||
{{range .Users}} | |||
<div class="item"> | |||
<img class="ui avatar image" src="{{.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | |||
<div class="content"> | |||
<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> | |||
<div class="description"> |
@@ -3,7 +3,7 @@ | |||
<div class="ui vertically grid head"> | |||
<div class="column"> | |||
<div class="ui header"> | |||
<img class="ui image" src="{{.AvatarLink}}?s=100"> | |||
<img class="ui image" src="{{.RelAvatarLink}}?s=100"> | |||
<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span> | |||
<div class="ui right"> |
@@ -3,7 +3,7 @@ | |||
<div class="ui container"> | |||
<div class="ui grid"> | |||
<div class="ui sixteen wide column"> | |||
<img class="ui left" id="org-avatar" src="{{.Org.AvatarLink}}?s=140"/> | |||
<img class="ui left" id="org-avatar" src="{{.Org.RelAvatarLink}}?s=140"/> | |||
<div id="org-info"> | |||
<div class="ui header"> | |||
{{.Org.DisplayName}} | |||
@@ -48,7 +48,7 @@ | |||
{{$isMember := .IsOrganizationMember}} | |||
{{range .Members}} | |||
{{if or $isMember (.IsPublicMember $.Org.ID)}} | |||
<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar" src="{{.AvatarLink}}"></a> | |||
<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar" src="{{.RelAvatarLink}}"></a> | |||
{{end}} | |||
{{end}} | |||
</div> |
@@ -14,7 +14,7 @@ | |||
{{range .Members}} | |||
<div class="item ui grid"> | |||
<div class="ui one wide column"> | |||
<img class="ui avatar" src="{{.AvatarLink}}?s=48"> | |||
<img class="ui avatar" src="{{.RelAvatarLink}}?s=48"> | |||
</div> | |||
<div class="ui three wide column"> | |||
<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div> |
@@ -16,7 +16,7 @@ | |||
<a class="ui red small button right" href="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/remove?uid={{.ID}}">{{$.i18n.Tr "org.members.remove"}}</a> | |||
{{end}} | |||
<a href="{{.HomeLink}}"> | |||
<img class="ui avatar image" src="{{.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | |||
{{.DisplayName}} | |||
</a> | |||
</div> |
@@ -26,7 +26,7 @@ | |||
<div class="ui attached segment members"> | |||
{{range .Members}} | |||
<a href="{{.HomeLink}}" title="{{.Name}}"> | |||
<img class="ui avatar image" src="{{.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | |||
</a> | |||
{{end}} | |||
</div> |
@@ -30,7 +30,7 @@ | |||
<tr> | |||
<td class="author"> | |||
{{if .User}} | |||
<img class="ui avatar image" src="{{.User.AvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.Author.Name}}</a> | |||
<img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.Author.Name}}</a> | |||
{{else}} | |||
<img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/> {{.Author.Name}} | |||
{{end}} |
@@ -14,18 +14,18 @@ | |||
<div class="ui selection owner dropdown"> | |||
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> | |||
<span class="text"> | |||
<img class="ui mini image" src="{{.ContextUser.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> | |||
{{.ContextUser.ShortName 20}} | |||
</span> | |||
<i class="dropdown icon"></i> | |||
<div class="menu"> | |||
<div class="item" data-value="{{.SignedUser.ID}}"> | |||
<img class="ui mini image" src="{{.SignedUser.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> | |||
{{.SignedUser.ShortName 20}} | |||
</div> | |||
{{range .Orgs}} | |||
<div class="item" data-value="{{.ID}}"> | |||
<img class="ui mini image" src="{{.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.RelAvatarLink}}"> | |||
{{.ShortName 20}} | |||
</div> | |||
{{end}} |
@@ -13,7 +13,7 @@ | |||
</div> | |||
<div class="ui attached info segment"> | |||
{{if .Author}} | |||
<img class="ui avatar image" src="{{.Author.AvatarLink}}" /> | |||
<img class="ui avatar image" src="{{.Author.RelAvatarLink}}" /> | |||
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} | |||
{{else}} | |||
<img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" /> |
@@ -8,7 +8,7 @@ | |||
<div class="ui list"> | |||
{{range .Forks}} | |||
<div class="item"> | |||
<img class="ui avatar image" src="{{.Owner.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.Owner.RelAvatarLink}}"> | |||
<div class="link"> | |||
<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a> | |||
/ |
@@ -61,7 +61,7 @@ | |||
<div class="menu"> | |||
<a class="item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_assginee_no_select"}}</a> | |||
{{range .Assignees}} | |||
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{.ID}}"><img src="{{.AvatarLink}}"> {{.Name}}</a> | |||
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{.ID}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</a> | |||
{{end}} | |||
</div> | |||
</div> | |||
@@ -121,7 +121,7 @@ | |||
{{end}} | |||
{{if .Assignee}} | |||
<a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center"> | |||
<img class="ui avatar image" src="{{.Assignee.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> | |||
</a> | |||
{{end}} | |||
</p> |
@@ -9,7 +9,7 @@ | |||
<div class="ui comments"> | |||
<div class="comment"> | |||
<a class="avatar" href="{{.SignedUser.HomeLink}}"> | |||
<img src="{{.SignedUser.AvatarLink}}"> | |||
<img src="{{.SignedUser.RelAvatarLink}}"> | |||
</a> | |||
<div class="ui segment content"> | |||
<div class="field"> | |||
@@ -104,7 +104,7 @@ | |||
<div class="menu"> | |||
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div> | |||
{{range .Assignees}} | |||
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.AvatarLink}}"><img src="{{.AvatarLink}}"> {{.Name}}</div> | |||
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.RelAvatarLink}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
@@ -112,7 +112,7 @@ | |||
<span class="no-select item {{if .Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span> | |||
<div class="selected"> | |||
{{if .Assignee}} | |||
<a class="item" href="{{.RepoLink}}/issues?assignee={{.Assignee.ID}}"><img class="ui avatar image" src="{{.Assignee.AvatarLink}}"> {{.Assignee.Name}}</a> | |||
<a class="item" href="{{.RepoLink}}/issues?assignee={{.Assignee.ID}}"><img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> {{.Assignee.Name}}</a> | |||
{{end}} | |||
</div> | |||
</div> |
@@ -13,7 +13,7 @@ | |||
<ui class="ui comments"> | |||
<div class="comment"> | |||
<a class="avatar" {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}> | |||
<img src="{{.Issue.Poster.AvatarLink}}"> | |||
<img src="{{.Issue.Poster.RelAvatarLink}}"> | |||
</a> | |||
<div class="content"> | |||
<div class="ui top attached header"> | |||
@@ -56,7 +56,7 @@ | |||
{{if eq .Type 0}} | |||
<div class="comment" id="{{.HashTag}}"> | |||
<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}> | |||
<img src="{{.Poster.AvatarLink}}"> | |||
<img src="{{.Poster.RelAvatarLink}}"> | |||
</a> | |||
<div class="content"> | |||
<div class="ui top attached header"> | |||
@@ -107,7 +107,7 @@ | |||
<div class="event"> | |||
<span class="octicon octicon-primitive-dot"></span> | |||
<a class="ui avatar image" href="{{.Poster.HomeLink}}"> | |||
<img src="{{.Poster.AvatarLink}}"> | |||
<img src="{{.Poster.RelAvatarLink}}"> | |||
</a> | |||
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}</span> | |||
</div> | |||
@@ -115,7 +115,7 @@ | |||
<div class="event"> | |||
<span class="octicon octicon-circle-slash"></span> | |||
<a class="ui avatar image" href="{{.Poster.HomeLink}}"> | |||
<img src="{{.Poster.AvatarLink}}"> | |||
<img src="{{.Poster.RelAvatarLink}}"> | |||
</a> | |||
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span> | |||
</div> | |||
@@ -123,7 +123,7 @@ | |||
<div class="event"> | |||
<span class="octicon octicon-bookmark"></span> | |||
<a class="ui avatar image" href="{{.Poster.HomeLink}}"> | |||
<img src="{{.Poster.AvatarLink}}"> | |||
<img src="{{.Poster.RelAvatarLink}}"> | |||
</a> | |||
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span> | |||
@@ -199,7 +199,7 @@ | |||
{{if .IsSigned}} | |||
<div class="comment form"> | |||
<a class="avatar" href="{{.SignedUser.HomeLink}}"> | |||
<img src="{{.SignedUser.AvatarLink}}"> | |||
<img src="{{.SignedUser.RelAvatarLink}}"> | |||
</a> | |||
<div class="content"> | |||
<form class="ui segment form" id="comment-form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/comments" method="post"> | |||
@@ -309,7 +309,7 @@ | |||
<div class="menu" data-action="update" data-update-url="{{$.RepoLink}}/issues/{{$.Issue.Index}}/assignee"> | |||
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div> | |||
{{range .Assignees}} | |||
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.AvatarLink}}"><img src="{{.AvatarLink}}"> {{.Name}}</div> | |||
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.RelAvatarLink}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
@@ -317,7 +317,7 @@ | |||
<span class="no-select item {{if .Issue.Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span> | |||
<div class="selected"> | |||
{{if .Issue.Assignee}} | |||
<a class="item" href="{{$.RepoLink}}/issues?assignee={{.Issue.Assignee.ID}}"><img class="ui avatar image" src="{{.Issue.Assignee.AvatarLink}}"> {{.Issue.Assignee.Name}}</a> | |||
<a class="item" href="{{$.RepoLink}}/issues?assignee={{.Issue.Assignee.ID}}"><img class="ui avatar image" src="{{.Issue.Assignee.RelAvatarLink}}"> {{.Issue.Assignee.Name}}</a> | |||
{{end}} | |||
</div> | |||
</div> | |||
@@ -329,7 +329,7 @@ | |||
<div> | |||
{{range .Participants}} | |||
<a href="{{.HomeLink}}"> | |||
<img class="ui avatar image poping up" src="{{.AvatarLink}}" data-content="{{.DisplayName}}" data-position="top center" data-variation="small inverted"> | |||
<img class="ui avatar image poping up" src="{{.RelAvatarLink}}" data-content="{{.DisplayName}}" data-position="top center" data-variation="small inverted"> | |||
</a> | |||
{{end}} | |||
</div> |
@@ -39,18 +39,18 @@ | |||
<div class="ui selection owner dropdown"> | |||
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> | |||
<span class="text"> | |||
<img class="ui mini image" src="{{.ContextUser.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> | |||
{{.ContextUser.ShortName 20}} | |||
</span> | |||
<i class="dropdown icon"></i> | |||
<div class="menu"> | |||
<div class="item" data-value="{{.SignedUser.ID}}"> | |||
<img class="ui mini image" src="{{.SignedUser.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> | |||
{{.SignedUser.ShortName 20}} | |||
</div> | |||
{{range .Orgs}} | |||
<div class="item" data-value="{{.ID}}"> | |||
<img class="ui mini image" src="{{.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.RelAvatarLink}}"> | |||
{{.ShortName 20}} | |||
</div> | |||
{{end}} |
@@ -14,19 +14,19 @@ | |||
<div class="ui selection owner dropdown"> | |||
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> | |||
<span class="text"> | |||
<img class="ui mini image" src="{{.ContextUser.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}"> | |||
{{.ContextUser.ShortName 20}} | |||
</span> | |||
<i class="dropdown icon"></i> | |||
<div class="menu"> | |||
<div class="item" data-value="{{.SignedUser.ID}}"> | |||
<img class="ui mini image" src="{{.SignedUser.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> | |||
{{.SignedUser.ShortName 20}} | |||
</div> | |||
{{range .Orgs}} | |||
{{if .IsOwnedBy $.SignedUser.ID}} | |||
<div class="item" data-value="{{.ID}}"> | |||
<img class="ui mini image" src="{{.AvatarLink}}"> | |||
<img class="ui mini image" src="{{.RelAvatarLink}}"> | |||
{{.ShortName 20}} | |||
</div> | |||
{{end}} |
@@ -41,7 +41,7 @@ | |||
</h3> | |||
<p class="text grey"> | |||
<span class="author"> | |||
<img class="img-10" src="{{.Publisher.AvatarLink}}"> | |||
<img class="img-10" src="{{.Publisher.RelAvatarLink}}"> | |||
<a href="{{AppSubUrl}}/{{.Publisher.Name}}">{{.Publisher.Name}}</a> | |||
</span> | |||
{{if .Created}}<span class="time">{{TimeSince .Created $.Lang}}</span>{{end}} |
@@ -14,7 +14,7 @@ | |||
<div class="item ui grid"> | |||
<div class="ui five wide column"> | |||
<a href="{{AppSubUrl}}/{{.Name}}"> | |||
<img class="ui avatar image" src="{{.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | |||
{{.DisplayName}} | |||
</a> | |||
</div> |
@@ -6,7 +6,7 @@ | |||
{{range .Cards}} | |||
<li class="item ui segment"> | |||
<a href="{{.HomeLink}}"> | |||
<img class="avatar" src="{{.AvatarLink}}"/> | |||
<img class="avatar" src="{{.RelAvatarLink}}"/> | |||
</a> | |||
<h3 class="name"><a href="{{.HomeLink}}">{{.DisplayName}}</a></h3> | |||
@@ -3,7 +3,7 @@ | |||
<tr> | |||
<th class="four wide"> | |||
{{if .LastCommitUser}} | |||
<img class="ui avatar image img-12" src="{{.LastCommitUser.AvatarLink}}" /> | |||
<img class="ui avatar image img-12" src="{{.LastCommitUser.RelAvatarLink}}" /> | |||
<a href="{{AppSubUrl}}/{{.LastCommitUser.Name}}"><strong>{{.LastCommit.Author.Name}}</strong></a> | |||
{{else}} | |||
<img class="ui avatar image img-12" src="{{AvatarLink .LastCommit.Author.Email}}" /> |
@@ -72,7 +72,7 @@ | |||
{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} | |||
{{if .Assignee}} | |||
<a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center"> | |||
<img class="ui avatar image" src="{{.Assignee.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> | |||
</a> | |||
{{end}} | |||
</p> |
@@ -1,7 +1,7 @@ | |||
<div class="ui container"> | |||
<div class="ui floating dropdown link jump"> | |||
<span class="text"> | |||
<img class="ui avatar image" src="{{.ContextUser.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.ContextUser.RelAvatarLink}}"> | |||
{{.ContextUser.ShortName 20}} | |||
<i class="dropdown icon"></i> | |||
</span> | |||
@@ -11,12 +11,12 @@ | |||
</div> | |||
<div class="items"> | |||
<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}"> | |||
<img class="ui avatar image" src="{{.SignedUser.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.SignedUser.RelAvatarLink}}"> | |||
{{.SignedUser.Name}} | |||
</a> | |||
{{range .Orgs}} | |||
<a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else}}dashboard{{end}}"> | |||
<img class="ui avatar image" src="{{.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | |||
{{.ShortName 20}} | |||
</a> | |||
{{end}} |
@@ -1,13 +1,12 @@ | |||
{{with .Owner}} | |||
<div class="ui container"> | |||
<img class="ui avatar image" src="{{.AvatarLink}}"> | |||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | |||
<span class="header name"> | |||
<a href="{{.HomeLink}}">{{.Name}}</a> | |||
{{with .FullName}}({{.}}){{end}} | |||
</span> | |||
<div class="ui right"> | |||
{{if or $.PageIsFollowers $.PageIsFollowing}} | |||
{{if and $.IsSigned (ne $.SignedUserName .Name)}} | |||
<div class="follow"> |
@@ -6,11 +6,11 @@ | |||
<div class="ui card"> | |||
{{if eq .SignedUserName .Owner.Name}} | |||
<a class="image poping up" href="{{AppSubUrl}}/user/settings" id="profile-avatar" data-content="{{.i18n.Tr "user.change_avatar"}}" data-variation="inverted tiny" data-position="bottom center"> | |||
<img src="{{.Owner.AvatarLink}}?s=290" title="{{.Owner.Name}}"/> | |||
<img src="{{.Owner.RelAvatarLink}}?s=290" title="{{.Owner.Name}}"/> | |||
</a> | |||
{{else}} | |||
<span class="image"> | |||
<img src="{{.Owner.AvatarLink}}?s=290" title="{{.Owner.Name}}"/> | |||
<img src="{{.Owner.RelAvatarLink}}?s=290" title="{{.Owner.Name}}"/> | |||
</span> | |||
{{end}} | |||
<div class="content"> | |||
@@ -56,7 +56,7 @@ | |||
{{if .Orgs}} | |||
<li> | |||
{{range .Orgs}} | |||
<a href="{{.HomeLink}}"><img class="ui mini image poping up" src="{{.AvatarLink}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a> | |||
<a href="{{.HomeLink}}"><img class="ui mini image poping up" src="{{.RelAvatarLink}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a> | |||
{{end}} | |||
</li> | |||
{{end}} |