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 0000000000..e463120202 Binary files /dev/null and b/wagtail/admin/static_src/wagtailadmin/images/default-user-avatar.png differ 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() + "?"