diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 25c71aefe..dc90578c1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -338,15 +338,15 @@ module ApplicationHelper html = '' if paginator.current.previous - html << link_to_remote_content_update('« ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' ' + html << link_to_content_update('« ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' ' end html << (pagination_links_each(paginator, options) do |n| - link_to_remote_content_update(n.to_s, url_param.merge(page_param => n)) + link_to_content_update(n.to_s, url_param.merge(page_param => n)) end || '') if paginator.current.next - html << ' ' + link_to_remote_content_update((l(:label_next) + ' »'), url_param.merge(page_param => paginator.current.next)) + html << ' ' + link_to_content_update((l(:label_next) + ' »'), url_param.merge(page_param => paginator.current.next)) end unless count.nil? @@ -361,10 +361,7 @@ module ApplicationHelper def per_page_links(selected=nil) links = Setting.per_page_options_array.collect do |n| - n == selected ? n : link_to_remote(n, {:update => "content", - :url => params.merge(:per_page => n), - :method => :get}, - {:href => url_for(params.merge(:per_page => n))}) + n == selected ? n : link_to_content_update(n, params.merge(:per_page => n)) end links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil end @@ -934,11 +931,10 @@ module ApplicationHelper return self end - def link_to_remote_content_update(text, url_params) + def link_to_content_update(text, url_params = {}, html_options = {}) link_to_remote(text, {:url => url_params, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'}, - {:href => url_for(:params => url_params)} + {:href => url_for(:params => url_params)}.merge(html_options) ) end - end diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index d898df3e9..82f3905e7 100644 --- a/app/helpers/calendars_helper.rb +++ b/app/helpers/calendars_helper.rb @@ -32,12 +32,6 @@ module CalendarsHelper end def link_to_month(link_name, year, month, options={}) - link_target = url_for(params.merge(:year => year, :month => month)) - - link_to_remote(link_name, - {:update => "content", :url => link_target, :method => :get}, - {:href => link_target}) - + link_to_content_update(link_name, params.merge(:year => year, :month => month)) end - end diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb index 03a48c4f3..699852ffc 100644 --- a/app/helpers/gantt_helper.rb +++ b/app/helpers/gantt_helper.rb @@ -21,20 +21,18 @@ module GanttHelper case in_or_out when :in if gantt.zoom < 4 - link_to_remote(l(:text_zoom_in), - {:url => params.merge(gantt.params.merge(:zoom => (gantt.zoom+1))), :method => :get, :update => 'content'}, - {:href => url_for(params.merge(gantt.params.merge(:zoom => (gantt.zoom+1)))), - :class => 'icon icon-zoom-in'}) + link_to_content_update l(:text_zoom_in), + params.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') end when :out if gantt.zoom > 1 - link_to_remote(l(:text_zoom_out), - {:url => params.merge(gantt.params.merge(:zoom => (gantt.zoom-1))), :method => :get, :update => 'content'}, - {:href => url_for(params.merge(gantt.params.merge(:zoom => (gantt.zoom-1)))), - :class => 'icon icon-zoom-out'}) + link_to_content_update l(:text_zoom_out), + params.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') end diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index c1a89db5a..2dc245348 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -206,10 +206,7 @@ module SortHelper # Add project_id to url_options url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id) - link_to_remote(caption, - {:update => "content", :url => url_options, :method => :get}, - {:href => url_for(url_options), - :class => css}) + link_to_content_update(caption, url_options, :class => css) end # Returns a table header
<%= link_to_remote ('« ' + l(:label_previous)), {:url => params.merge(@gantt.params_previous), :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(params.merge(@gantt.params_previous))} %> | -<%= link_to_remote (l(:label_next) + ' »'), {:url => params.merge(@gantt.params_next), :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(params.merge(@gantt.params_next))} %> | +<%= link_to_content_update('« ' + l(:label_previous), params.merge(@gantt.params_previous)) %> | +<%= link_to_content_update(l(:label_next) + ' »', params.merge(@gantt.params_next)) %> |