[PHPiCalendar-Commits] phpicalendar day.php,1.97,1.98 week.php,1.98,1.99

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv16054

Modified Files:
	day.php week.php 
Log Message:
Cleaned up event_status displaying.



Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** day.php	20 Sep 2003 00:17:58 -0000	1.97
--- day.php	20 Sep 2003 20:53:13 -0000	1.98
***************
*** 234,239 ****
  												  $event_calno  = $this_time_arr[($event_length[$i]['key'])]['calnumber'];
  												  $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
! 												  if ($event_calno < 1) $event_calno=1;
! 												  if ($event_calno > 7) $event_calno=7;
  								
  												  echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
--- 234,239 ----
  												  $event_calno  = $this_time_arr[($event_length[$i]['key'])]['calnumber'];
  												  $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
! 												  if ($event_calno < 1) $event_calno = 1;
! 												  if ($event_calno > 7) $event_calno = 7;
  								
  												  echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
***************
*** 241,248 ****
  												  echo '<tr>'."\n";
  												  echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n";
! 												  echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! 												  if ($event_status == '') echo '&nbsp;';
!                                                   else echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! 												  echo '</font></td>'."\n";
  												  echo '</tr>'."\n";
  												  echo '<tr>'."\n";
--- 241,249 ----
  												  echo '<tr>'."\n";
  												  echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n";
! 												  if ($event_status != '') {
! 												  	echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! 												  	echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! 												  	echo '</font></td>'."\n";
! 												  }
  												  echo '</tr>'."\n";
  												  echo '<tr>'."\n";

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** week.php	20 Sep 2003 00:17:59 -0000	1.98
--- week.php	20 Sep 2003 20:53:13 -0000	1.99
***************
*** 287,300 ****
  																	$event_calno  = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber'];
  																	$event_status	= strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']);
! 												  					if ($event_calno < 1) $event_calno=1;
! 												  					if ($event_calno > 7) $event_calno=7;
  																	echo '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2week_'.$event_calno.'">'."\n";
  																	echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
  																	echo "<tr>\n";
  																	echo "<td class=\"eventborder\"><font class=\"V10WB\"><b>$event_start</b></font></td>\n";
! 																	echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! 																	if ($event_status == '') echo '&nbsp;';
! 																	else echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! 																	echo "</font></td>\n";
  																	echo "</tr>\n";
  																	echo "<tr>\n";
--- 287,301 ----
  																	$event_calno  = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber'];
  																	$event_status	= strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']);
! 												  					if ($event_calno < 1) $event_calno = 1;
! 												  					if ($event_calno > 7) $event_calno = 7;
  																	echo '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2week_'.$event_calno.'">'."\n";
  																	echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
  																	echo "<tr>\n";
  																	echo "<td class=\"eventborder\"><font class=\"V10WB\"><b>$event_start</b></font></td>\n";
! 																	if ($event_status != '') {
! 																		echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! 																		echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! 																		echo "</font></td>\n";
! 																	}
  																	echo "</tr>\n";
  																	echo "<tr>\n";