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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