cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use avatar.svg on osm web pages

Browse source
This commit is contained in:
Anton Khorev 2024-04-09 15:19:33 +03:00
parent c9f23b3649
commit 33ff4fbd06
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/user_helper.rb
View file

@ -10,7 +10,7 @@ module UserHelper
elsif user.avatar.attached?
user_avatar_variant_tag(user, { :resize_to_limit => [100, 100] }, options)
else
image_tag "avatar_large.png", options.merge(:width => 100, :height => 100)
image_tag "avatar.svg", options.merge(:width => 100, :height => 100)
end
end
@ -23,7 +23,7 @@ module UserHelper
elsif user.avatar.attached?
user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)
else
image_tag "avatar_small.png", options.merge(:width => 50, :height => 50)
image_tag "avatar.svg", options.merge(:width => 50, :height => 50)
end
end
@ -36,7 +36,7 @@ module UserHelper
elsif user.avatar.attached?
user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options)
else
image_tag "avatar_small.png", options.merge(:width => 50, :height => 50)
image_tag "avatar.svg", options.merge(:width => 50, :height => 50)
end
end
@ -46,7 +46,7 @@ module UserHelper
elsif user.avatar.attached?
polymorphic_url(user_avatar_variant(user, :resize_to_limit => [100, 100]), :host => Settings.server_url)
else
image_url("avatar_large.png")
image_url("avatar.svg")
end
end

12
test/helpers/user_helper_test.rb
View file

@ -8,10 +8,10 @@ class UserHelperTest < ActionView::TestCase
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_image(user)
assert_match %r{^<img class="user_image border border-secondary-subtle" .* src="/images/avatar_large.png" />$}, image
assert_match %r{^<img class="user_image border border-secondary-subtle" .* src="/images/avatar.svg" />$}, image
image = user_image(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_large.png" />$}, image
assert_match %r{^<img class="foo" .* src="/images/avatar.svg" />$}, image
image = user_image(gravatar_user)
assert_match %r{^<img class="user_image border border-secondary-subtle" .* src="http://www.gravatar.com/avatar/.*" />$}, image
@ -24,10 +24,10 @@ class UserHelperTest < ActionView::TestCase
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail(user)
assert_match %r{^<img class="user_thumbnail border border-secondary-subtle" .* src="/images/avatar_small.png" />$}, image
assert_match %r{^<img class="user_thumbnail border border-secondary-subtle" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image
assert_match %r{^<img class="foo" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail(gravatar_user)
assert_match %r{^<img class="user_thumbnail border border-secondary-subtle" .* src="http://www.gravatar.com/avatar/.*" />$}, image
@ -41,10 +41,10 @@ class UserHelperTest < ActionView::TestCase
gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail_tiny(user)
assert_match %r{^<img class="user_thumbnail_tiny border border-secondary-subtle" .* src="/images/avatar_small.png" />$}, image
assert_match %r{^<img class="user_thumbnail_tiny border border-secondary-subtle" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail_tiny(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image
assert_match %r{^<img class="foo" .* src="/images/avatar.svg" />$}, image
image = user_thumbnail_tiny(gravatar_user)
assert_match %r{^<img class="user_thumbnail_tiny border border-secondary-subtle" .* src="http://www.gravatar.com/avatar/.*" />$}, image