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 e6717aecdf..f4c5b669c2 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 22a90daff7..f045cb2270 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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 literal 0 HcmV?d00001