diff options
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 36 | ||||
| -rw-r--r-- | app/helpers/calendars_helper.rb | 38 |
2 files changed, 36 insertions, 38 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 60f80ed20..5fb994c19 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -298,6 +298,42 @@ module ApplicationHelper link_to(name, "#", :onclick => onclick) end + def link_to_previous_month(year, month, options={}) + target_year, target_month = if month == 1 + [year - 1, 12] + else + [year, month - 1] + end + + name = if target_month == 12 + "#{month_name(target_month)} #{target_year}" + else + month_name(target_month) + end + + link_to_month(("« " + name), target_year, target_month, options) + end + + def link_to_next_month(year, month, options={}) + target_year, target_month = if month == 12 + [year + 1, 1] + else + [year, month + 1] + end + + name = if target_month == 1 + "#{month_name(target_month)} #{target_year}" + else + month_name(target_month) + end + + link_to_month((name + " »"), target_year, target_month, options) + end + + def link_to_month(link_name, year, month, options={}) + link_to(link_name, {:params => request.query_parameters.merge(:year => year, :month => month)}, options) + end + # Used to format item titles on the activity view def format_activity_title(text) text diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index 0cb071c34..a248eab97 100644 --- a/app/helpers/calendars_helper.rb +++ b/app/helpers/calendars_helper.rb @@ -20,44 +20,6 @@ module CalendarsHelper include Redmine::Utils::DateCalculation - def link_to_previous_month(year, month, options={}) - target_year, target_month = if month == 1 - [year - 1, 12] - else - [year, month - 1] - end - - name = if target_month == 12 - "#{month_name(target_month)} #{target_year}" - else - "#{month_name(target_month)}" - end - - # \xc2\xab(utf-8) = « - link_to_month(("\xc2\xab " + name), target_year, target_month, options) - end - - def link_to_next_month(year, month, options={}) - target_year, target_month = if month == 12 - [year + 1, 1] - else - [year, month + 1] - end - - name = if target_month == 1 - "#{month_name(target_month)} #{target_year}" - else - "#{month_name(target_month)}" - end - - # \xc2\xbb(utf-8) = » - link_to_month((name + " \xc2\xbb"), target_year, target_month, options) - end - - def link_to_month(link_name, year, month, options={}) - link_to(link_name, {:params => request.query_parameters.merge(:year => year, :month => month)}, options) - end - def calendar_day_css_classes(calendar, day) css = day.month==calendar.month ? +'even' : +'odd' css << " today" if User.current.today == day |