diff options
| author | Unknwon <u@gogs.io> | 2016-08-05 12:12:54 -0700 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-08-05 12:12:54 -0700 |
| commit | 50422f1fc226d71fe2f5f701c7ebdd1a5f2d143e (patch) | |
| tree | 649757ae8cac275b0501e684d1c7bb0a5ee2d7d9 | |
| parent | db3d393576c716dbbea500791c5f800e52c70be5 (diff) | |
| download | gitea-50422f1fc226d71fe2f5f701c7ebdd1a5f2d143e.tar.gz gitea-50422f1fc226d71fe2f5f701c7ebdd1a5f2d143e.zip | |
#3348 always use relative avatar link in the template
32 files changed, 58 insertions, 57 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index a99857436f..da434e203c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -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 [ -##### 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 | |:-------------:|:-------:|:-------:| diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS index fc1bc20d88..d353897135 100644 --- a/conf/locale/TRANSLATORS +++ b/conf/locale/TRANSLATORS @@ -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()) diff --git a/models/action.go b/models/action.go index 6e2234fda5..081f96bb2a 100644 --- a/models/action.go +++ b/models/action.go @@ -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() } } diff --git a/models/user.go b/models/user.go index 5e9b60addb..ac3d2e819b 100644 --- a/models/user.go +++ b/models/user.go @@ -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 } diff --git a/routers/user/home.go b/routers/user/home.go index dab30eb5d2..95d0b582b5 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -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] diff --git a/templates/.VERSION b/templates/.VERSION index f60bbf6177..ef9982da04 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.61.0804
\ No newline at end of file +0.9.62.0805
\ No newline at end of file diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 1fb91e9aa2..5357bc2a77 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -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> diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index b7eca4b024..c13ccc6977 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -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"> diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 8fa1c2b269..0192ad7d82 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -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"> diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index eaea98bf52..17b0ade8c9 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -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> diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 85f7cc9048..d7514d8ba7 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -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> diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index cd50ee4ff0..c9240beb2b 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -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> diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 62acc2f2b0..8714181140 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -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> diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 8b22228d07..03e8591f68 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -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}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index c203f9508c..4b5c2eee3f 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -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}} diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl index 192d6fdd22..e9f12ab932 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff.tmpl @@ -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}}" /> diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index e8b57e1af3..461ac89c89 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -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> / diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index eebb0b15b0..5d4ed4fe51 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -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> diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index b001e3a644..bfb97da2da 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -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> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index ada98d3090..b8d18205d8 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -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> diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 30716ee6ad..2ac3915272 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -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}} diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 9cd84b3d44..431f6df236 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -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}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index f2cdfc1ca3..b9b1b7c2f4 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -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}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index f6daab5dae..edf269b471 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -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> diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index 82086a6fa7..b89bbc6834 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -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> diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 82fd5c92d9..4377335911 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -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}}" /> diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index c8d17b3cdd..38ead6127f 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -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> diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index a078006ccc..02f21048ff 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -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}} diff --git a/templates/user/meta/header.tmpl b/templates/user/meta/header.tmpl index 4982c7506a..36072e8aa1 100644 --- a/templates/user/meta/header.tmpl +++ b/templates/user/meta/header.tmpl @@ -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"> diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index d84bcddd7d..4bcc92d95d 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -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}} |