Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/functions
Modified Files:
template.php
Log Message:
eliminate negative event lengths and adjust display lengths for short events
Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** template.php 26 Dec 2008 08:26:31 -0000 1.101
--- template.php 26 Dec 2008 16:59:10 -0000 1.102
***************
*** 360,364 ****
$key = date ($timeFormat, $key);
-
if (ereg("([0-9]{1,2}):00", $key)) {
$weekdisplay .= '<tr>';
--- 360,363 ----
***************
*** 467,475 ****
}
$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
$weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
// Start drawing the event
- $event_temp = $loop_event;
- $event = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps');
$event_temp = str_replace('{EVENT}', $event, $event_temp);
$event_temp = str_replace('{EVENT_START}', $event_start, $event_temp);
--- 466,477 ----
}
$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
+ $event_temp = $loop_event;
+ $event = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps');
+ # adjust length by rough guess to word wrapping
+ $event_text_lines = ceil((strlen(strip_tags(trim($event))) * 8)/$colspan_width) + 1;
+ if ($event_length[$thisday][$i]['length'] < $event_text_lines) $event_length[$thisday][$i]['length'] = $event_text_lines;
$weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
// Start drawing the event
$event_temp = str_replace('{EVENT}', $event, $event_temp);
$event_temp = str_replace('{EVENT_START}', $event_start, $event_temp);
|
