summaryrefslogtreecommitdiffstats
path: root/templates/user
diff options
context:
space:
mode:
authorSandro Santilli <strk@kbt.io>2016-06-26 19:51:09 +0200
committer无闻 <u@gogs.io>2016-06-27 01:51:09 +0800
commit76a0e43e88c4c43e81d8ef883c8a3483df3109a4 (patch)
tree7a714dc8a07ccb3611e3173d75516fd60e2e77d3 /templates/user
parent24caccccdd2d5e53a66a73b026eea45327596395 (diff)
downloadgitea-76a0e43e88c4c43e81d8ef883c8a3483df3109a4.tar.gz
gitea-76a0e43e88c4c43e81d8ef883c8a3483df3109a4.zip
Do not assume avatar needs be changed from gravatar.com (#3209)
Always send user to settings screen to change avatar. Drops "change_custom_avatar" localized message, keeps "change_avatar" for the generic one. NOTE: only changes the en-US locale, as per https://github.com/gogits/gogs/wiki/Contributing-Code#those-we-do-not-accept NOTE: requires rebuild of bindata.go to fully see effects
Diffstat (limited to 'templates/user')
-rw-r--r--templates/user/profile.tmpl8
1 files changed, 2 insertions, 6 deletions
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index c037b0ad13..b2e6814047 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -4,12 +4,8 @@
<div class="ui grid">
<div class="ui five wide column">
<div class="ui card">
- {{if and (or .Owner.UseCustomAvatar DisableGravatar) (eq .SignedUserName .Owner.Name)}}
- <a class="image poping up" href="{{AppSubUrl}}/user/settings" id="profile-avatar" data-content="{{.i18n.Tr "user.change_custom_avatar"}}" data-variation="inverted tiny" data-position="bottom center">
- <img src="{{.Owner.AvatarLink}}?s=290" title="{{.Owner.Name}}"/>
- </a>
- {{else if eq .SignedUserName .Owner.Name}}
- <a class="image poping up" href="http://gravatar.com/emails/" id="profile-avatar" data-content="{{.i18n.Tr "user.change_avatar"}}" data-variation="inverted tiny" data-position="bottom center">
+ {{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}}"/>
</a>
{{else}}