Replace "even" and "odd" CSS classes with "this-month" and "other-month" for calendar days (#41509).

Patch by Go MAEDA (user:maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@23151 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 13 insertions, 11 deletions

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index c013f9650..6efc9fac7 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1245,12 +1245,14 @@ ul.cal {
 
 .cal .calbody p.day-num {font-size: 1.1em; text-align:right;}
 .cal .calbody .abbr-day {display:none}
-.cal .calbody.odd p.day-num {color: #bbb;}
+.cal .calbody.this-month {background-color:#fff;}
+.cal .calbody.other-month {background-color:#f6f7f8;}
+.cal .calbody.other-month p.day-num {color: #bbb;}
 .cal .calbody.today {background:#ffd;}
 .cal .calbody.today p.day-num {font-weight: bold;}
 
 .cal .calbody .icon {padding-top: 2px; padding-bottom: 3px;}
-.cal .calbody.nwday:not(.odd) {background-color:#f1f1f1;}
+.cal .calbody.nwday:not(.other-month) {background-color:#f1f1f1;}
 
 p.cal.legend span {display:flex;}
 .controller-calendars p.buttons {margin-top: unset;}
diff --git a/lib/redmine/helpers/calendar.rb b/lib/redmine/helpers/calendar.rb
index 9f3962236..05887ed34 100644
--- a/lib/redmine/helpers/calendar.rb
+++ b/lib/redmine/helpers/calendar.rb
@@ -57,7 +57,7 @@ module Redmine
       end
 
       def day_css_classes(day)
-        css = day.month==month ? +'even' : +'odd'
+        css = day.month==month ? +'this-month' : +'other-month'
         css << " today" if User.current.today == day
         css << " nwday" if non_working_week_days.include?(day.cwday)
         css
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 134d41cbe..ecf9e5597 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -219,14 +219,14 @@ class CalendarsControllerTest < Redmine::ControllerTest
 
     assert_select 'ul' do
       assert_select 'li.week-number:nth-of-type(2)', :text => /53$/
-      assert_select 'li.odd', :text => /^27/
-      assert_select 'li.even', :text => /^2/
+      assert_select 'li.other-month', :text => /^27/
+      assert_select 'li.this-month', :text => /^2/
     end
 
     assert_select 'ul' do
       assert_select 'li.week-number', :text => /1$/
-      assert_select 'li.odd', :text => /^3/
-      assert_select 'li.even', :text => /^9/
+      assert_select 'li.other-month', :text => /^3/
+      assert_select 'li.this-month', :text => /^9/
     end
 
     with_settings :start_of_week => 1 do
@@ -242,14 +242,14 @@ class CalendarsControllerTest < Redmine::ControllerTest
 
     assert_select 'ul' do
       assert_select 'li.week-number:nth-of-type(2)', :text => /53$/
-      assert_select 'li.even', :text => /^28/
-      assert_select 'li.even', :text => /^3/
+      assert_select 'li.this-month', :text => /^28/
+      assert_select 'li.this-month', :text => /^3/
     end
 
     assert_select 'ul' do
       assert_select 'li.week-number', :text => /1$/
-      assert_select 'li.even', :text => /^4/
-      assert_select 'li.even', :text => /^10/
+      assert_select 'li.this-month', :text => /^4/
+      assert_select 'li.this-month', :text => /^10/
     end
   end