git-svn-id: http://svn.redmine.org/redmine/trunk@15598 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/3.4.0
@@ -1365,8 +1365,4 @@ module ApplicationHelper | |||
extend helper | |||
return self | |||
end | |||
def link_to_content_update(text, url_params = {}, html_options = {}) | |||
link_to(text, url_params, html_options) | |||
end | |||
end |
@@ -53,6 +53,6 @@ module CalendarsHelper | |||
end | |||
def link_to_month(link_name, year, month, options={}) | |||
link_to_content_update(h(link_name), params.merge(:year => year, :month => month), options) | |||
link_to(link_name, params.merge(:year => year, :month => month), options) | |||
end | |||
end |
@@ -23,7 +23,7 @@ module GanttHelper | |||
case in_or_out | |||
when :in | |||
if gantt.zoom < 4 | |||
link_to_content_update l(:text_zoom_in), | |||
link_to l(:text_zoom_in), | |||
params.merge(gantt.params.merge(:zoom => (gantt.zoom + 1))), | |||
:class => 'icon icon-zoom-in' | |||
else | |||
@@ -32,7 +32,7 @@ module GanttHelper | |||
when :out | |||
if gantt.zoom > 1 | |||
link_to_content_update l(:text_zoom_out), | |||
link_to l(:text_zoom_out), | |||
params.merge(gantt.params.merge(:zoom => (gantt.zoom - 1))), | |||
:class => 'icon icon-zoom-out' | |||
else |
@@ -223,7 +223,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_content_update(h(caption), url_options, :class => css) | |||
link_to(caption, url_options, :class => css) | |||
end | |||
# Returns a table header <th> tag with a sort link for the named column |
@@ -24,12 +24,12 @@ | |||
<span class="pagination"> | |||
<ul class="pages"> | |||
<li class="previous page"> | |||
<%= link_to_content_update("\xc2\xab " + l(:label_previous), | |||
<%= link_to("\xc2\xab " + l(:label_previous), | |||
params.merge(:from => @date_to - @days - 1), | |||
:title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)), | |||
:accesskey => accesskey(:previous)) %> | |||
</li><% unless @date_to >= User.current.today %><li class="next page"> | |||
<%= link_to_content_update(l(:label_next) + " \xc2\xbb", | |||
<%= link_to(l(:label_next) + " \xc2\xbb", | |||
params.merge(:from => @date_to + @days - 1), | |||
:title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)), | |||
:accesskey => accesskey(:next)) %><% end %> |
@@ -332,12 +332,12 @@ | |||
<table style="width:100%"> | |||
<tr> | |||
<td style="text-align:left;"> | |||
<%= link_to_content_update("\xc2\xab " + l(:label_previous), | |||
<%= link_to("\xc2\xab " + l(:label_previous), | |||
params.merge(@gantt.params_previous), | |||
:accesskey => accesskey(:previous)) %> | |||
</td> | |||
<td style="text-align:right;"> | |||
<%= link_to_content_update(l(:label_next) + " \xc2\xbb", | |||
<%= link_to(l(:label_next) + " \xc2\xbb", | |||
params.merge(@gantt.params_next), | |||
:accesskey => accesskey(:next)) %> | |||
</td> |