From 552064d3919079284da636bd17fe444e1c512aef Mon Sep 17 00:00:00 2001 From: moodler Date: Sat, 22 May 2004 07:14:49 +0000 Subject: [PATCH] Some improvements in display I'm not finished yet, just checking in to continue on another server --- calendar/lib.php | 14 ++++++------ calendar/overlib.cfg.php | 9 ++++---- calendar/view.php | 48 +++++++++++++++++++++++++--------------- 3 files changed, 42 insertions(+), 29 deletions(-) diff --git a/calendar/lib.php b/calendar/lib.php index 0e5e32a25a..ae4b874c79 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -169,10 +169,10 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y $popupcontent = ''; foreach($eventsbyday[$day] as $eventid) { if(!empty($events[$eventid]->modulename)) { - $popupcontent .= '
modpixpath.'/'.$events[$eventid]->modulename.'/icon.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\''.$events[$eventid]->modulename.'\\\' />'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; + $popupcontent .= '
modpixpath.'/'.$events[$eventid]->modulename.'/icon.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\''.$events[$eventid]->modulename.'\\\' />'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; } else { - $popupcontent .= '
pixpath.'/c/event.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\'\\\' />'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; + $popupcontent .= '
pixpath.'/c/event.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\'\\\' />'.addslashes(htmlspecialchars($events[$eventid]->name)).'
'; } } @@ -365,13 +365,13 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve $eventtype = get_string($event->eventtype, $event->modulename); $icon = $CFG->modpixpath.'/'.$event->modulename.'/icon.gif'; $output[$outkey]->referer = ''.$event->name.''; - $output[$outkey]->icon = ''; + $output[$outkey]->icon = ''; $output[$outkey]->name = $event->name; $output[$outkey]->time = $eventtime; $output[$outkey]->description = $event->description; } else if($event->courseid == 1) { - $output[$outkey]->icon = ''; + $output[$outkey]->icon = ''; $output[$outkey]->name = $event->name; $output[$outkey]->time = $eventtime; $output[$outkey]->description = $event->description; @@ -381,21 +381,21 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve calendar_get_course_cached($coursecache, $event->courseid); $output[$outkey]->referer = ''.$coursecache[$event->courseid]->fullname.''; - $output[$outkey]->icon = ''; + $output[$outkey]->icon = ''; $output[$outkey]->name = $event->name; $output[$outkey]->time = $eventtime; $output[$outkey]->description = $event->description; } else if($event->groupid) { // Group event - $output[$outkey]->icon = ''; + $output[$outkey]->icon = ''; $output[$outkey]->name = $event->name; $output[$outkey]->time = $eventtime; $output[$outkey]->description = $event->description; } else if($event->userid) { // User event - $output[$outkey]->icon = ''; + $output[$outkey]->icon = ''; $output[$outkey]->name = $event->name; $output[$outkey]->time = $eventtime; $output[$outkey]->description = $event->description; diff --git a/calendar/overlib.cfg.php b/calendar/overlib.cfg.php index b4cbb39d9c..2570aa2bb6 100644 --- a/calendar/overlib.cfg.php +++ b/calendar/overlib.cfg.php @@ -1,10 +1,11 @@ -ol_delay = 1000; -ol_css = CSSCLASS; +ol_delay = 300; +ol_fgcolor = '#ffffff'; ol_fgclass = 'cal_popup_fg'; ol_bgclass = 'cal_popup_bg'; +ol_cgclass = 'cal_popup_cg'; ol_captionfontclass = 'cal_popup_caption'; -ol_closefontclass = 'cal_popup_close'; -ol_closeclick = true; +ol_noclose = true; ol_sticky = true; ol_close = 'X'; ol_offsety = -20; +ol_mouseoff = 1; diff --git a/calendar/view.php b/calendar/view.php index 6ced4d107a..0446c31a97 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -495,14 +495,14 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) { } function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $maxevents) { + $events = calendar_get_upcoming($courses, $groups, $users, $futuredays, $maxevents); - $numevents = count($events); // New event button if(isguest()) { $text = get_string('upcomingevents', 'calendar').': '.calendar_course_filter_selector('from=upcoming'); - } - else { + + } else { $text = '
'.get_string('upcomingevents', 'calendar').': '.calendar_course_filter_selector('from=upcoming').'
'; $text.= '
'; $text.= ''; @@ -513,26 +513,38 @@ function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $ } print_side_block_start($text, '', 'mycalendar'); - for($i = 0; $i < $numevents; ++$i) { - echo '

'; - if(!empty($events[$i]->icon)) { - echo ''.$events[$i]->icon.' '; - } - if(!empty($events[$i]->referer) && empty($events[$i]->icon)) { - echo ''.$events[$i]->referer.': '; - } - echo ''.$events[$i]->name.":\n"; - echo ''.$events[$i]->time.''; - echo '

'.$events[$i]->description.'
'; - if($i < $numevents - 1) { - echo '
'; - } - echo '

'; + foreach ($events as $event) { + calendar_print_event($event); } print_side_block_end(); } +function calendar_print_event($event) { + global $THEME; + + echo ''; + echo "'; + echo ""; + echo ""; + echo "\n
cellcontent2\" class=\"forumpostpicture\" width=\"16\" valign=\"top\">"; + if (!empty($event->icon)) { + echo $event->icon; + } + echo 'cellheading\" class=\"forumpostheader\" width=\"100%\">"; + + if(!empty($event->referer) and empty($event->icon)) { + echo ''.$event->referer.': '; + } + echo ''.$event->name."   "; + echo ''.$event->time.''; + + echo "
cellcontent2\" valign=\"top\" class=\"forumpostside\" width=\"16\"> cellcontent\" class=\"forumpostmessage\">\n"; + echo format_text($event->description, FORMAT_HTML); + echo "

\n\n"; +} + + function calendar_print_event_table($event, $starttime, $endtime, &$coursecache, $alldetails = false) { global $CFG; -- 2.39.5