Some improvements in display

I'm not finished yet, just checking in to continue on another server

diff --git a/calendar/lib.php b/calendar/lib.php
index 0e5e32a25a6b2036252ea5657c85eaa7a606a8a9..ae4b874c79dc06b735950aef8c09eec8b51db982 100644 (file)
--- 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 .= '<div><img src=\\\''.$CFG->modpixpath.'/'.$events[$eventid]->modulename.'/icon.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\''.$events[$eventid]->modulename.'\\\' /><a href=\\\''.$dayhref.'\\\'>'.addslashes(htmlspecialchars($events[$eventid]->name)).'</a></div>';
+                    $popupcontent .= '<div><img height=16 width=16 src=\\\''.$CFG->modpixpath.'/'.$events[$eventid]->modulename.'/icon.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\''.$events[$eventid]->modulename.'\\\' /><a href=\\\''.$dayhref.'\\\'>'.addslashes(htmlspecialchars($events[$eventid]->name)).'</a></div>';
                 }
                 else {
-                    $popupcontent .= '<div><img src=\\\''.$CFG->pixpath.'/c/event.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\'\\\' /><a href=\\\''.$dayhref.'\\\'>'.addslashes(htmlspecialchars($events[$eventid]->name)).'</a></div>';
+                    $popupcontent .= '<div><img height=16 width=16 src=\\\''.$CFG->pixpath.'/c/event.gif\\\' style=\\\'vertical-align: middle; margin-right: 4px;\\\' alt=\\\'\\\' /><a href=\\\''.$dayhref.'\\\'>'.addslashes(htmlspecialchars($events[$eventid]->name)).'</a></div>';
                 }
             }
 
@@ -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 = '<a href="'.$CFG->wwwroot.'/mod/'.$event->modulename.'/view.php?id='.$module->id.'">'.$event->name.'</a>';
-                $output[$outkey]->icon = '<img src="'.$icon.'" alt="" title="'.$modulename.'" style="vertical-align: middle;" />';
+                $output[$outkey]->icon = '<img height=16 width=16 src="'.$icon.'" alt="" title="'.$modulename.'" style="vertical-align: middle;" />';
                 $output[$outkey]->name = $event->name;
                 $output[$outkey]->time = $eventtime;
                 $output[$outkey]->description = $event->description;
             }
             else if($event->courseid == 1) {
-                $output[$outkey]->icon = '<img src="'.$CFG->pixpath.'/c/site.gif" alt="" style="vertical-align: middle;" />';
+                $output[$outkey]->icon = '<img height=16 width=16 src="'.$CFG->pixpath.'/c/site.gif" alt="" style="vertical-align: middle;" />';
                 $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 = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$coursecache[$event->courseid]->id.'">'.$coursecache[$event->courseid]->fullname.'</a>';
-                $output[$outkey]->icon = '<img src="'.$CFG->pixpath.'/c/course.gif" alt="" style="vertical-align: middle;" />';
+                $output[$outkey]->icon = '<img height=16 width=16 src="'.$CFG->pixpath.'/c/course.gif" alt="" style="vertical-align: middle;" />';
                 $output[$outkey]->name = $event->name;
                 $output[$outkey]->time = $eventtime;
                 $output[$outkey]->description = $event->description;
             }
             else if($event->groupid) {
                 // Group event
-                $output[$outkey]->icon = '<img src="'.$CFG->pixpath.'/c/group.gif" alt="" style="vertical-align: middle;" />';
+                $output[$outkey]->icon = '<img height=16 width=16 src="'.$CFG->pixpath.'/c/group.gif" alt="" style="vertical-align: middle;" />';
                 $output[$outkey]->name = $event->name;
                 $output[$outkey]->time = $eventtime;
                 $output[$outkey]->description = $event->description;
             }
             else if($event->userid) {
                 // User event
-                $output[$outkey]->icon = '<img src="'.$CFG->pixpath.'/c/user.gif" alt="" style="vertical-align: middle;" />';
+                $output[$outkey]->icon = '<img height=16 width=16 src="'.$CFG->pixpath.'/c/user.gif" alt="" style="vertical-align: middle;" />';
                 $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 b4cbb39d9c5cbaac29aaa0162a785d6cd32af8f3..2570aa2bb6aaa20b4ff6ebbb1493e4f9b2e19d53 100644 (file)
--- a/calendar/overlib.cfg.php
+++ b/calendar/overlib.cfg.php
@@ -1,10 +1,11 @@
-ol_delay = 1000;\r
-ol_css = CSSCLASS;\r
+ol_delay = 300;\r
+ol_fgcolor = '#ffffff';\r
 ol_fgclass = 'cal_popup_fg';\r
 ol_bgclass = 'cal_popup_bg';\r
+ol_cgclass = 'cal_popup_cg';\r
 ol_captionfontclass = 'cal_popup_caption';\r
-ol_closefontclass = 'cal_popup_close';\r
-ol_closeclick = true;\r
+ol_noclose = true;\r
 ol_sticky = true;\r
 ol_close = 'X';\r
 ol_offsety = -20;\r
+ol_mouseoff = 1;\r

diff --git a/calendar/view.php b/calendar/view.php
index 6ced4d107a317e5710ba9092d0978653a8e57008..0446c31a974b16104db34937ea2b95cab1c95961 100644 (file)
--- 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 = '<div style="float: left;">'.get_string('upcomingevents', 'calendar').': '.calendar_course_filter_selector('from=upcoming').'</div><div style="float: right;">';
         $text.= '<form style="display: inline;" action="'.CALENDAR_URL.'event.php" method="get">';
         $text.= '<input type="hidden" name="action" value="new" />';
@@ -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 '<p>';
-        if(!empty($events[$i]->icon)) {
-            echo '<span class="cal_event">'.$events[$i]->icon.' </span>';
-        }
-        if(!empty($events[$i]->referer) && empty($events[$i]->icon)) {
-            echo '<span class="calendarreferer">'.$events[$i]->referer.': </span>';
-        }
-        echo '<span class="cal_event">'.$events[$i]->name.":</span>\n";
-        echo '<span class="cal_event_date">'.$events[$i]->time.'</span>';
-        echo '<div style="margin-top: -1em; padding-left: 20px;">'.$events[$i]->description.'</div>';
-        if($i < $numevents - 1) {
-            echo '<hr />';
-        }
-        echo '</p>';
+    foreach ($events as $event) {
+        calendar_print_event($event);
     }
     print_side_block_end();
 }
 
 
+function calendar_print_event($event) {
+    global $THEME;
+
+    echo '<table border="0" cellpadding="3" cellspacing="0" class="forumpost" width="100%">';
+    echo "<tr><td bgcolor=\"$THEME->cellcontent2\" class=\"forumpostpicture\" width=\"16\" valign=\"top\">";
+    if (!empty($event->icon)) {
+        echo $event->icon;
+    }
+    echo '</td>';
+    echo "<td bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\" width=\"100%\">";
+
+    if(!empty($event->referer) and empty($event->icon)) {
+        echo '<span class="calendarreferer">'.$event->referer.': </span>';
+    }
+    echo '<span class="cal_event">'.$event->name."</span>&nbsp;&nbsp;&nbsp;";
+    echo '<span class="cal_event_date">'.$event->time.'</span>';
+
+    echo "</td></tr>";
+    echo "<tr><td bgcolor=\"$THEME->cellcontent2\" valign=\"top\" class=\"forumpostside\" width=\"16\">&nbsp;</td>";
+    echo "<td bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">\n";
+    echo format_text($event->description, FORMAT_HTML);
+    echo "</td></tr>\n</table><br />\n\n";
+}
+
+
 function calendar_print_event_table($event, $starttime, $endtime, &$coursecache, $alldetails = false) {
     global $CFG;