From 1918bde4d041e755b16cde729b4b3e0b2690aeb4 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 5 Jul 2016 09:08:51 -0400 Subject: [PATCH] (js,css) Style cancelled events in Calendar module --- NEWS | 1 + .../js/Scheduler/sgCalendarDayBlock.directive.js | 4 ++++ .../js/Scheduler/sgCalendarMonthEvent.directive.js | 4 ++++ UI/WebServerResources/scss/views/SchedulerUI.scss | 5 +++++ 4 files changed, 14 insertions(+) diff --git a/NEWS b/NEWS index 41654e1d2..6d9f3c3fe 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ Enhancements - [eas] handle inline attachments during EAS content generation - [web] all batch operations can now be performed on selected messages in advanced search mode - [web] add date picker to change date, week, or month of current Calendar view + - [web] style cancelled events in Calendar module - [oc] better handling of nested attachments with OpenChange Bug fixes diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js index 06ed208f5..27d7e67d7 100644 --- a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js +++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js @@ -114,6 +114,10 @@ // Add class for transparency if (scope.block.component.c_isopaque === 0) iElement.addClass('sg-event--transparent'); + + // Add class for cancelled event + if (scope.block.component.c_status === 0) + iElement.addClass('sg-event--cancelled'); } } diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js index 39bd3336a..d771fede4 100644 --- a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js +++ b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js @@ -68,6 +68,10 @@ // Add class for transparency if (scope.block.component.c_isopaque === 0) iElement.addClass('sg-event--transparent'); + + // Add class for cancelled event + if (scope.block.component.c_status === 0) + iElement.addClass('sg-event--cancelled'); } } diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss index 6b07cd123..2c2b06fda 100644 --- a/UI/WebServerResources/scss/views/SchedulerUI.scss +++ b/UI/WebServerResources/scss/views/SchedulerUI.scss @@ -333,6 +333,11 @@ $quarter_height: 10px; ); pointer-events: none; } + + // Event is cancelled + &--cancelled .text { + text-decoration: line-through; + } } .eventInside {