diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-08-04 09:42:58 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-08-04 09:42:58 +0000 |
| commit | be8372e7ccfb0c2cb63a238bb6c34d6e8cdbc839 (patch) | |
| tree | 79ba73ea53327c98b170a19ab8ae5a04e0a9c657 /app | |
| parent | 10ae000021d20b737b6a3c4b09167c0db26511ac (diff) | |
| download | redmine-be8372e7ccfb0c2cb63a238bb6c34d6e8cdbc839.tar.gz redmine-be8372e7ccfb0c2cb63a238bb6c34d6e8cdbc839.zip | |
Previous and next month links in gantt (#31373).
Patch by Mizuki ISHIKAWA.
git-svn-id: http://svn.redmine.org/redmine/trunk@18346 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 36 | ||||
| -rw-r--r-- | app/helpers/calendars_helper.rb | 38 | ||||
| -rw-r--r-- | app/views/gantts/show.html.erb | 9 |
3 files changed, 43 insertions, 40 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 diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 00dd2c230..348d04b69 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -70,8 +70,13 @@ </div> <p class="contextual"> - <%= gantt_zoom_link(@gantt, :in) %> - <%= gantt_zoom_link(@gantt, :out) %> + <span> + <%= gantt_zoom_link(@gantt, :in) %> + <%= gantt_zoom_link(@gantt, :out) %> + </span> + <span> + <%= link_to_previous_month(@gantt.year_from, @gantt.month_from, :accesskey => accesskey(:previous)) %> | <%= link_to_next_month(@gantt.year_from, @gantt.month_from, :accesskey => accesskey(:next)) %> + </span> </p> <p class="buttons"> |