extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-28 08:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Timematrix now displays the events time in the status bar

Browse Source
This commit is contained in:
skeeter 2001-03-20 00:26:52 +00:00
parent 7dd376024d
commit d54902d50a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar.inc.php
View File

@ -1614,6 +1614,15 @@ class calendar extends calendar_
{ {
global $phpgw, $phpgw_info; 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']) || if(!isset($phpgw_info['user']['preferences']['calendar']['interval']) ||
!$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)); $index = ($hour + (($m * $increment) * 100));
$time_slice[$index]['marker'] = '-'; $time_slice[$index]['marker'] = '-';
$time_slice[$index]['color'] = $phpgw_info['theme']['bg01']; $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) if(isset($phpgw_info['user']['preferences']['calendar']['display_status']) && $phpgw_info['user']['preferences']['calendar']['display_status'] == True)
{ {
$time_slice[$index]['description'] .= ' ('.$event->users_status.')'; $time_slice[$index]['description'] .= ' ('.$event->users_status.')';