From f81c7d619c41894e03715c1fa5d1d41b8deed1f9 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 16 Jan 2018 15:11:55 +0000 Subject: [PATCH] Consistently use the gravatar 'mystery man' as fallback, regardless of whether gravatar is in use The .svg had various design issues (didn't follow the square avatar design adopted in #2805, was aligned too low in the menu footer, and had a transparent background leading to grey-on-teal ugliness on the homepage). --- .../wagtailadmin/images/default-user-avatar.png | Bin 0 -> 1665 bytes .../wagtailadmin/images/default-user-avatar.svg | 9 --------- wagtail/admin/templates/wagtailadmin/home.html | 2 +- wagtail/admin/templatetags/wagtailadmin_tags.py | 2 +- wagtail/users/models.py | 2 +- wagtail/users/utils.py | 2 +- 6 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.png delete mode 100644 wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.svg diff --git a/wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.png b/wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..e463120202f4a7d921382587d73fc5275da9826e GIT binary patch literal 1665 zcmbW!eLT~7902g|Z@Vp@-`#96ivPIu9$PNJw#onTOp^-Rti4y1(x3^L_Z^`~7^suh0ASQFo}H0bO^F z8wWrT01z^OdJZ@^^Vv>bo_u?nAb3^8{tyA}fYs_XG?AGAaPk=LkQKL?)97I)+9DBqKc%nKb_i1S414bNANWFJEA0h)->GqG~g(B}nW zO(RK+!zT(gmu{@QL*~mz&8&l>QnYXehDHmG&6h2wTdY`XW4ms>oxQUQo8!94&3&7f zw~z03KmT39A)$h>@QCP`*aLC#2?viHO-)Nb_LcZ#*0HyC496 zWFh-U*gsrE#DzkmVKjE$1)<`Q1ryO26DtipCmuF1Qs0zuSd+BzL}BF}t)KT=d$|#R_DMSQ0$FbCEgoQ7N zupZ$!mNZrY^VNrt6AwuQaA-~P+NH=4a!~_{BOfo9_p^;Aq#{ES#72n-TnsgDN6Y(! zsxF`I25pMZouKu+#|5{!XazQ{V#Y1DuhaSJCq3C$T_^)8Us-qow#+1B(Qs+G*_+Bh zLsgc_S0EcSP*4iUd1XRVr}i6^K2?@)vORcFtn@s4H^=MhF*Qh7c5l|H+_RpkRk2o? zf5?7k4d`9$lQVG=H=0?aUE9 z&$$%Khmku@j|L6;Y~go&Z>`zKd(F^!M}h{GGSU?;Dky_L7n2kNVfv*z{XO^5nxYDi zr&k(PoGH$zvux-|Fe;s~9P|s>zBFO+hzlks|F&;)9Aj4c(l7G(n*i#zTp)QTWBOZh z=-}5j@n#{9g=fh=eJ|)1=`>VtFt1pbHvT~P(0}FYY}XjaN#-|6zzH%zv-ITP@^|=GLFp%1*9T(J>-FQ82cFpcbC6GlpBOE)mUg8}R(CCoU zWXIgvp^EgInmh~NBni4Rrdv?P7SV6nV6h6R#_nvWi0qx0Qtl@KP}@zx?H+B@A2S_B ze5_V=)|uZRlohAyO5669hdm`H+se{J@S(FFG+u22f6BGM0*f=yr`Bpi8 zftE|3DS@KGitfpBfwf1L8^^N>tPW>{4Jah{MH_Ct&=%_jZ1J&yli!$sI_ov(M-^4r z%v|VBOx`tH*t>+iAJ55;n%-kK$7(-9trh9q7c*DTK?O@`D;i$coXP%~Io3Nz;;|@K z?74KQ$l#=y4w@-fcr2W-HB?MTdrp^GAz7w literal 0 HcmV?d00001 diff --git a/wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.svg b/wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.svg deleted file mode 100644 index 9657f3ae04..0000000000 --- a/wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/wagtail/admin/templates/wagtailadmin/home.html b/wagtail/admin/templates/wagtailadmin/home.html index e75d3cdc8c..6973ef3206 100644 --- a/wagtail/admin/templates/wagtailadmin/home.html +++ b/wagtail/admin/templates/wagtailadmin/home.html @@ -13,7 +13,7 @@
-
+

{% block branding_welcome %}{% blocktrans %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}{% endblock %}

diff --git a/wagtail/admin/templatetags/wagtailadmin_tags.py b/wagtail/admin/templatetags/wagtailadmin_tags.py index becfe6e305..5b9e0bb7f9 100644 --- a/wagtail/admin/templatetags/wagtailadmin_tags.py +++ b/wagtail/admin/templatetags/wagtailadmin_tags.py @@ -384,4 +384,4 @@ def avatar_url(context, user, size=50): if hasattr(user, 'wagtail_userprofile'): # A user could not have profile yet, so this is necessary return user.wagtail_userprofile.get_avatar_url(size=size) - return static('wagtailadmin/images/default-user-avatar.svg') + return static('wagtailadmin/images/default-user-avatar.png') diff --git a/wagtail/users/models.py b/wagtail/users/models.py index 698c6b496f..e823ead446 100644 --- a/wagtail/users/models.py +++ b/wagtail/users/models.py @@ -93,7 +93,7 @@ class UserProfile(models.Model): @cached_property def default_avatar(self): - return static('wagtailadmin/images/default-user-avatar.svg') + return static('wagtailadmin/images/default-user-avatar.png') def get_avatar_url(self, size=50): if self.avatar_choice == self.DEFAULT: diff --git a/wagtail/users/utils.py b/wagtail/users/utils.py index 5487efc144..88dc1d7dba 100644 --- a/wagtail/users/utils.py +++ b/wagtail/users/utils.py @@ -22,7 +22,7 @@ def user_can_delete_user(current_user, user_to_delete): def get_gravatar_url(email, default=None, size=50): - params = {'s': str(size)} + params = {'s': str(size), 'd': 'mm'} if default is not None: params['default'] = default gravatar_url = "https://www.gravatar.com/avatar/" + hashlib.md5(email.lower().encode('utf-8')).hexdigest() + "?"