]> source.dussan.org Git - redmine.git/commitdiff
Makes zoom buttons on gantt looks like the others.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 23 Oct 2010 09:08:55 +0000 (09:08 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sat, 23 Oct 2010 09:08:55 +0000 (09:08 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4283 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/gantt_helper.rb
app/views/gantts/show.html.erb
public/stylesheets/application.css

index 97f7646f9cab8de6a307cca1efa41e497dcfb7c0..b0d9f5519850b8500ff0332915c38c26c657279d 100644 (file)
 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
index cb2da5adcb69bc60289c764cd86b8d601f71754f..1509261e78c7ea020764c6efc9b7fe4fa41a8d3e 100644 (file)
@@ -10,7 +10,7 @@
   </div>
 </fieldset>
 
-<p style="float:right;">
+<p class="contextual">
   <%= gantt_zoom_link(@gantt, :in) %>
   <%= gantt_zoom_link(@gantt, :out) %>
 </p>
index 65ad9649248e9a266f7b78dde6a092ed1785d132..f3bbf224ea6925c5e2f41724970d2a0b915dfd1f 100644 (file)
@@ -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); }