MDL-12075 Display individually colour-coded events in calendar rather than random...

diff --git a/calendar/lib.php b/calendar/lib.php
index 1a156faef3e6da4c65bdeb21a303afa475bfcb8c..c92310188f7cd8e4cff2d2dadc906ea55c544d9e 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1049,7 +1049,7 @@ function calendar_events_by_day($events, $month, $year, &$eventsbyday, &$duratio
             else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) {
                 $typesbyday[$eventdaystart]['startcourse'] = true;
                 // Set event class for course event
-                //$events[$event->id]->class = 'event_course';
+                $events[$event->id]->class = 'event_course';
             }
             else if($event->groupid) {
                 $typesbyday[$eventdaystart]['startgroup'] = true;

diff --git a/calendar/view.php b/calendar/view.php
index d38957560b8f6622c6327b616001e1528b998db7..47cc1fa98b3460958eac909ffdb806b5657da4b1 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -447,15 +447,6 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
 
         // Special visual fx if an event is defined
         if(isset($eventsbyday[$day])) {
-            if(isset($typesbyday[$day]['startglobal'])) {       
-                   $class .= ' event_global';   
-               } else if(isset($typesbyday[$day]['startcourse'])) {     
-                   $class .= ' event_course';   
-               } else if(isset($typesbyday[$day]['startgroup'])) {      
-                  $class .= ' event_group';     
-               } else if(isset($typesbyday[$day]['startuser'])) {       
-                   $class .= ' event_user';     
-               }    
             if(count($eventsbyday[$day]) == 1) {
                 $title = get_string('oneevent', 'calendar');
             }

diff --git a/theme/standard/styles_moz.css b/theme/standard/styles_moz.css
index 51b0e2cb08aaa92ab3f57c6e7702fb7ae9f60965..b0ffa599c96af91ff8a5fa56fb75bd33798382e3 100644 (file)
--- a/theme/standard/styles_moz.css
+++ b/theme/standard/styles_moz.css
@@ -180,6 +180,17 @@ table.minicalendar td {
   -moz-border-radius:4px;
 }
 
+#calendar .maincalendar li.event_course,
+#calendar .maincalendar li.event_global,
+#calendar .maincalendar li.event_user,
+#calendar .maincalendar li.event_group,
+#calendar .filters td.event_course,
+#calendar .filters td.event_global,
+#calendar .filters td.event_user,
+#calendar .filters td.event_group {
+  -moz-border-radius:4px;
+}
+
 /***
  *** Course
  ***/