phpicalendar-commits

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1809/functions

Modified Files:
	template.php 
Log Message:
Fix multiple HTML elements with the same id. Allow all-day divs to stretch vertically in day and week views with default template.

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** template.php	8 Jul 2009 18:28:13 -0000	1.121
--- template.php	10 Jul 2009 17:50:21 -0000	1.122
***************
*** 308,315 ****
  				$replace  .= $loop_begin; # <td>
  
! 				if ($weekarray[$day] == $getdate) $replace = str_replace('{TODAY}', "rowToday", $replace);
! 				$replace 	= str_replace('{TODAY}', "rowOff", $replace);
  
! 				if(array_search($weekarray[$day], $allday_uids)){ 
  					$uid = array_search($weekarray[$day], $allday_uids);
  					unset($allday_uids[$uid]);
--- 308,315 ----
  				$replace  .= $loop_begin; # <td>
  
! 				if ($weekarray[$day] == $getdate) $replace = str_replace('{TODAY}', 'rowToday', $replace);
! 				$replace 	= str_replace('{TODAY}', 'rowOff', $replace);
  
! 				if(array_search($weekarray[$day], $allday_uids)){
  					$uid = array_search($weekarray[$day], $allday_uids);
  					unset($allday_uids[$uid]);
***************
*** 326,338 ****
  					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  					$replace		.= $loop_tmp;
! 					$replace .= $loop_end;
  				}else{
! 					$colspan	= $nbrGridCols[$weekarray[$day]];
! 					$replace .= $loop_end;
  					$day++;
  				}	
  				unset ($ev);
! 				$replace 	= str_replace('{COLSPAN}', "colspan='$colspan'", $replace);
  			} 
  			$row .= "$replace $loop_row_end\n";
--- 326,340 ----
  					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
+ 					$replace		= str_replace('{NOBORDER}', ' style="border-top: none;"', $replace);
  					$replace		.= $loop_tmp;
! 					$replace		.= $loop_end;
  				}else{
! 					$replace		= str_replace('{NOBORDER}', '', $replace);
! 					$colspan		= $nbrGridCols[$weekarray[$day]];
! 					$replace		.= $loop_end;
  					$day++;
  				}	
  				unset ($ev);
! 				$replace 	= str_replace('{COLSPAN}', "colspan=\"$colspan\"", $replace);
  			} 
  			$row .= "$replace $loop_row_end\n";