From 59a475163f90351e476cd9e466909b7f05f51e49 Mon Sep 17 00:00:00 2001
From: James Anderson <james.anderson@target.com>
Date: Mon, 10 Aug 2015 10:40:07 -0500
Subject: [PATCH 1/2] Hide avatar-changing instructions unless it's your
profile (resolves #1107)
---
templates/user/profile.tmpl | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index c8b7c591b..c799bedc2 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> {{.Owner.Location}}</li>
From e5146155a0bd4415cc274c6f67218293715183a2 Mon Sep 17 00:00:00 2001
From: James Anderson <james.anderson@target.com>
Date: Mon, 10 Aug 2015 10:43:14 -0500
Subject: [PATCH 2/2] Resize avatars to the same size they are displayed
---
models/user.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/models/user.go b/models/user.go
index 3b28f5ed4..88889672c 100644
--- a/models/user.go
+++ b/models/user.go
@@ -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()