Merge pull request #128 from hidakatsuya/svg-icon

Replace PNG icons with SVG for future Redmine compatibility

Author: onozaty

app/helpers/view_customizes_helper.rb

@@ -5,4 +5,12 @@ def highlight_by_language(code, language)
          Redmine::SyntaxHighlighting.highlight_by_language(code, language) +
          "</code></pre>").html_safe
   end
+
+  def sprite_icon_or_label(icon_name, label, **options)
+    if Gem::Version.new(Redmine::VERSION.to_s) >= Gem::Version.new('6.0.0')
+      sprite_icon(icon_name, label, **options)
+    else
+      label
+    end
+  end
 end

app/views/view_customizes/index.html.erb

@@ -1,5 +1,5 @@
 <div class="contextual">
-  <%= link_to l(:label_view_customizes_new), 
+  <%= link_to sprite_icon_or_label(:add, l(:label_view_customizes_new)),
       new_view_customize_path, :class => 'icon icon-add' %>
 </div>
 
@@ -40,11 +40,11 @@
 </table>
 
 <p class="buttons">
-  <%= link_to l(:label_disable_all),
+  <%= link_to sprite_icon_or_label(:view_customize_disable, l(:label_disable_all), plugin: :view_customize),
       view_customizes_path(view_customize: {is_enabled: 0}),
       :data => {:confirm => l(:text_are_you_sure)}, :method => :put,
       :class => 'icon icon-view_customize-disable' %>
-  <%= link_to l(:label_enable_all),
+  <%= link_to sprite_icon_or_label(:view_customize_enable, l(:label_enable_all), plugin: :view_customize),
       view_customizes_path(view_customize: {is_enabled: 1}),
       :data => {:confirm => l(:text_are_you_sure)}, :method => :put,
       :class => 'icon icon-view_customize-enable' %>

app/views/view_customizes/show.html.erb

@@ -1,10 +1,10 @@
 <%= stylesheet_link_tag "scm" %>
 
 <div class="contextual">
-<%= link_to(l(:button_edit),
+<%= link_to(sprite_icon_or_label(:edit, l(:button_edit)),
                {:action => 'edit', :id => @view_customize.id},
                :class => 'icon icon-edit') %>
-<%= link_to(l(:button_delete),
+<%= link_to(sprite_icon_or_label(:del, l(:button_delete)),
                {:action => 'destroy', :id => @view_customize.id},
                :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,
                :class => 'icon icon-del') %>

assets/images/icons.svg

@@ -58,14 +58,21 @@ input#view_customize_comments {
     width: 95%;
 }
 
-.icon-view_customize {
+.icon-view_customize:not(:has(svg)) {
     background-image: url("../images/view_customize.png");
 }
 
-.icon-view_customize-disable {
+.icon-view_customize-disable:not(:has(svg)) {
     background-image: url("../images/disable.png");
 }
 
-.icon-view_customize-enable {
+.icon-view_customize-enable:not(:has(svg)) {
     background-image: url("../images/enable.png");
 }
+
+/* PNG icon support for Redmine 5.1 and earlier */
+.icon:not(:has(svg)) {
+  background-position: 0% 50%;
+  background-repeat: no-repeat;
+  padding-left: 20px;
+}

assets/stylesheets/view_customize.css

@@ -0,0 +1,6 @@
+- name: view_customize
+  svg: file-settings
+- name: view_customize_enable
+  svg: circle-check
+- name: view_customize_disable
+  svg: xbox-x

config/icon_source.yml

@@ -11,6 +11,7 @@
     { :controller => 'view_customizes', :action => 'index' },
     :caption => :label_view_customize,
     :html => { :class => 'icon icon-view_customize'},
+    :icon => 'view_customize', :plugin => 'view_customize',
     :if => Proc.new { User.current.admin? }
 
   settings :default => { 'create_api_access_key' => '' }, :partial => 'settings/view_customize_settings'