From 8a248696e94e2756dee3f2a000fe8609a0c2111c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 27 Jun 2016 12:12:30 +0200 Subject: [PATCH] Use a gopher as default avatar (rather than the gravatar logo) (#3208) Also changes the avatar from a jpeg to a png, to allow for transparent background. The indexed png is also smaller in size. Note that at the moment the default avatar is only used when the user requested a custom avatar and the custom avatar file is not found (should never happen). In the future the default avatar could be used as a default return when by-mail avatar lookups fail too (both gravatar and libravatar support passing a default) --- models/user.go | 2 +- modules/base/tool.go | 2 +- public/img/avatar_default.jpg | Bin 6238 -> 0 bytes public/img/avatar_default.png | Bin 0 -> 4048 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 public/img/avatar_default.jpg create mode 100644 public/img/avatar_default.png diff --git a/models/user.go b/models/user.go index e6717aecd..f4c5b669c 100644 --- a/models/user.go +++ b/models/user.go @@ -240,7 +240,7 @@ func (u *User) GenerateRandomAvatar() error { } func (u *User) RelAvatarLink() string { - defaultImgUrl := "/img/avatar_default.jpg" + defaultImgUrl := "/img/avatar_default.png" if u.Id == -1 { return defaultImgUrl } diff --git a/modules/base/tool.go b/modules/base/tool.go index 22a90daff..f045cb227 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -207,7 +207,7 @@ func HashEmail(email string) string { // AvatarLink returns avatar link by given email. func AvatarLink(email string) string { if setting.DisableGravatar || setting.OfflineMode { - return setting.AppSubUrl + "/img/avatar_default.jpg" + return setting.AppSubUrl + "/img/avatar_default.png" } return setting.GravatarSource + HashEmail(email) diff --git a/public/img/avatar_default.jpg b/public/img/avatar_default.jpg deleted file mode 100644 index f97aaaf0417f72cf38893ed48d1554d8dc22f043..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6238 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 diff --git a/public/img/avatar_default.png b/public/img/avatar_default.png new file mode 100644 index 0000000000000000000000000000000000000000..fed568a12bf92a786275d9d0d03d3bc0fc2dee8a GIT binary patch literal 4048 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