mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
Tiny fix to improve display of date ranges
This commit is contained in:
parent
d8bb005603
commit
14fcda781a
@ -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 />';
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user