From a29c35e08f2322d7ed0dc362419009a06b74329c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 23 Oct 2010 09:08:55 +0000 Subject: [PATCH] Makes zoom buttons on gantt looks like the others. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4283 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/gantt_helper.rb | 18 ++++++++---------- app/views/gantts/show.html.erb | 2 +- public/stylesheets/application.css | 2 ++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb index 97f7646f9..b0d9f5519 100644 --- a/app/helpers/gantt_helper.rb +++ b/app/helpers/gantt_helper.rb @@ -18,27 +18,25 @@ module GanttHelper def gantt_zoom_link(gantt, in_or_out) - img_attributes = {:style => 'height:1.4em; width:1.4em; margin-left: 3px;'} # em for accessibility - case in_or_out when :in if gantt.zoom < 4 - link_to_remote(l(:text_zoom_in) + image_tag('zoom_in.png', img_attributes.merge(:alt => l(:text_zoom_in))), + link_to_remote(l(:text_zoom_in), {:url => gantt.params.merge(:zoom => (gantt.zoom+1)), :method => :get, :update => 'content'}, - {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom+1)))}) + {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom+1))), + :class => 'icon icon-zoom-in'}) else - l(:text_zoom_in) + - image_tag('zoom_in_g.png', img_attributes.merge(:alt => l(:text_zoom_in))) + content_tag('span', l(:text_zoom_in), :class => 'icon icon-zoom-in') end when :out if gantt.zoom > 1 - link_to_remote(l(:text_zoom_out) + image_tag('zoom_out.png', img_attributes.merge(:alt => l(:text_zoom_out))), + link_to_remote(l(:text_zoom_out), {:url => gantt.params.merge(:zoom => (gantt.zoom-1)), :method => :get, :update => 'content'}, - {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom-1)))}) + {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom-1))), + :class => 'icon icon-zoom-out'}) else - l(:text_zoom_out) + - image_tag('zoom_out_g.png', img_attributes.merge(:alt => l(:text_zoom_out))) + content_tag('span', l(:text_zoom_out), :class => 'icon icon-zoom-out') end end end diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index cb2da5adc..1509261e7 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -10,7 +10,7 @@ -

+

<%= gantt_zoom_link(@gantt, :in) %> <%= gantt_zoom_link(@gantt, :out) %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 65ad96492..f3bbf224e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -854,6 +854,8 @@ padding-bottom: 3px; .icon-summary { background-image: url(../images/lightning.png); } .icon-server-authentication { background-image: url(../images/server_key.png); } .icon-issue { background-image: url(../images/ticket.png); } +.icon-zoom-in { background-image: url(../images/zoom_in.png); } +.icon-zoom-out { background-image: url(../images/zoom_out.png); } .icon-file { background-image: url(../images/files/default.png); } .icon-file.text-plain { background-image: url(../images/files/text.png); }