extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-07 05:50:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

This fixes a problem with the daily view not spanning enough rows

Browse Source
This commit is contained in:
skeeter 2001-03-20 02:34:39 +00:00
parent 45767449dc
commit 4409541de7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1092,7 +1092,7 @@ class calendar extends calendar_
$description = $this->is_private($event,$this->owner,'description'); $description = $this->is_private($event,$this->owner,'description');
if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT)) if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT))
{ {
$time[$ind] .= '<a href="'.$phpgw->link('/calendar/view.php', $time[$ind] .= '<a href="'.$phpgw->link('/calendar/view.php',
'id='.$event->id.'&owner='.$this->owner) 'id='.$event->id.'&owner='.$this->owner)
@ -1106,14 +1106,11 @@ class calendar extends calendar_
$time[$ind] .= ' - ' . $phpgw->common->show_date($event->edatetime,$format); $time[$ind] .= ' - ' . $phpgw->common->show_date($event->edatetime,$format);
$end_t_h = intval($phpgw->common->show_date($event->edatetime,'H')); $end_t_h = intval($phpgw->common->show_date($event->edatetime,'H'));
$end_t_m = intval($phpgw->common->show_date($event->edatetime,'i')); $end_t_m = intval($phpgw->common->show_date($event->edatetime,'i'));
$this->rowspan = $end_t_h - $ind;
if (end_t_m == 0) if ($end_t_m > 0)
{ {
$this->rowspan = $end_t_h - $ind; $this->rowspan += 1;
}
else
{
$this->rowspan = $end_t_h - $ind + 1;
} }
if(isset($this->rowspan_arr[$ind])) if(isset($this->rowspan_arr[$ind]))
@ -1134,7 +1131,7 @@ class calendar extends calendar_
$time[$ind] .= '] '; $time[$ind] .= '] ';
$time[$ind] .= '<img src="'.$this->image_dir.'/circle.gif" border="0" alt="' . $description . '">'; $time[$ind] .= '<img src="'.$this->image_dir.'/circle.gif" border="0" alt="' . $description . '">';
if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT)) if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT))
{ {
$time[$ind] .= '</a>'; $time[$ind] .= '</a>';
} }