diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2006-12-05 08:40:18 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2006-12-05 08:40:18 +0000 |
| commit | 2e26a1297de73ef09a87f9e4e97ed2090a448275 (patch) | |
| tree | 67ac8be31d02f53c921efd3938a37aee1e7d58c9 /functions/template.php | |
| parent | 8067308a2fa3227709dc5b92c0b8e7bca18d1889 (diff) | |
| download | phpicalendar-2e26a1297de73ef09a87f9e4e97ed2090a448275.tar.gz phpicalendar-2e26a1297de73ef09a87f9e4e97ed2090a448275.tar.bz2 phpicalendar-2e26a1297de73ef09a87f9e4e97ed2090a448275.zip | |
fix display of status and recur icons
Diffstat (limited to 'functions/template.php')
| -rw-r--r-- | functions/template.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/functions/template.php b/functions/template.php index 30c866c..aa52124 100644 --- a/functions/template.php +++ b/functions/template.php @@ -446,9 +446,12 @@ class Page { $event_start = date ($timeFormat_small, $event_start); $event_calno = $this_time_arr[$uid]['calnumber']; $event_status = strtolower($this_time_arr[$uid]['status']); + $event_recur = $this_time_arr[$uid]['recur']; $event_calno = (($event_calno - 1) % $unique_colors) + 1; + $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" /> '; + $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); $weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; @@ -666,11 +669,9 @@ class Page { $event_recur = $this_time_arr[$uid]['recur']; $event_status = strtolower($this_time_arr[$uid]['status']); $event_calno = (($event_calno - 1) % $unique_colors) + 1; - if ($event_status != '') { - $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; - } elseif (is_array($event_recur)) { - $confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; - } + $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"; |