X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..22dc13d6edb17cbdd4b73aabad340dcc8ef41999:/app/helpers/user_roles_helper.rb diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 690cccdca..c7516a51c 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -1,31 +1,33 @@ module UserRolesHelper def role_icons(user) - UserRole::ALL_ROLES.reduce("".html_safe) { |a, e| a + " " + role_icon(user, e) } + safe_join(UserRole::ALL_ROLES.filter_map { |role| role_icon(user, role) }, " ") end def role_icon(user, role) - if @user && @user.administrator? + if current_user&.administrator? if user.has_role?(role) - image = "roles/#{role}.png" - alt = t("user.view.role.revoke.#{role}") - title = t("user.view.role.revoke.#{role}") + image = "roles/#{role}" + alt = t("users.show.role.revoke.#{role}") + title = t("users.show.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" - alt = t("user.view.role.grant.#{role}") - title = t("user.view.role.grant.#{role}") + image = "roles/blank_#{role}" + alt = t("users.show.role.grant.#{role}") + title = t("users.show.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" - alt = t("user.view.role.#{role}") - title = t("user.view.role.#{role}") + image = "roles/#{role}" + alt = t("users.show.role.#{role}") + title = t("users.show.role.#{role}") end if image - icon = image_tag(image, :size => "20x20", :border => 0, :alt => alt, :title => title) + 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 = tag.picture(svg_icon + png_icon) icon = link_to(icon, url, :method => :post, :confirm => confirm) if url end