[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.86, 1.87

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29772/phpicalendar/functions

Modified Files:
	template.php 
Log Message:
fix display of status and recur icons

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** template.php	14 Aug 2006 05:57:32 -0000	1.86
--- template.php	5 Dec 2006 08:40:18 -0000	1.87
***************
*** 447,453 ****
   								$event_calno  	= $this_time_arr[$uid]['calnumber'];
   								$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" />&nbsp;';
  						  		}
  								$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
--- 447,456 ----
   								$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" />&nbsp;';
  								if ($event_status != '') {
! 						  			$confirmed .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  		}
  								$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
***************
*** 667,675 ****
   						  $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" />&nbsp;';
! 						  } elseif (is_array($event_recur)) {
! 						  	$confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
! 						  }
  						  $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";
--- 670,676 ----
   						  $event_status = strtolower($this_time_arr[$uid]['status']);
  						  $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" />&nbsp;';
! 						  if ($event_status != '') $confirmed .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  $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";