diff options
| author | Jason Oster <parasytic@users.sourceforge.net> | 2009-05-14 21:45:44 +0000 |
|---|---|---|
| committer | Jason Oster <parasytic@users.sourceforge.net> | 2009-05-14 21:45:44 +0000 |
| commit | 3a4d086ec1d1b6a89d0b0f8ed6018d2080ca9f82 (patch) | |
| tree | d291770d55cc87515c5bee76532151a3880a8a59 /functions | |
| parent | e20689a1388a3da61d57e566ea2529e53f27620f (diff) | |
| download | phpicalendar-3a4d086ec1d1b6a89d0b0f8ed6018d2080ca9f82.tar.gz phpicalendar-3a4d086ec1d1b6a89d0b0f8ed6018d2080ca9f82.tar.bz2 phpicalendar-3a4d086ec1d1b6a89d0b0f8ed6018d2080ca9f82.zip | |
Fix table column spanning and HTML errors in week view
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/template.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/functions/template.php b/functions/template.php index 42cf1f5..a7f183c 100644 --- a/functions/template.php +++ b/functions/template.php @@ -348,7 +348,7 @@ class Page { $weekreplace .= $replace; } */ - $this->page = preg_replace('!<\!-- loop alldaysofweek on -->.*<\!-- loop alldaysofweek off -->!Uis', $weekreplace, $this->page); + $this->page = preg_replace('!<\!-- loop allday row on -->.*<\!-- loop allday row off -->!Uis', $weekreplace, $this->page); // Replaces the daysofweek preg_match("!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!Uis", $this->page, $match1); @@ -461,8 +461,7 @@ class Page { $dayborder = 0; } $drawWidth = 1; - $colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth); - $weekdisplay .= '<td width="' . $colspan_width . '" colspan="' . $nbrGridCols[$thisday] . '" ' . $class . '> </td>'."\n"; + $weekdisplay .= '<td colspan="' . $nbrGridCols[$thisday] . '" ' . $class . '> </td>'."\n"; } else { # have events $emptyWidth = $nbrGridCols[$thisday]; @@ -490,10 +489,9 @@ class Page { if ($event_status != '') { $confirmed .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; } - $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'); - $weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; + $weekdisplay .= '<td 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); @@ -704,8 +702,7 @@ class Page { $confirmed = ''; if (is_array($event_recur)) $confirmed .= '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; if ($event_status != '') $confirmed .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; - $colspan_width = round((460 / $nbrGridCols) * $drawWidth); - $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" width="'.$colspan_width.'" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; + $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; // Start drawing the event $event_temp = $loop_event; |