Merged r23416 from trunk to 6.0-stable (#42023).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23458 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 29 insertions, 2 deletions

diff --git a/app/assets/images/icons.svg b/app/assets/images/icons.svg
index 3bd8ae53b..51e6b550b 100644
--- a/app/assets/images/icons.svg
+++ b/app/assets/images/icons.svg
@@ -275,6 +275,11 @@
       <path d="M11 16a1 1 0 1 0 2 0a1 1 0 0 0 -2 0"/>
       <path d="M8 11v-4a4 4 0 1 1 8 0v4"/>
     </symbol>
+    <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--message">
+      <path d="M8 9h8"/>
+      <path d="M8 13h6"/>
+      <path d="M18 4a3 3 0 0 1 3 3v8a3 3 0 0 1 -3 3h-5l-5 3v-3h-2a3 3 0 0 1 -3 -3v-8a3 3 0 0 1 3 -3h12z"/>
+    </symbol>
     <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--move">
       <path d="M15 14l4 -4l-4 -4"/>
       <path d="M19 10h-11a4 4 0 1 0 0 8h1"/>
@@ -295,6 +300,17 @@
     <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--plugins">
       <path d="M4 7h3a1 1 0 0 0 1 -1v-1a2 2 0 0 1 4 0v1a1 1 0 0 0 1 1h3a1 1 0 0 1 1 1v3a1 1 0 0 0 1 1h1a2 2 0 0 1 0 4h-1a1 1 0 0 0 -1 1v3a1 1 0 0 1 -1 1h-3a1 1 0 0 1 -1 -1v-1a2 2 0 0 0 -4 0v1a1 1 0 0 1 -1 1h-3a1 1 0 0 1 -1 -1v-3a1 1 0 0 1 1 -1h1a2 2 0 0 0 0 -4h-1a1 1 0 0 1 -1 -1v-3a1 1 0 0 1 1 -1"/>
     </symbol>
+    <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--project">
+      <path d="M7 16.5l-5 -3l5 -3l5 3v5.5l-5 3z"/>
+      <path d="M2 13.5v5.5l5 3"/>
+      <path d="M7 16.545l5 -3.03"/>
+      <path d="M17 16.5l-5 -3l5 -3l5 3v5.5l-5 3z"/>
+      <path d="M12 19l5 3"/>
+      <path d="M17 16.5l5 -3"/>
+      <path d="M12 13.5v-5.5l-5 -3l5 -3l5 3v5.5"/>
+      <path d="M7 5.03v5.455"/>
+      <path d="M12 8l5 -3"/>
+    </symbol>
     <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--projects">
       <path d="M7 16.5l-5 -3l5 -3l5 3v5.5l-5 3z"/>
       <path d="M2 13.5v5.5l5 3"/>
@@ -316,6 +332,10 @@
       <path d="M9 18l3 3l3 -3"/>
       <path d="M9 6l3 -3l3 3"/>
     </symbol>
+    <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--reply">
+      <path d="M21 14l-3 -3h-7a1 1 0 0 1 -1 -1v-6a1 1 0 0 1 1 -1h9a1 1 0 0 1 1 1v10"/>
+      <path d="M14 15v2a1 1 0 0 1 -1 1h-7l-3 3v-10a1 1 0 0 1 1 -1h2"/>
+    </symbol>
     <symbol viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" id="icon--roles">
       <path d="M12 21a12 12 0 0 1 -8.5 -15a12 12 0 0 0 8.5 -3a12 12 0 0 0 8.5 3c.568 1.933 .635 3.957 .223 5.89"/>
       <path d="M19.001 19m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0"/>
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 7ab3ea878..c00ceacd6 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1847,7 +1847,7 @@ span.icon-label {
 .open .icon-folder:not(:has(svg)) { background-image: url(/folder_open.png); }
 .icon-package:not(:has(svg)) { background-image: url(/package.png); }
 .icon-user:not(:has(svg)) { background-image: url(/user.png); }
-.icon-project, .icon-projects:not(:has(svg)) { background-image: url(/projects.png); }
+.icon-project:not(:has(svg)), .icon-projects:not(:has(svg)) { background-image: url(/projects.png); }
 .icon-help:not(:has(svg)) { background-image: url(/help.png); }
 .icon-attachment:not(:has(svg)) { background-image: url(/attachment.png); }
 .icon-history:not(:has(svg)) { background-image: url(/history.png); }
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index ce7887a9d..7b5fc4f36 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -51,12 +51,13 @@
     <h3><%= l(:label_result_plural) %> (<%= @result_count %>)</h3>
     <% if @result_count_by_type['issues'].to_i > 0 && @search_attachments == '0' %>
       <p class="buttons">
-        <%= link_to l(:button_apply_issues_filter), issues_filter_path(@question, projects_scope: params[:scope], all_words: @all_words, titles_only: @titles_only, open_issues: @open_issues), :class => 'icon icon-list' %>
+        <%= link_to sprite_icon('list', l(:button_apply_issues_filter)), issues_filter_path(@question, projects_scope: params[:scope], all_words: @all_words, titles_only: @titles_only, open_issues: @open_issues), :class => 'icon icon-list' %>
       </p>
     <% end %>
     <dl id="search-results">
       <% @results.each do |e| %>
         <dt class="<%= e.event_type %> icon icon-<%= e.event_type %>">
+          <%= sprite_icon(e.event_type) %>
           <%= content_tag('span', e.project, :class => 'project') unless @project == e.project %>
           <%= link_to(highlight_tokens(e.event_title.truncate(255), @tokens), e.event_url) %>
         </dt>
diff --git a/config/icon_source.yml b/config/icon_source.yml
index 92ea716b1..3171d2761 100644
--- a/config/icon_source.yml
+++ b/config/icon_source.yml
@@ -115,6 +115,8 @@
   svg: refresh
 - name: projects
   svg: packages
+- name: project
+  svg: packages
 - name: package
   svg: package
 - name: custom-fields
@@ -131,6 +133,10 @@
   svg: message
 - name: comment
   svg: message
+- name: message
+  svg: message
+- name: reply
+  svg: messages
 - name: arrow-right
   svg: arrow-big-right
 - name: wiki-page