From d54902d50aba1b9803649d0e06d92afd63f46a29 Mon Sep 17 00:00:00 2001 From: skeeter Date: Tue, 20 Mar 2001 00:26:52 +0000 Subject: [PATCH] Timematrix now displays the events time in the status bar --- calendar/inc/class.calendar.inc.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php index b25f57a78e..3c72a7a4e2 100755 --- a/calendar/inc/class.calendar.inc.php +++ b/calendar/inc/class.calendar.inc.php @@ -1614,6 +1614,15 @@ class calendar extends calendar_ { global $phpgw, $phpgw_info; + if ($phpgw_info['user']['preferences']['common']['timeformat'] == '12') + { + $time_format .= 'h:i:s a'; + } + else + { + $time_format .= 'H:i:s'; + } + if(!isset($phpgw_info['user']['preferences']['calendar']['interval']) || !$phpgw_info['user']['preferences']['calendar']['interval']) { @@ -1747,7 +1756,8 @@ class calendar extends calendar_ $index = ($hour + (($m * $increment) * 100)); $time_slice[$index]['marker'] = '-'; $time_slice[$index]['color'] = $phpgw_info['theme']['bg01']; - $time_slice[$index]['description'] = $this->is_private($event,$participants[$i],'title'); + $time_display = $phpgw->common->show_date($eventstart['raw'],$time_format).'-'.$phpgw->common->show_date($eventend['raw'],$time_format); + $time_slice[$index]['description'] = '('.$time_display.') '.$this->is_private($event,$participants[$i],'title'); if(isset($phpgw_info['user']['preferences']['calendar']['display_status']) && $phpgw_info['user']['preferences']['calendar']['display_status'] == True) { $time_slice[$index]['description'] .= ' ('.$event->users_status.')';