Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar/includes todo.php,1.6,1.7 event.php,1.2,1.3 sidebar.php,1.5,1.6
|
From: <we...@us...> - 2003-02-08 04:48:00
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv32597/includes
Modified Files:
todo.php event.php sidebar.php
Log Message:
-Changes to functions/todo.js and functions/event.js fix bug 654486.
-Other miscellaneous changes to event and todo popups.
-Changed a variable name to avoid confusion with other similarly-named var
Index: todo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** todo.php 30 Nov 2002 22:05:51 -0000 1.6
--- todo.php 8 Feb 2003 04:47:57 -0000 1.7
***************
*** 36,41 ****
}
! if (isset($vtodo_array['calendar_name']) && ($vtodo_array['calendar_name'] !== '') ) {
! $calendar_name = $vtodo_array['calendar_name'];
} else {
$calendar_name = '';
--- 36,41 ----
}
! if (isset($vtodo_array['cal']) && ($vtodo_array['cal'] !== '') ) {
! $calendar_name = $vtodo_array['cal'];
} else {
$calendar_name = '';
Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** event.php 30 Nov 2002 21:05:39 -0000 1.2
--- event.php 8 Feb 2003 04:47:57 -0000 1.3
***************
*** 13,18 ****
$description = '';
}
! if (isset($HTTP_GET_VARS['calendar_name']) && ($HTTP_GET_VARS['calendar_name'] !== '') ) {
! $calendar_name = $HTTP_GET_VARS['calendar_name'];
} else {
$calendar_name = '';
--- 13,18 ----
$description = '';
}
! if (isset($HTTP_GET_VARS['cal']) && ($HTTP_GET_VARS['cal'] !== '') ) {
! $calendar_name = $HTTP_GET_VARS['cal'];
} else {
$calendar_name = '';
***************
*** 63,67 ****
<tr>
<td colspan="3">
! <table width="100%" border="0" cellspacing="0" cellpadding="0">
<?php
if (($start) && ($end)) $event_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>';
--- 63,67 ----
<tr>
<td colspan="3">
! <table width="430" border="0" cellspacing="0" cellpadding="0">
<?php
if (($start) && ($end)) $event_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>';
Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sidebar.php 30 Nov 2002 21:05:39 -0000 1.5
--- sidebar.php 8 Feb 2003 04:47:57 -0000 1.6
***************
*** 214,221 ****
echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\" alt=\" \"></td>";
echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
foreach ($master_array['-2'] as $vtodo_times) {
foreach ($vtodo_times as $val) {
$vtodo_text = stripslashes(urldecode($val["vtodo_text"]));
- $vtodo_text = strip_tags($vtodo_text, '<b><i><u>');
if ($vtodo_text != "") {
$description = $val["description"];
--- 214,221 ----
echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\" alt=\" \"></td>";
echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
+ echo "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n";
foreach ($master_array['-2'] as $vtodo_times) {
foreach ($vtodo_times as $val) {
$vtodo_text = stripslashes(urldecode($val["vtodo_text"]));
if ($vtodo_text != "") {
$description = $val["description"];
***************
*** 226,230 ****
$due_date = $val['due_date'];
$vtodo_array = array(
! 'calendar_name' => $calendar_name,
'completed_date'=> $completed_date,
'description' => $description,
--- 226,230 ----
$due_date = $val['due_date'];
$vtodo_array = array(
! 'cal' => $calendar_name,
'completed_date'=> $completed_date,
'description' => $description,
***************
*** 237,255 ****
$vtodo_array = base64_encode(serialize($vtodo_array));
! $vtodo_text = word_wrap($vtodo_text, 21, $tomorrows_events_lines);
if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) {
if ($show_completed == 'yes') {
$vtodo_text = "<S>$vtodo_text</S>";
! echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_array')\"><font class=\"G10B\"><img src=\"images/completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
}
} elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) {
! echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_array')\"><font class=\"G10B\"><img src=\"images/important.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
} else {
! echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_array')\"><font class=\"G10B\"><img src=\"images/not_completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
}
}
}
}
echo "</td>\n";
echo "</tr>\n";
--- 237,260 ----
$vtodo_array = base64_encode(serialize($vtodo_array));
! $vtodo_text = word_wrap(strip_tags(str_replace('<br>',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
! $vtodo_link = "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_array')\">";
if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) {
if ($show_completed == 'yes') {
$vtodo_text = "<S>$vtodo_text</S>";
! echo "<tr><td>$vtodo_link<img src=\"images/completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
! echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
}
} elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) {
! echo "<tr><td>$vtodo_link<img src=\"images/important.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
! echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
} else {
! echo "<tr><td>$vtodo_link<img src=\"images/not_completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
! echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
}
}
}
}
+ echo "</table>\n";
echo "</td>\n";
echo "</tr>\n";
|