diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-01-14 05:16:33 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-01-14 05:16:33 +0000 |
| commit | fdf468cdf7f36efd99af8930d4266a420fbe352b (patch) | |
| tree | d829e650bd04061519a38c8d7bdac8227f73909e | |
| parent | 89f65490b499733aaadb0627c03990b519ca9190 (diff) | |
| download | redmine-fdf468cdf7f36efd99af8930d4266a420fbe352b.tar.gz redmine-fdf468cdf7f36efd99af8930d4266a420fbe352b.zip | |
Move calendar day classes to a helper (#27096).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@17797 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/calendars_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/common/_calendar.html.erb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index 715667c15..a807ec426 100644 --- a/app/helpers/calendars_helper.rb +++ b/app/helpers/calendars_helper.rb @@ -55,4 +55,10 @@ module CalendarsHelper 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 + css + end end diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb index 852ab5235..dce3c8b52 100644 --- a/app/views/common/_calendar.html.erb +++ b/app/views/common/_calendar.html.erb @@ -8,7 +8,7 @@ <% day = calendar.startdt while day <= calendar.enddt %> <%= ("<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>".html_safe) if day.cwday == calendar.first_wday %> -<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if User.current.today == day %>"> +<td class="<%= calendar_day_css_classes(calendar, day) %>"> <p class="day-num"><%= day.day %></p> <% calendar.events_on(day).each do |i| %> <% if i.is_a? Issue %> |