Replaces zoom-in and zoom-out icons with SVG icons in Gantt (#23980).

git-svn-id: https://svn.redmine.org/redmine/trunk@22994 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 5dd96340d6271195703a9491fb51f31c442fdcfc..7f4ee580d873c9c83893682111b66e38d5b6fcef 100644 (file)
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1715,8 +1715,8 @@ span.icon-label {
 .icon-summary:not(:has(svg)) { background-image: url(/lightning.png); }
 .icon-server-authentication { background-image: url(/server_key.png); }
 .icon-issue { background-image: url(/ticket.png); }
-.icon-zoom-in { background-image: url(/zoom_in.png); }
-.icon-zoom-out { background-image: url(/zoom_out.png); }
+.icon-zoom-in:not(:has(svg)) { background-image: url(/zoom_in.png); }
+.icon-zoom-out:not(:has(svg)) { background-image: url(/zoom_out.png); }
 .icon-magnifier { background-image: url(/magnifier.png); }
 .icon-passwd { background-image: url(/textfield_key.png); }
 .icon-arrow-right, .icon-test:not(:has(svg)), .icon-sticky { background-image: url(/bullet_go.png); }

diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb
index 674e0605396141db451159250163ef48cdbf3bfc..d037dfeaa53833224d18e5bb01960d9bfd6ed78e 100644 (file)
--- a/app/helpers/gantt_helper.rb
+++ b/app/helpers/gantt_helper.rb
@@ -23,21 +23,21 @@ module GanttHelper
     when :in
       if gantt.zoom < 4
         link_to(
-          l(:text_zoom_in),
+          icon_with_label('zoom-in', l(:text_zoom_in)),
           {:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom + 1)))},
           :class => 'icon icon-zoom-in')
       else
-        content_tag(:span, l(:text_zoom_in), :class => 'icon icon-zoom-in').html_safe
+        content_tag(:span, icon_with_label('zoom-in', l(:text_zoom_in)), :class => 'icon icon-zoom-in').html_safe
       end
 
     when :out
       if gantt.zoom > 1
         link_to(
-          l(:text_zoom_out),
+          icon_with_label('zoom-out', l(:text_zoom_out)),
           {:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom - 1)))},
           :class => 'icon icon-zoom-out')
       else
-        content_tag(:span, l(:text_zoom_out), :class => 'icon icon-zoom-out').html_safe
+        content_tag(:span, icon_with_label('zoom-out', l(:text_zoom_out)), :class => 'icon icon-zoom-out').html_safe
       end
     end
   end