summaryrefslogtreecommitdiffstats
path: root/templates/user/profile.tmpl
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-08-10 23:56:17 +0800
committerUnknwon <u@gogs.io>2015-08-10 23:56:17 +0800
commit1ce4543a9462a91dc81d5a5dd140906937f63c9d (patch)
tree196be7716b0e87380ba5ae81f347d0a2eae449e3 /templates/user/profile.tmpl
parent64985c7faacb15651f9187c37b308632830be869 (diff)
parent9c0c16bb5ac960dd6af940a7fb609291381d0d14 (diff)
downloadgitea-1ce4543a9462a91dc81d5a5dd140906937f63c9d.tar.gz
gitea-1ce4543a9462a91dc81d5a5dd140906937f63c9d.zip
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
Diffstat (limited to 'templates/user/profile.tmpl')
-rw-r--r--templates/user/profile.tmpl10
1 files changed, 6 insertions, 4 deletions
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index c8b7c591b8..c799bedc2b 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -4,12 +4,14 @@
<div id="user-profile-page" class="container clear">
<div class="grid-1-5 left">
<div>
- {{if .Owner.UseCustomAvatar}}
+ {{if and (.Owner.UseCustomAvatar) (eq .SignedUser.Id .Owner.Id)}}
<a href="{{AppSubUrl}}/user/settings" id="profile-avatar" original-title="{{.i18n.Tr "user.change_custom_avatar"}}">
- {{else}}
+ {{else if eq .SignedUser.Id .Owner.Id}}
<a href="http://gravatar.com/emails/" id="profile-avatar" original-title="{{.i18n.Tr "user.change_avatar"}}">
+ {{else}}
+ <a href="{{.Owner.AvatarLink}}?s=234" id="profile-avatar">
{{end}}
- <img class="profile-avatar" src="{{.Owner.AvatarLink}}?s=200"title="{{.Owner.Name}}"/>
+ <img class="profile-avatar" src="{{.Owner.AvatarLink}}?s=234" title="{{.Owner.Name}}"/>
</a>
<div class="text-center" id="profile-name">
{{if .Owner.FullName}}<span id="profile-fullname" class="center-block">{{.Owner.FullName}}</span><br>{{end}}
@@ -17,7 +19,7 @@
</div>
</div>
<div class="profile-info">
- <hr>
+ <hr>
<ul class="list-no-style">
{{if .Owner.Location}}
<li class="list-group-item"><i class="octicon octicon-location"></i>&nbsp;&nbsp;{{.Owner.Location}}</li>