Skip to content

Commit

Permalink
(js,css) Style cancelled events in Calendar module
Browse files Browse the repository at this point in the history
  • Loading branch information
cgx committed Jul 5, 2016
1 parent 0d1ac2e commit 1918bde
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

}
Expand Down
5 changes: 5 additions & 0 deletions UI/WebServerResources/scss/views/SchedulerUI.scss
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,11 @@ $quarter_height: 10px;
);
pointer-events: none;
}

// Event is cancelled
&--cancelled .text {
text-decoration: line-through;
}
}

.eventInside {
Expand Down

0 comments on commit 1918bde

Please sign in to comment.