Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar day.php,1.86,1.87 month.php,1.85,1.86 week.php,1.86,1.87
|
From: <cl...@us...> - 2003-03-10 19:48:31
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv8484
Modified Files:
day.php month.php week.php
Log Message:
Support for displaying event STATUS in the java pop-up.
Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** day.php 10 Mar 2003 06:50:33 -0000 1.86
--- day.php 10 Mar 2003 19:48:22 -0000 1.87
***************
*** 107,117 ****
echo '<table width="100%" border="0" cellspacing="1" cellpadding="4">'."\n";
foreach($master_array[($getdate)]['-1'] as $allday) {
! $event_text = stripslashes(urldecode($allday['event_text']));
! $description = addslashes(urlencode($allday['description']));
! $event_text2 = rawurlencode(addslashes($allday['event_text']));
$event_start = '';
$event_end = '';
echo '<tr>'."\n";
! echo '<td valign="top" align="center" class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\')"><font color="#ffffff"><i>'.$event_text.'</i></font></a></td>'."\n";
echo '</tr>'."\n";
}
--- 107,118 ----
echo '<table width="100%" border="0" cellspacing="1" cellpadding="4">'."\n";
foreach($master_array[($getdate)]['-1'] as $allday) {
! $event_text = stripslashes(urldecode($allday['event_text']));
! $description = addslashes(urlencode($allday['description']));
! $event_text2 = rawurlencode(addslashes($allday['event_text']));
! $status = $allday['status'];
$event_start = '';
$event_end = '';
echo '<tr>'."\n";
! echo '<td valign="top" align="center" class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\', \''.$status.'\')"><font color="#ffffff"><i>'.$event_text.'</i></font></a></td>'."\n";
echo '</tr>'."\n";
}
***************
*** 247,250 ****
--- 248,252 ----
$event_end = date ($timeFormat, $event_end);
$calendar_name2 = rawurlencode(addslashes($calendar_name));
+ $status = $this_time_arr[($event_length[$i]['key'])]['status'];
echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2">'."\n";
echo '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n";
***************
*** 256,260 ****
echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n";
echo '<tr>'."\n";
! echo '<td class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name2.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\')"><font class="eventfont">'.$event_text.'</font></a></td>'."\n";
echo '</tr>'."\n";
echo '</table>'."\n";
--- 258,262 ----
echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n";
echo '<tr>'."\n";
! echo '<td class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name2.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\', \''.$status.'\')"><font class="eventfont">'.$event_text.'</font></a></td>'."\n";
echo '</tr>'."\n";
echo '</table>'."\n";
Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** month.php 10 Mar 2003 18:27:00 -0000 1.85
--- month.php 10 Mar 2003 19:48:24 -0000 1.86
***************
*** 173,176 ****
--- 173,177 ----
$calendar_name2 = urlencode($calendar_name2);
$event_text = word_wrap($event_text, 12, $month_event_lines);
+ $status = $val["status"];
echo "<tr>\n";
echo "<td>\n";
***************
*** 180,186 ****
$event_start = '';
$event_end = '';
! echo "<td><font class=\"V10\"><center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a></center></font></td>\n";
} else {
! echo "<td align=\"left\" valign=\"top\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"V9\"> $event_start2 $event_text</font></a></td>\n";
}
echo "</tr>\n";
--- 181,187 ----
$event_start = '';
$event_end = '';
! echo "<td><font class=\"V10\"><center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><i>$event_text</i></a></center></font></td>\n";
} else {
! echo "<td align=\"left\" valign=\"top\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><font class=\"V9\"> $event_start2 $event_text</font></a></td>\n";
}
echo "</tr>\n";
***************
*** 262,265 ****
--- 263,267 ----
$description = addslashes(urlencode($new_val2["description"]));
$description = str_replace("\"", """, $description);
+ $status = $new_val2["status"];
if (isset($new_val2["event_start"])) {
$event_start = $new_val2["event_start"];
***************
*** 281,285 ****
echo "<td align=\"left\" valign=\"top\" width =\"160\" class=\"montheventline\" nowrap><font $fontclass> <a class=\"psf\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a></font> <font class=\"V9G\">($event_start)</font></td>\n";
echo "<td align=\"left\" valign=\"top\" colspan=\"2\">\n";
! echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description')\"><font class=\"G10B\">$event_text</font></a>\n";
echo "</td>\n";
echo "</tr>\n";
--- 283,287 ----
echo "<td align=\"left\" valign=\"top\" width =\"160\" class=\"montheventline\" nowrap><font $fontclass> <a class=\"psf\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a></font> <font class=\"V9G\">($event_start)</font></td>\n";
echo "<td align=\"left\" valign=\"top\" colspan=\"2\">\n";
! echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n";
echo "</td>\n";
echo "</tr>\n";
Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** week.php 10 Mar 2003 18:27:01 -0000 1.86
--- week.php 10 Mar 2003 19:48:24 -0000 1.87
***************
*** 183,190 ****
$all_day_text = word_wrap($all_day_text, 12, $allday_week_lines);
$description = addslashes(urlencode($allday["description"]));
$event_start = '';
$event_end = '';
echo "<tr>\n";
! echo "<td valign=\"top\" align=\"center\" class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><font color=\"#ffffff\">$all_day_text</font></a></td>\n";
echo "</tr>\n";
}
--- 183,191 ----
$all_day_text = word_wrap($all_day_text, 12, $allday_week_lines);
$description = addslashes(urlencode($allday["description"]));
+ $status = $allday["status"];
$event_start = '';
$event_end = '';
echo "<tr>\n";
! echo "<td valign=\"top\" align=\"center\" class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description', '$status')\"><font color=\"#ffffff\">$all_day_text</font></a></td>\n";
echo "</tr>\n";
}
***************
*** 304,307 ****
--- 305,309 ----
$event_end = date ($timeFormat, $event_end);
$calendar_name2 = urlencode(addslashes($calendar_name));
+ $status = $this_time_arr[($event_length[$thisday][$i]["key"])]["status"];
echo "<td rowspan=\"" . $event_length[$thisday][$i]["length"] . "\" colspan=\"" . $drawWidth . "\" align=\"left\" valign=\"top\" class=\"eventbg2week\">\n";
echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
***************
*** 313,317 ****
echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
echo "<tr>\n";
! echo "<td class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"V10W\">$event_text</font></a></td>\n";
echo "</tr>\n";
echo "</table>\n";
--- 315,319 ----
echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
echo "<tr>\n";
! echo "<td class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><font class=\"V10W\">$event_text</font></a></td>\n";
echo "</tr>\n";
echo "</table>\n";
|