phpicalendar-commits

[<cl...@us...>]

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

Modified Files:
	template.php 
Log Message:
Pass two at Day view, added event loop and better CSS.



Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** template.php	12 May 2004 06:41:29 -0000	1.29
--- template.php	13 May 2004 06:24:39 -0000	1.30
***************
*** 192,196 ****
--- 192,198 ----
  		}
  		preg_match("!<\!-- loop row on -->(.*)<\!-- loop row off -->!is", $this->page, $match2);
+ 		preg_match("!<\!-- loop event on -->(.*)<\!-- loop event off -->!is", $this->page, $match3);
  		$loop_hours = trim($match2[1]);
+ 		$loop_event = trim($match3[1]);
  
  		$event_length = array ();
***************
*** 265,269 ****
  			}
  			if (sizeof($event_length) == 0) {
! 				$daydisplay .= '<td bgcolor="#ffffff" colspan="' . $nbrGridCols . '" '.$class.'>&nbsp;</td>'."\n";
  				
  			} else {
--- 267,271 ----
  			}
  			if (sizeof($event_length) == 0) {
! 				$daydisplay .= '<td colspan="' . $nbrGridCols . '" '.$class.'>&nbsp;</td>'."\n";
  				
  			} else {
***************
*** 284,317 ****
  						  if ($event_calno < 1) $event_calno = 1;
  						  if ($event_calno > 7) $event_calno = 7;
- 		
- 						  $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
- 						  $daydisplay .= '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n";
- 						  $daydisplay .= '<tr>'."\n";
- 						  $daydisplay .= '<td class="eventbg_'.$event_calno.'"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n";
  						  if ($event_status != '') {
! 							$daydisplay .= '<td class="eventbg_'.$event_calno.'" width="9" align="right" valign="center"><font class="eventfont">';
! 							$daydisplay .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! 							$daydisplay .= '</font></td>'."\n";
  						  }
! 						  $daydisplay .= '</tr>'."\n";
! 						  $daydisplay .= '<tr>'."\n";
! 						  $daydisplay .= '<td colspan="2">'."\n";
! 						  $daydisplay .= '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n";
! 						  $daydisplay .= '<tr>'."\n";
! 						  $daydisplay .= '<td>';
  						  $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname'];
  						  $event_url   = $this_time_arr[($event_length[$i]['key'])]['url'];
! 						  $daydisplay .= openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '<font class="eventfont">', '</font>', 'psf', $event_url);
! 						  $daydisplay .= '</td></tr>'."\n";
! 						  $daydisplay .= '</table>'."\n";
! 						  $daydisplay .= '</td>'."\n";           
! 						  $daydisplay .= '</tr>'."\n";
! 						  $daydisplay .= '</table>'."\n";
! 						  $daydisplay .= '</td>'."\n";
  						  break;
  						case 'started':
  							break;
  						case 'ended':
! 							$daydisplay .= '<td bgcolor="#ffffff" colspan="' . $drawWidth . '" ' . $class . '>&nbsp;</td>'."\n";
  							break;
  					}
--- 286,313 ----
  						  if ($event_calno < 1) $event_calno = 1;
  						  if ($event_calno > 7) $event_calno = 7;
  						  if ($event_status != '') {
! 						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
  						  }
! 						  
! 						  $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;
  						  $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname'];
  						  $event_url   = $this_time_arr[($event_length[$i]['key'])]['url'];
! 						  $event 	   = openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '', '', 'ps', $event_url);
! 						  $event_temp   = str_replace('{EVENT}', $event, $event_temp);
! 						  $event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
! 						  $event_temp   = str_replace('{EVENT_END}', $event_end, $event_temp);
! 						  $event_temp   = str_replace('{CONFIRMED}', $confirmed, $event_temp);
! 						  $event_temp   = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
! 						  $daydisplay .= $event_temp;
! 						  // End event drawing
! 						  
  						  break;
  						case 'started':
  							break;
  						case 'ended':
! 							$daydisplay .= '<td colspan="' . $drawWidth . '" ' . $class . '>&nbsp;</td>'."\n";
  							break;
  					}
***************
*** 323,327 ****
  				//fill emtpy space on the right
  				if ($emptyWidth > 0) {
! 					$daydisplay .= '<td bgcolor="#ffffff" colspan="' . $emptyWidth . '" ' . $class . '>&nbsp;</td>'."\n";
  				}
  				while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') {
--- 319,323 ----
  				//fill emtpy space on the right
  				if ($emptyWidth > 0) {
! 					$daydisplay .= '<td colspan="' . $emptyWidth . '" ' . $class . '>&nbsp;</td>'."\n";
  				}
  				while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') {
***************
*** 333,337 ****
  		}
  		
! 		$this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop row off -->!is', $daydisplay, $this->page);
  	
  	
--- 329,333 ----
  		}
  		
! 		$this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop event off -->!is', $daydisplay, $this->page);