Tiny fix to improve display of date ranges

diff --git a/calendar/lib.php b/calendar/lib.php
index f0467bf07f79e95ca4ed737166678bf266c3c5ea..decd6a19a2ebb23513b38d3b9f28e3f666aab055 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -318,7 +318,7 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve
 
                     // Set printable representation
                     $eventtime = calendar_get_link_tag($day, CALENDAR_URL.'view.php?view=day&', $enddate['mday'], $enddate['mon'], $enddate['year']).
-                        ' ('.$timestart.' - '.$timeend.')';
+                        ' ('.$timestart.' -> '.$timeend.')';
                 }
                 else {
                     // It spans two or more days
@@ -329,7 +329,7 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve
 
                     // Set printable representation
                     $eventtime = calendar_get_link_tag($daystart, CALENDAR_URL.'view.php?view=day&', $startdate['mday'], $startdate['mon'], $startdate['year']).
-                        ' ('.$timestart.') - '.calendar_get_link_tag($dayend, CALENDAR_URL.'view.php?view=day&', $enddate['mday'], $enddate['mon'], $enddate['year']).
+                        ' ('.$timestart.') -> '.calendar_get_link_tag($dayend, CALENDAR_URL.'view.php?view=day&', $enddate['mday'], $enddate['mon'], $enddate['year']).
                         ' ('.$timeend.')';
                 }
             }
@@ -759,6 +759,7 @@ function calendar_get_sideblock_upcoming($courses, $groups, $users, $daysinfutur
         } else {
             $content .= $events[$i]->name;
         }
+        $events[$i]->time = str_replace('->', '<br />->', $events[$i]->time);
         $content .= '</div><div class="cal_event_date" style="text-align:right;">'.$events[$i]->time.'</div>';
         if ($i < $lines - 1) $content .= '<hr />';
     }