X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..dbd88d893f3c3fce9cafd666b94396988646d81f:/app/helpers/user_roles_helper.rb diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 37fbf8634..7093a96b2 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -1,35 +1,36 @@ module UserRolesHelper def role_icons(user) - UserRole::ALL_ROLES.reduce("".html_safe) { |s,r| s + " " + role_icon(user, r) } + UserRole::ALL_ROLES.reduce("".html_safe) do |acc, elem| + acc + " " + role_icon(user, elem) + end end def role_icon(user, role) - if @user and @user.administrator? + if @user && @user.administrator? if user.has_role?(role) - image = "roles/#{role}.png" + image = "roles/#{role}" alt = t("user.view.role.revoke.#{role}") title = t("user.view.role.revoke.#{role}") url = revoke_role_path(:display_name => user.display_name, :role => role) confirm = t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role) else - image = "roles/blank_#{role}.png" + image = "roles/blank_#{role}" alt = t("user.view.role.grant.#{role}") title = t("user.view.role.grant.#{role}") url = grant_role_path(:display_name => user.display_name, :role => role) confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role) end elsif user.has_role?(role) - image = "roles/#{role}.png" + image = "roles/#{role}" alt = t("user.view.role.#{role}") title = t("user.view.role.#{role}") end if image - icon = image_tag(image, :size => "20x20", :border => 0, :alt => alt, :title => title) - - if url - icon = link_to(icon, url, :method => :post, :confirm => confirm) - end + svg_icon = tag("source", :srcset => image_path("#{image}.svg"), :type => "image/svg+xml") + png_icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title) + icon = content_tag("picture", svg_icon + png_icon) + icon = link_to(icon, url, :method => :post, :confirm => confirm) if url end icon