From c0ec53e543b1daf1a25c912d44cbe1320578cc30 Mon Sep 17 00:00:00 2001 From: ishikawa999 Date: Wed, 15 Jan 2025 08:01:20 +0000 Subject: [PATCH] Change quote icon --- app/assets/images/icons.svg | 4 ++++ config/icon_source.yml | 2 ++ lib/redmine/quote_reply.rb | 4 ++-- test/helpers/journals_helper_test.rb | 2 +- test/unit/lib/redmine/quote_reply_helper_test.rb | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/assets/images/icons.svg b/app/assets/images/icons.svg index 51e6b550b..f35cc818a 100644 --- a/app/assets/images/icons.svg +++ b/app/assets/images/icons.svg @@ -322,6 +322,10 @@ + + + + diff --git a/config/icon_source.yml b/config/icon_source.yml index 3171d2761..4ab2499bf 100644 --- a/config/icon_source.yml +++ b/config/icon_source.yml @@ -205,3 +205,5 @@ svg: key - name: search svg: search +- name: quote + svg: quote \ No newline at end of file diff --git a/lib/redmine/quote_reply.rb b/lib/redmine/quote_reply.rb index 05737c079..5a44eed1c 100644 --- a/lib/redmine/quote_reply.rb +++ b/lib/redmine/quote_reply.rb @@ -27,11 +27,11 @@ module Redmine def quote_reply(url, selector_for_content, icon_only: false) quote_reply_function = "quoteReply('#{j url}', '#{j selector_for_content}', '#{j Setting.text_formatting}')" - html_options = { class: 'icon icon-comment' } + html_options = { class: 'icon icon-quote' } html_options[:title] = l(:button_quote) if icon_only link_to_function( - sprite_icon('comment', l(:button_quote), icon_only: icon_only), + sprite_icon('quote', l(:button_quote), icon_only: icon_only), quote_reply_function, html_options ) diff --git a/test/helpers/journals_helper_test.rb b/test/helpers/journals_helper_test.rb index 355d5ec6f..a5a553d60 100644 --- a/test/helpers/journals_helper_test.rb +++ b/test/helpers/journals_helper_test.rb @@ -47,7 +47,7 @@ class JournalsHelperTest < Redmine::HelperTest journals = issue.visible_journals_with_index # add indice journal_actions = render_journal_actions(issue, journals.first, {reply_links: true}) - assert_select_in journal_actions, 'a[title=?][class="icon icon-comment"]', 'Quote' + assert_select_in journal_actions, 'a[title=?][class="icon icon-quote"]', 'Quote' assert_select_in journal_actions, 'a[title=?][class="icon-only icon-edit"]', 'Edit' assert_select_in journal_actions, 'div[class="drdn-items"] a[class="icon icon-del"]' assert_select_in journal_actions, 'div[class="drdn-items"] a[class="icon icon-copy-link"]' diff --git a/test/unit/lib/redmine/quote_reply_helper_test.rb b/test/unit/lib/redmine/quote_reply_helper_test.rb index 43adb521b..cbac1f6d0 100644 --- a/test/unit/lib/redmine/quote_reply_helper_test.rb +++ b/test/unit/lib/redmine/quote_reply_helper_test.rb @@ -29,7 +29,7 @@ class QuoteReplyHelperTest < ActionView::TestCase a_tag = quote_reply(url, '#issue_description_wiki') assert_includes a_tag, %|onclick="#{h "quoteReply('/issues/1/quoted', '#issue_description_wiki', 'common_mark'); return false;"}"| - assert_includes a_tag, %|class="icon icon-comment"| + assert_includes a_tag, %|class="icon icon-quote"| assert_not_includes a_tag, 'title=' # When icon_only is true -- 2.47.1