summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/my_controller.rb1
-rw-r--r--app/helpers/calendars_helper.rb3
2 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index d2cc0c53c..72b65e433 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -29,6 +29,7 @@ class MyController < ApplicationController
helper :custom_fields
helper :queries
helper :activities
+ helper :calendars
def index
page
diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb
index a807ec426..fe3796c7f 100644
--- a/app/helpers/calendars_helper.rb
+++ b/app/helpers/calendars_helper.rb
@@ -18,6 +18,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
module CalendarsHelper
+ include Redmine::Utils::DateCalculation
+
def link_to_previous_month(year, month, options={})
target_year, target_month = if month == 1
[year - 1, 12]
@@ -59,6 +61,7 @@ module CalendarsHelper
def calendar_day_css_classes(calendar, day)
css = day.month==calendar.month ? 'even' : 'odd'
css << " today" if User.current.today == day
+ css << " nwday" if non_working_week_days.include?(day.cwday)
css
end
end