From: toyomoyo Date: Tue, 9 Oct 2007 04:02:43 +0000 (+0000) Subject: MDL-10048, revert some changes in courses regaring coloring of courses X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e3bb6401e15fe46012c16a6bc5f8e5569ab47677;p=moodle.git MDL-10048, revert some changes in courses regaring coloring of courses --- diff --git a/calendar/lib.php b/calendar/lib.php index a0f0313935..5474d8e96b 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -62,8 +62,6 @@ define ('CALENDAR_URL', $CFG->wwwroot.'/calendar/'); define ('CALENDAR_TF_24', '%H:%M'); define ('CALENDAR_TF_12', '%I:%M %p'); -define ('CALENDAR_MAXCOURSES', 3); - $CALENDARDAYS = array('sunday','monday','tuesday','wednesday','thursday','friday','saturday'); @@ -153,9 +151,6 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y // Set event course class for course events if (!empty($events)) { foreach ($events as $eventid => $event) { - if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { - $event->class = 'event_course'.array_search($event->courseid, $courses) % CALENDAR_MAXCOURSES; - } if (!empty($event->modulename)) { $cm = get_coursemodule_from_instance($event->modulename, $event->instance); if (!groups_course_module_visible($cm)) { @@ -519,20 +514,7 @@ function calendar_print_event($event) { echo ''; echo ' '; - - // If event has a class set then add it to the event tag - $eventclass=''; - if (!empty($event->class)) { - $eventclass = ' '.$event->class; - } - - if (isset($event->cssclass)) { - $eclass = $event->cssclass.$eventclass; - } else { - $eclass = $eventclass; - } - - echo ''; + echo ''; echo format_text($event->description, FORMAT_HTML); if (calendar_edit_event_allowed($event)) { echo '
'; @@ -793,101 +775,46 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses $content .= ''.get_string('show').''; $content .= ''.get_string('global', 'calendar').''."\n"; } - $tr = ''; + if($SESSION->cal_show_course) { + $content .= ''.get_string('hide').''; + $content .= ''.get_string('courseevents', 'calendar').''."\n"; + } + else { + $content .= ''.get_string('hide').''; + $content .= ''.get_string('courseevents', 'calendar').''."\n"; + } - if(!empty($USER->id) && !isguest()) { - $content .= $tr; - $tr = $tr ? '' : "\n"; + if(!empty($USER->id) && !isguest()) { + $content .= "\n"; if($groupevents) { - // This course MIGHT have group events defined, so show the filter if($SESSION->cal_show_groups) { - $content .= ''.get_string('hide').''; - $content .= ''.get_string('group', 'calendar').''."\n"; + $content .= ''.get_string('hide').''; + $content .= ''.get_string('groupevents', 'calendar').''."\n"; } else { - $content .= ''.get_string('show').''; - $content .= ''.get_string('group', 'calendar').''."\n"; + $content .= ''.get_string('show').''; + $content .= ''.get_string('groupevents', 'calendar').''."\n"; + } + if ($SESSION->cal_show_user) { + $content .= ''.get_string('hide').''; + $content .= ''.get_string('userevents', 'calendar').''."\n"; + } else { + $content .= ''.get_string('show').''; + $content .= ''.get_string('userevents', 'calendar').''."\n"; } - } else { + } else { // This course CANNOT have group events, so lose the filter $content .= ' '."\n"; - } - - $content .= $tr; - $tr = $tr ? '' : "\n"; - if ($SESSION->cal_show_user) { - $content .= ''.get_string('hide').''; - $content .= ''.get_string('user', 'calendar').''."\n"; - } else { - $content .= ''.get_string('show').''; - $content .= ''.get_string('user', 'calendar').''."\n"; - } - } - - // Remove global SITE ID from courses array as do not want to display this - if (!empty($courses)) { - $key = array_search(SITEID, $courses); - if ($key !== false) { - unset($courses[$key]); - } - } - - if (empty($courses) || count($courses) == 1) { - - // If not multiple courses then just display default single course colour highlighting - $content .= $tr; - $tr = $tr ? '' : "\n"; - - if($SESSION->cal_show_course) { - $content .= ''.get_string('hide').''; - $content .= ''.get_string('course', 'calendar').''."\n"; - } - else { - $content .= ''.get_string('hide').''; - $content .= ''.get_string('course', 'calendar').''."\n"; - } - } else { - - // Otherwise display list of course shortnames and relevant colours - // Get list of course shortnames (Limit to 12 for now - who would have more than that?) - $select = 'id in ('.implode(',', $courses).')'; - $sort = 'id'; - $fields = 'id, shortname'; - $courseshortnames = get_records_select('course', $select, $sort, $fields, 0, 12); - - for ($i = 0; $i < CALENDAR_MAXCOURSES; $i++) { - - // Concatenate shortnames if there are more than 3 courses - $strshortnames = ''; - $n = 0; - for ($j = $i; $j < count($courses); $j += CALENDAR_MAXCOURSES) { - $strshortnames .= ', '.(!empty($courseshortnames[$courses[$j]]->shortname) ? $courseshortnames[$courses[$j]]->shortname : $courses[$j]).''; - $n++; - } - - if ($n) { - - $content .= $tr; - $tr = $tr ? '' : "\n"; - - if ($n < 2) { - $strcourse = get_string('course', 'calendar'); - } else { - $strcourse = get_string('courses', 'calendar'); - } - - if($SESSION->cal_show_course) { - $content .= ''.get_string('hide').''; - $content .= ''.$strcourse.': '.substr($strshortnames, 2).''."\n"; - } - else { - $content .= ''.get_string('hide').''; - $content .= ''.$strcourse.': '.substr($strshortnames, 2).''."\n"; - } + if($SESSION->cal_show_user) { + $content .= ''.get_string('hide').''; + $content .= ''.get_string('userevents', 'calendar').''."\n"; + } else { + $content .= ''.get_string('show').''; + $content .= ''.get_string('userevents', 'calendar').''."\n"; } } } @@ -1103,7 +1030,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'.array_search($event->courseid, $courses) % CALENDAR_MAXCOURSES; + //$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 d45f055e20..3e382199cc 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -268,10 +268,6 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users, $courseid) { // First, print details about events that start today foreach ($events as $event) { - // Set event course class if a course event - if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { - $event->class = 'event_course'.array_search($event->courseid, $courses) % CALENDAR_MAXCOURSES; - } $event->calendarcourseid = $courseid; if ($event->timestart >= $starttime && $event->timestart <= $endtime) { // Print it now @@ -451,6 +447,15 @@ 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'); } @@ -522,6 +527,55 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course echo "\n"; // Tabular display of days ends + // OK, now for the filtering display + echo '
'; + + // Global events + if($SESSION->cal_show_global) { + echo ''."\n"; + } + else { + echo ''."\n"; + } + + // Course events + if(!empty($SESSION->cal_show_course)) { + echo ''."\n"; + } + else { + echo ''."\n"; + } + + echo "\n"; + + if(!empty($USER->id) && !isguest()) { + echo ''; + // Group events + if($SESSION->cal_show_groups) { + echo ''."\n"; + } + else { + echo ''."\n"; + } + // User events + if($SESSION->cal_show_user) { + echo ''."\n"; + } + else { + echo ''."\n"; + } + echo "\n"; + } + + echo '
'.get_string('globalevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('globalevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')'.get_string('courseevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('courseevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')
'.get_string('groupevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('groupevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')'.get_string('userevents', 'calendar').': '; + echo get_string('shown', 'calendar').' ('.get_string('clickhide', 'calendar').')'.get_string('userevents', 'calendar').': '; + echo get_string('hidden', 'calendar').' ('.get_string('clickshow', 'calendar').')
'; } function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $maxevents, $courseid) { @@ -553,12 +607,6 @@ function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $ echo '
'; foreach ($events as $event) { - - // Set event course class if a course event - if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { - $event->class = 'event_course'.array_search($event->courseid, $courses) % CALENDAR_MAXCOURSES; - } - calendar_print_event($event); } echo '
'; diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css index 0a157220b9..1a5f703d51 100644 --- a/theme/standard/styles_color.css +++ b/theme/standard/styles_color.css @@ -479,26 +479,6 @@ table.minicalendar { background-color:#FFD3BD; } -#calendar .event_course0, -.minicalendar .event_course0, -.block_calendar_month .event_course0 { - border-color:#FFD3BD !important; /* #EEC2AC */ - background-color:#FFD3BD; -} - -#calendar .event_course1, -.minicalendar .event_course1, -.block_calendar_month .event_course1 { - border-color:#99CCFF !important; /* #EEC2AC */ - background-color:#99CCFF; -} - -#calendar .event_course2, -.minicalendar .event_course2, -.block_calendar_month .event_course2 { - border-color:#FFFFCC !important; /* #EEC2AC */ - background-color:#FFFFCC; -} #calendar .event_group, .minicalendar .event_group, diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index ad269529d2..40e54537f7 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -1621,16 +1621,10 @@ table.minicalendar th { #calendar .event_global, #calendar .event_course, -#calendar .event_course0, -#calendar .event_course1, -#calendar .event_course2, #calendar .event_group, #calendar .event_user, .minicalendar .event_global, .minicalendar .event_course, -.minicalendar .event_course0, -.minicalendar .event_course1, -.minicalendar .event_course2, .minicalendar .event_group, .minicalendar .event_user { border:2px solid !important; @@ -1638,16 +1632,10 @@ table.minicalendar th { #calendar .duration_global, #calendar .duration_course, -#calendar .duration_course0, -#calendar .duration_course1, -#calendar .duration_course2, #calendar .duration_group, #calendar .duration_user, .minicalendar .duration_global, .minicalendar .duration_course, -.minicalendar .duration_course0, -.minicalendar .duration_course1, -.minicalendar .duration_course2, .minicalendar .duration_group, .minicalendar .duration_user {