diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php index d0d574391c598e44b474fdf0cd096b2d90cfb9c3..89421cb3e99c3416289bf8b259e0b07232631726 100644 --- a/app/controllers/calendar/calendar.php +++ b/app/controllers/calendar/calendar.php @@ -578,20 +578,18 @@ class Calendar_CalendarController extends AuthenticatedController $course_dates = CalendarCourseDate::getEvents($begin, $end, $owner->id); foreach ($course_dates as $course_date) { $event = $course_date->toEventData(User::findCurrent()->id); - $event->background_colour = '#ffffff'; + $event->background_colour = ''; $event->text_colour = '#000000'; - $event->border_colour = '#000000'; - $event->event_classes = []; + $event->border_colour = ''; $result[] = $event->toFullcalendarEvent(); } //Include relevant cancelled course dates: $cancelled_course_dates = CalendarCourseExDate::getEvents($begin, $end, $owner->id); foreach ($cancelled_course_dates as $cancelled_course_date) { $event = $cancelled_course_date->toEventData(User::findCurrent()->id); - $event->background_colour = '#ffffff'; + $event->background_colour = ''; $event->text_colour = '#000000'; - $event->border_colour = '#000000'; - $event->event_classes = []; + $event->border_colour = ''; $result[] = $event->toFullcalendarEvent(); } } diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php index f6e165742f3e03b46564d7f4a7749d2a57ab84e9..98da7fd315372f3fa4f919849c05e3bd580b7909 100644 --- a/lib/models/CourseDate.class.php +++ b/lib/models/CourseDate.class.php @@ -633,7 +633,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event ); $class_names = []; if ($membership) { - $class_names[] = sprintf('gruppe%u', $membership->status); + $class_names[] = 'course-color-' . $membership->gruppe; } $studip_view_urls = []; if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {