X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d9e650fde103e923890372df0ffa93ee117eb228..507c395f51c20c3c0d5375313ea1ca0ed4156c75:/app/helpers/user_roles_helper.rb?ds=inline diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 1308cdfa7..02017bdb9 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -7,12 +7,12 @@ module UserRolesHelper if current_user&.administrator? if user.role?(role) link_to role_icon_svg_tag(role, false, t("users.show.role.revoke.#{role}")), - revoke_role_path(user, role), - :method => :post, + user_role_path(user, role), + :method => :delete, :data => { :confirm => t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role) } else link_to role_icon_svg_tag(role, true, t("users.show.role.grant.#{role}")), - grant_role_path(user, role), + user_role_path(user, role), :method => :post, :data => { :confirm => t("user_role.grant.are_you_sure", :name => user.display_name, :role => role) } end @@ -21,19 +21,22 @@ module UserRolesHelper end end - def role_icon_svg_tag(role, blank, title) + def role_icon_svg_tag(role, blank, title, **options) role_colors = { "administrator" => "#f69e42", - "moderator" => "#0606ff", + "moderator" => "#447eff", "importer" => "#38e13a" } color = role_colors[role] || "currentColor" path_data = "M 10,2 8.125,8 2,8 6.96875,11.71875 5,18 10,14 15,18 13.03125,11.71875 18,8 11.875,8 10,2 z" - tag.svg(:width => 20, :height => 20) do + tag.svg(:width => 20, :height => 20, **options) do concat tag.title(title) - concat tag.path(:d => path_data, :fill => color, :stroke => color, "stroke-width" => 2, "stroke-linejoin" => "round") - concat tag.path(:d => path_data, :fill => "#fff") if blank + concat tag.path(:d => path_data, + :fill => blank ? "none" : color, + :stroke => color, + "stroke-width" => blank ? 1.5 : 2, + "stroke-linejoin" => "round") end end end