Merge pull request #1464 from jamesa/hide-gravatar-tooltip
Hide avatar tooltips unless you're looking at your own profile
This commit is contained in:
commit
9c0c16bb5a
@ -194,7 +194,7 @@ func (u *User) UploadAvatar(data []byte) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
m := resize.Resize(200, 200, img, resize.NearestNeighbor)
|
||||
m := resize.Resize(234, 234, img, resize.NearestNeighbor)
|
||||
|
||||
sess := x.NewSession()
|
||||
defer sess.Close()
|
||||
|
@ -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> {{.Owner.Location}}</li>
|
||||
|
Loading…
Reference in New Issue
Block a user