From 2f60a207b22fba4e59e3b7a9b4780e3c0ded2dd6 Mon Sep 17 00:00:00 2001
From: ishikawa999 <remember929@gmail.com>
Date: Mon, 18 Nov 2024 05:29:46 +0000
Subject: [PATCH] Change icons to svg

---
 app/helpers/custom_message_settings_helper.rb        | 6 +++---
 app/views/custom_message_settings/_messages.html.erb | 6 +++---
 app/views/custom_message_settings/edit.html.erb      | 2 +-
 init.rb                                              | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/helpers/custom_message_settings_helper.rb b/app/helpers/custom_message_settings_helper.rb
index 3fab8dd..5206f84 100644
--- a/app/helpers/custom_message_settings_helper.rb
+++ b/app/helpers/custom_message_settings_helper.rb
@@ -17,17 +17,17 @@ def normal_mode_input_fields(setting, lang)
       content += content_tag(:p) do
         content_tag(:label, k) +
         text_field_tag("settings[custom_messages][#{k}]", v.to_s) +
-        link_to_function('', '$(this).closest("p").remove();', class: 'icon icon-del clear-key-link')
+        link_to_function(sprite_icon('del'), '$(this).closest("p").remove()', class: 'icon icon-del clear-key-link')
       end
     end
     content
   end
 
   def open_default_messages_window_link(lang)
-    link_to l(:label_default_messages),
+    link_to sprite_icon('file', l(:label_default_messages)),
             default_messages_custom_message_settings_path(lang: lang),
             class: 'icon icon-file text-plain',
             onclick: "window.open(this.href,'redmine_message_customize_plugin-default_messages', 'height=800, width=500');return false;",
             id: 'default-messages-link'
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/custom_message_settings/_messages.html.erb b/app/views/custom_message_settings/_messages.html.erb
index d8486d4..df3b8bf 100644
--- a/app/views/custom_message_settings/_messages.html.erb
+++ b/app/views/custom_message_settings/_messages.html.erb
@@ -1,6 +1,6 @@
 <div>
   <%= select_tag 'select-key', available_message_options(@setting, lang), id: 'key-selector' %>
-  <span class='icon icon-help'><%= l(:text_description_of_search_box) %></span>
+  <span class='icon icon-help'><%= sprite_icon('help', l(:text_description_of_search_box)) %></span>
 </div>
 <br>
 <div class='tabular'>
@@ -45,8 +45,8 @@ function AddMessageInputField(key, val){
     $('<a>').attr({
        class: 'icon icon-del clear-key-link',
        href: '#',
-       onclick: '$(this).closest("p").remove();; return false;'
-    }).appendTo($('#edit-custom-messages .tabular p:first'));
+       onclick: '$(this).closest("p").remove(); return false;'
+    }).html('<%= sprite_icon('del') %>').appendTo($('#edit-custom-messages .tabular p:first'));
     $('#key-selector').val('').change();
     $('#key-selector option[value="' + key + '"]').prop("disabled", true).change();
     setSelect2();
diff --git a/app/views/custom_message_settings/edit.html.erb b/app/views/custom_message_settings/edit.html.erb
index 8dbbf15..2b9cb88 100644
--- a/app/views/custom_message_settings/edit.html.erb
+++ b/app/views/custom_message_settings/edit.html.erb
@@ -8,7 +8,7 @@
 <% end %>
 
 <div class='message-customize-menu contextual'>
-  <%= link_to (@setting.enabled? ? l(:label_disable_customize) : l(:label_enable_customize)), toggle_enabled_custom_message_settings_path, method: :post, class: 'icon icon-settings' %> /
+  <%= link_to sprite_icon('settings', (@setting.enabled? ? l(:label_disable_customize) : l(:label_enable_customize))), toggle_enabled_custom_message_settings_path, method: :post, class: 'icon icon-settings' %> /
   <%= open_default_messages_window_link(@lang) %>
 </div>
 
diff --git a/init.rb b/init.rb
index 9de5077..c155884 100644
--- a/init.rb
+++ b/init.rb
@@ -13,8 +13,8 @@
   author_url 'https://github.com/farend'
   settings default: { custom_messages: {} }
   menu :admin_menu, :custom_messages, { controller: 'custom_message_settings', action: 'edit' },
-         caption: :label_custom_messages, html: { class: 'icon icon-edit' }
-  requires_redmine version_or_higher: '3.2'
+         caption: :label_custom_messages, html: { class: 'icon icon-edit' }, icon: 'edit'
+  requires_redmine version_or_higher: '6.0'
 end
 
 Rails.application.config.i18n.load_path += Dir.glob(File.join(p.directory, 'config', 'locales', 'custom_messages', '*.rb'))