Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar day.php,1.101,1.102 month.php,1.102,1.103 week.php,1.102,1.103
|
From: <cl...@us...> - 2003-11-20 05:19:17
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv32703
Modified Files:
day.php month.php week.php
Log Message:
Added URL support to popup, re-wrote event.php for less code.
Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** day.php 19 Nov 2003 07:54:09 -0000 1.101
--- day.php 20 Nov 2003 05:18:38 -0000 1.102
***************
*** 92,107 ****
$event_calno = $allday['calnumber'];
$event_calna = $allday['calname'];
if ($event_calno < 1) $event_calno=1;
if ($event_calno > 7) $event_calno=7;
echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! openevent("$event_calna",
! "",
! "",
! $allday,
! 0,
! "",
! '<font color="#ffffff"><i>',
! "</i></font>",
! "psf");
echo "</td>\n</tr>\n";
}
--- 92,100 ----
$event_calno = $allday['calnumber'];
$event_calna = $allday['calname'];
+ $event_url = $allday['url'];
if ($event_calno < 1) $event_calno=1;
if ($event_calno > 7) $event_calno=7;
echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! openevent($event_calna, '', '', $allday, 0, '', '<font color="#ffffff"><i>', '</i></font>', 'psf', $url);
echo "</td>\n</tr>\n";
}
***************
*** 254,267 ****
echo '<tr>'."\n";
echo '<td class="eventbg_'.$event_calno.'">';
! $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname'];
! openevent("$event_calna",
! "$event_start",
! "$event_end",
! $this_time_arr[($event_length[$i]['key'])],
! "",
! 0,
! "<font class=\"eventfont\">",
! "</font>",
! "psf");
echo '</td></tr>'."\n";
echo '</table>'."\n";
--- 247,253 ----
echo '<tr>'."\n";
echo '<td class="eventbg_'.$event_calno.'">';
! $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname'];
! $event_url = $this_time_arr[($event_length[$i]['key'])]['url'];
! openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '<font class="eventfont">', '</font>', 'psf', $event_url);
echo '</td></tr>'."\n";
echo '</table>'."\n";
Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** month.php 19 Nov 2003 07:54:09 -0000 1.102
--- month.php 20 Nov 2003 05:18:38 -0000 1.103
***************
*** 115,120 ****
foreach ($event_times as $val) {
$num_of_events2++;
! $event_calno = $val['calnumber'];
! $event_calna = $val['calname'];
if (!isset($val["event_start"])) {
echo '<div align="center" class="V10">';
--- 115,121 ----
foreach ($event_times as $val) {
$num_of_events2++;
! $event_calno = $val['calnumber'];
! $event_calna = $val['calname'];
! $event_url = $val['url'];
if (!isset($val["event_start"])) {
echo '<div align="center" class="V10">';
***************
*** 123,127 ****
"<i>",
"</i>",
! "psf");
echo '</div>';
} else {
--- 124,129 ----
"<i>",
"</i>",
! "psf",
! $event_url);
echo '</div>';
} else {
***************
*** 141,145 ****
"$start2 ",
"",
! "ps3");
echo '</div>';
}
--- 143,148 ----
"$start2 ",
"",
! "ps3",
! $event_url);
echo '</div>';
}
***************
*** 197,202 ****
// Pull out each time
foreach ($new_val as $new_key2 => $new_val2) {
! $event_calno = $new_val2['calnumber'];
! $event_calna = $new_val2['calname'];
if ($new_val2["event_text"]) {
--- 200,206 ----
// Pull out each time
foreach ($new_val as $new_key2 => $new_val2) {
! $event_calno = $new_val2['calnumber'];
! $event_calna = $new_val2['calname'];
! $event_url = $new_val2['url'];
if ($new_val2["event_text"]) {
***************
*** 229,233 ****
"<font class=\"G10B\">",
"</font>",
! "psf");
echo "</td>\n";
echo "</tr>\n";
--- 233,238 ----
"<font class=\"G10B\">",
"</font>",
! "psf",
! $event_url);
echo "</td>\n";
echo "</tr>\n";
Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** week.php 19 Nov 2003 07:54:09 -0000 1.102
--- week.php 20 Nov 2003 05:18:38 -0000 1.103
***************
*** 165,168 ****
--- 165,169 ----
$event_calno = $allday['calnumber'];
$event_calna = $allday['calname'];
+ $event_url = $allday['url'];
if ($event_calno < 1) $event_calno=1;
if ($event_calno > 7) $event_calno=7;
***************
*** 176,180 ****
'<font color="#ffffff">',
"</font>",
! "psf");
echo "</td></tr>\n";
}
--- 177,182 ----
'<font color="#ffffff">',
"</font>",
! "psf",
! $event_url);
echo "</td></tr>\n";
}
***************
*** 186,192 ****
} while ($i < 7);
echo "</tr>\n";
! }
! // $master_array[($getdate)]["$day_time"]
!
$thisdate = $start_week_time;
for ($i=0;$i<7;$i++) {
--- 188,192 ----
} while ($i < 7);
echo "</tr>\n";
! }
$thisdate = $start_week_time;
for ($i=0;$i<7;$i++) {
***************
*** 309,313 ****
$event_end = date ($timeFormat, $event_end);
! $event_calna = $this_time_arr[($event_length[$thisday][$i]["key"])]['calname'];
openevent("$event_calna",
"$event_start",
--- 309,314 ----
$event_end = date ($timeFormat, $event_end);
! $event_calna = $this_time_arr[($event_length[$thisday][$i]["key"])]['calname'];
! $event_url = $this_time_arr[($event_length[$thisday][$i]["key"])]['url'];
openevent("$event_calna",
"$event_start",
***************
*** 318,322 ****
"<font class=\"V10W\">",
"</font>",
! "psf");
echo "</td></tr>\n";
echo "</table>\n";
--- 319,324 ----
"<font class=\"V10W\">",
"</font>",
! "psf",
! $event_url);
echo "</td></tr>\n";
echo "</table>\n";
|
