Use inline svgs for moderator scope icons

diff --git a/app/helpers/authorization_helper.rb b/app/helpers/authorization_helper.rb
index 11c8c298faa59ab958b524fa1c66c6f0ec006c93..3a95d54ea0b05d98ced79dfaa335b3cf32355478 100644 (file)
--- a/app/helpers/authorization_helper.rb
+++ b/app/helpers/authorization_helper.rb
@@ -6,7 +6,7 @@ module AuthorizationHelper
     html << t("oauth.scopes.#{scope}")
     if Oauth::MODERATOR_SCOPES.include? scope
       html << " "
     html << t("oauth.scopes.#{scope}")
     if Oauth::MODERATOR_SCOPES.include? scope
       html << " "

-      html << image_tag("roles/moderator.png", :srcset => image_path("roles/moderator.svg", :class => "align-text-bottom"), :size => "20x20")
+      html << role_icon_svg_tag("moderator", false, t("oauth.for_roles.moderator"), :class => "align-text-bottom")

     end
     safe_join(html)
   end
     end
     safe_join(html)
   end

diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb
index 1308cdfa757fdcb8d7b5448fde6c18fd582aefdf..4634cb015507c197581846f4dc86d3573897580f 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -21,7 +21,7 @@ module UserRolesHelper
     end
   end
 
     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",
     role_colors = {
       "administrator" => "#f69e42",
       "moderator" => "#0606ff",


@@ -30,7 +30,7 @@ module UserRolesHelper
     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"
     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.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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4570183d0c8fe9a675fdc6517c84ef7287d8a13e..45c44765d58aaa7e6234b2aaef639a90778d27ab 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2637,6 +2637,8 @@ en:
       write_redactions: Redact map data
       read_email: Read user email address
       skip_authorization: Auto approve application
       write_redactions: Redact map data
       read_email: Read user email address
       skip_authorization: Auto approve application

+    for_roles:
+      moderator: This permission is for actions available only to moderators

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"