Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <cl...@us...> - 2004-05-12 06:41:42
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12546/functions Modified Files: template.php Log Message: Updated background colors for day. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** template.php 12 May 2004 05:53:36 -0000 1.28 --- template.php 12 May 2004 06:41:29 -0000 1.29 *************** *** 288,294 **** $daydisplay .= '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n"; $daydisplay .= '<tr>'."\n"; ! $daydisplay .= '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n"; if ($event_status != '') { ! $daydisplay .= '<td class="eventborder" 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"; --- 288,294 ---- $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"; *************** *** 299,303 **** $daydisplay .= '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n"; $daydisplay .= '<tr>'."\n"; ! $daydisplay .= '<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']; --- 299,303 ---- $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']; *************** *** 313,317 **** break; case 'ended': ! $daydisplay .= '<td bgcolor="#eeeeee" colspan="' . $drawWidth . '" ' . $class . '> </td>'."\n"; break; } --- 313,317 ---- break; case 'ended': ! $daydisplay .= '<td bgcolor="#ffffff" colspan="' . $drawWidth . '" ' . $class . '> </td>'."\n"; break; } |
|
From: <cl...@us...> - 2004-05-12 06:41:42
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12546/templates/default Modified Files: default.css Log Message: Updated background colors for day. Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** default.css 8 Feb 2004 08:10:30 -0000 1.11 --- default.css 12 May 2004 06:41:29 -0000 1.12 *************** *** 29,35 **** .eventbg { background-color: #6699CC; } ! .eventbg_1 { background-color: #6699CC; } ! .eventbg_2 { background-color: #666699; } ! .eventbg_3 { background-color: #999999; } .eventbg_4 { background-color: #6B84C7; } .eventbg_5 { background-color: #9999CC; } --- 29,35 ---- .eventbg { background-color: #6699CC; } ! .eventbg_1 { background-color: #006699; } ! .eventbg_2 { background-color: #53A062; } ! .eventbg_3 { background-color: #E84F25; } .eventbg_4 { background-color: #6B84C7; } .eventbg_5 { background-color: #9999CC; } *************** *** 37,49 **** .eventbg_7 { background-color: #73738C; } ! .eventbg2 { background-color: #6699CC; border-right: 1px solid #FFFFFF; } ! .eventbg2_1 { background-color: #6699CC; border-right: 1px solid #FFFFFF; } ! .eventbg2_2 { background-color: #666699; border-right: 1px solid #FFFFFF; } ! .eventbg2_3 { background-color: #999999; border-right: 1px solid #FFFFFF; } ! .eventbg2_4 { background-color: #6B84C7; border-right: 1px solid #FFFFFF; } ! .eventbg2_5 { background-color: #9999CC; border-right: 1px solid #FFFFFF; } ! .eventbg2_6 { background-color: #6876E7; border-right: 1px solid #FFFFFF; } ! .eventbg2_7 { background-color: #73738C; border-right: 1px solid #FFFFFF; } .eventbg2week { background-color: #6699CC; border-right: 1px solid #A1A5A9; } --- 37,49 ---- .eventbg_7 { background-color: #73738C; } ! .eventbg2 { background-color: #6699CC; border-right: 1px solid #fff; } ! .eventbg2_1 { background-color: #6699CC; border-right: 1px solid #fff; } ! .eventbg2_2 { background-color: #4FC464; border-right: 1px solid #fff; } ! .eventbg2_3 { background-color: #FF6D3B; border-right: 1px solid #fff; } ! .eventbg2_4 { background-color: #6B84C7; border-right: 1px solid #fff; } ! .eventbg2_5 { background-color: #9999CC; border-right: 1px solid #fff; } ! .eventbg2_6 { background-color: #6876E7; border-right: 1px solid #fff; } ! .eventbg2_7 { background-color: #73738C; border-right: 1px solid #fff; } .eventbg2week { background-color: #6699CC; border-right: 1px solid #A1A5A9; } |
|
From: <cl...@us...> - 2004-05-12 05:53:46
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5773/functions Modified Files: template.php Log Message: Basic day display functionality. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** template.php 8 Feb 2004 08:10:30 -0000 1.27 --- template.php 12 May 2004 05:53:36 -0000 1.28 *************** *** 118,127 **** } $this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!is', $weekday_loop, $this->page); ! } function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view; // Replaces the allday events --- 118,128 ---- } $this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!is', $weekday_loop, $this->page); ! ! } function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength; // Replaces the allday events *************** *** 176,179 **** --- 177,338 ---- } $this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!is', $weekday_loop, $this->page); + + // Build the body + $dayborder = 0; + + $nbrGridCols = 1; + if (isset($master_array[($getdate)])) { + foreach($master_array[($getdate)] as $ovlKey => $ovlValue) { + if ($ovlKey != '-1') { + foreach($ovlValue as $ovl2Value) { + $nbrGridCols = kgv($nbrGridCols, ($ovl2Value['event_overlap'] + 1)); + } + } + } + } + preg_match("!<\!-- loop row on -->(.*)<\!-- loop row off -->!is", $this->page, $match2); + $loop_hours = trim($match2[1]); + + $event_length = array (); + $border = 0; + ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2); + $this_day = $day_array2[3]; + $this_month = $day_array2[2]; + $this_year = $day_array2[1]; + foreach ($day_array as $key) { + ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp); + $cal_time = $key; + $key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year); + $key = date ($timeFormat, $key); + unset($this_time_arr); + + // add events that overlap the start time + if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) { + $this_time_arr = $master_array[$getdate][$cal_time]; + } + + // add events that overlap $day_start instead of cutting them out completely + if ("$day_start" == "$cal_time" && isset($master_array[$getdate])) { + foreach($master_array[$getdate] as $time_key => $time_arr) { + if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { + foreach($time_arr as $event_tmp) { + if ((int)$event_tmp['event_end'] > (int)$cal_time) { + $this_time_arr[] = $event_tmp; + } + } + } else { + break; + } + } + } + + // check for eventstart + if (isset($this_time_arr) && sizeof($this_time_arr) > 0) { + foreach ($this_time_arr as $eventKey => $loopevent) { + $drawEvent = drawEventTimes ($cal_time, $loopevent['event_end']); + $j = 0; + while (isset($event_length[$j])) { + if ($event_length[$j]['state'] == 'ended') { + $event_length[$j] = array ('length' => ($drawEvent['draw_length'] / $gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin'); + break; + } + $j++; + } + if ($j == sizeof($event_length)) { + array_push ($event_length, array ('length' => ($drawEvent['draw_length'] / $gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin')); + } + } + } + if (ereg('([0-9]{1,2}):00', $key)) { + $daydisplay .= '<tr>'."\n"; + $daydisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n"; + $daydisplay .= '<td width="1" height="' . $gridLength . '"></td>'."\n"; + } elseif("$cal_time" == "$day_start") { + $size_tmp = 60 - (int)substr($cal_time,2,2); + $daydisplay .= '<tr>'."\n"; + $daydisplay .= "<td rowspan=\"" . ($size_tmp / $gridLength) . "\" align=\"center\" valign=\"top\" width=\"60\" class=\"timeborder\">$key</td>\n"; + $daydisplay .= '<td width="1" height="' . $gridLength . '"></td>'."\n"; + } else { + $daydisplay .= '<tr>'."\n"; + $daydisplay .= '<td width="1" height="' . $gridLength . '"></td>'."\n"; + } + if ($dayborder == 0) { + $class = ' class="dayborder"'; + $dayborder++; + } else { + $class = ' class="dayborder2"'; + $dayborder = 0; + } + if (sizeof($event_length) == 0) { + $daydisplay .= '<td bgcolor="#ffffff" colspan="' . $nbrGridCols . '" '.$class.'> </td>'."\n"; + + } else { + $emptyWidth = $nbrGridCols; + for ($i=0;$i<sizeof($event_length);$i++) { + $drawWidth = $nbrGridCols / ($event_length[$i]['overlap'] + 1); + $emptyWidth = $emptyWidth - $drawWidth; + switch ($event_length[$i]['state']) { + case 'begin': + $event_length[$i]['state'] = 'started'; + $event_start = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_start']); + $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_end']); + if (isset($this_time_arr[($event_length[$i]['key'])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['display_end']); + $event_start = date ($timeFormat, $event_start); + $event_end = date ($timeFormat, $event_end); + $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; + + $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="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n"; + if ($event_status != '') { + $daydisplay .= '<td class="eventborder" 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 class="eventbg_'.$event_calno.'">'; + $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="#eeeeee" colspan="' . $drawWidth . '" ' . $class . '> </td>'."\n"; + break; + } + $event_length[$i]['length']--; + if ($event_length[$i]['length'] == 0) { + $event_length[$i]['state'] = 'ended'; + } + } + //fill emtpy space on the right + if ($emptyWidth > 0) { + $daydisplay .= '<td bgcolor="#ffffff" colspan="' . $emptyWidth . '" ' . $class . '> </td>'."\n"; + } + while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') { + array_pop($event_length); + } + + } + $daydisplay .= '</tr>'."\n"; + } + + $this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop row off -->!is', $daydisplay, $this->page); + } |
|
From: <cl...@us...> - 2004-05-12 05:53:46
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5773/templates/default Modified Files: day.tpl Log Message: Basic day display functionality. Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** day.tpl 8 Feb 2004 08:10:30 -0000 1.11 --- day.tpl 12 May 2004 05:53:37 -0000 1.12 *************** *** 76,266 **** </tr> <!-- loop row off --> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">10:00 AM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">11:00 AM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">12:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">1:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">2:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">3:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">4:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">5:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">6:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">7:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td rowspan="4" align="center" valign="top" width="60" class="timeborder">8:00 PM</td> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder"> </td> - </tr> - <tr> - <td width="1" height="15"></td> - <td class="dayborder2"> </td> - </tr> </table> </td> --- 76,79 ---- |
|
From: <cl...@us...> - 2004-05-11 04:45:51
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25792 Modified Files: ical_parser.php Log Message: Fixed bad update. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** ical_parser.php 11 May 2004 04:44:48 -0000 1.155 --- ical_parser.php 11 May 2004 04:45:39 -0000 1.156 *************** *** 240,245 **** while (($start != $end) && ($start < $mArray_end)) { $start_date2 = date('Ymd', $start); ! $master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => ! $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start = strtotime('+1 day', $start); } --- 240,244 ---- while (($start != $end) && ($start < $mArray_end)) { $start_date2 = date('Ymd', $start); ! $master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start = strtotime('+1 day', $start); } *************** *** 270,276 **** $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summa ! ry, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) ! , 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); $start_tmp = strtotime('+1 day',$start_tmp); } --- 269,273 ---- $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); $start_tmp = strtotime('+1 day',$start_tmp); } *************** *** 287,293 **** if (!in_array($start_date, $except_dates)) { $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summ ! ary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attende ! e), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } --- 284,288 ---- if (!in_array($start_date, $except_dates)) { $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } *************** *** 604,609 **** while ($start_time2 < $end_time2) { $start_date2 = date('Ymd', $start_time2); ! $master_array[($start_date2)][('-1')][] = array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' ! => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start_time2 = strtotime('+1 day', $start_time2); } --- 599,603 ---- while ($start_time2 < $end_time2) { $start_date2 = date('Ymd', $start_time2); ! $master_array[($start_date2)][('-1')][] = array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start_time2 = strtotime('+1 day', $start_time2); } *************** *** 635,641 **** if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'even ! t_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => ser ! ialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url) ; } $start_tmp = strtotime('+1 day',$start_tmp); --- 629,633 ---- if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url) ; } $start_tmp = strtotime('+1 day',$start_tmp); *************** *** 653,659 **** if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, ! 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' ! => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url); } } --- 645,649 ---- if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url); } } *************** *** 697,702 **** $vtodo_sort = $vtodo_priority; } ! $master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed ! _time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, 'calname' => $actual_calname); unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; --- 687,691 ---- $vtodo_sort = $vtodo_priority; } ! $master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, 'calname' => $actual_calname); unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; |
|
From: <cl...@us...> - 2004-05-11 04:44:59
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25624 Modified Files: ical_parser.php Log Message: Test Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.154 retrieving revision 1.155 diff -C2 -d -r1.154 -r1.155 *** ical_parser.php 11 May 2004 02:41:51 -0000 1.154 --- ical_parser.php 11 May 2004 04:44:48 -0000 1.155 *************** *** 1067,1071 **** } - if ($parse_file) { // Sort the array by absolute date. --- 1067,1070 ---- *************** *** 1093,1098 **** } - - //If you want to see the values in the arrays, uncomment below. --- 1092,1095 ---- |
|
From: <cl...@us...> - 2004-05-11 02:42:01
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5465 Modified Files: ical_parser.php Log Message: Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.153 retrieving revision 1.154 diff -C2 -d -r1.153 -r1.154 *** ical_parser.php 10 May 2004 19:09:54 -0000 1.153 --- ical_parser.php 11 May 2004 02:41:51 -0000 1.154 *************** *** 240,244 **** while (($start != $end) && ($start < $mArray_end)) { $start_date2 = date('Ymd', $start); ! $master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start = strtotime('+1 day', $start); } --- 240,245 ---- while (($start != $end) && ($start < $mArray_end)) { $start_date2 = date('Ymd', $start); ! $master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => ! $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start = strtotime('+1 day', $start); } *************** *** 269,273 **** $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); $start_tmp = strtotime('+1 day',$start_tmp); } --- 270,276 ---- $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summa ! ry, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) ! , 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); $start_tmp = strtotime('+1 day',$start_tmp); } *************** *** 284,288 **** if (!in_array($start_date, $except_dates)) { $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } --- 287,293 ---- if (!in_array($start_date, $except_dates)) { $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summ ! ary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attende ! e), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } *************** *** 599,603 **** while ($start_time2 < $end_time2) { $start_date2 = date('Ymd', $start_time2); ! $master_array[($start_date2)][('-1')][] = array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start_time2 = strtotime('+1 day', $start_time2); } --- 604,609 ---- while ($start_time2 < $end_time2) { $start_date2 = date('Ymd', $start_time2); ! $master_array[($start_date2)][('-1')][] = array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' ! => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start_time2 = strtotime('+1 day', $start_time2); } *************** *** 629,633 **** if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url) ; } $start_tmp = strtotime('+1 day',$start_tmp); --- 635,641 ---- if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'even ! t_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => ser ! ialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url) ; } $start_tmp = strtotime('+1 day',$start_tmp); *************** *** 645,649 **** if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url); } } --- 653,659 ---- if ($abs_until > $until_check) { $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid); ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, ! 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' ! => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url); } } *************** *** 687,691 **** $vtodo_sort = $vtodo_priority; } ! $master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, 'calname' => $actual_calname); unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; --- 697,702 ---- $vtodo_sort = $vtodo_priority; } ! $master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed ! _time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, 'calname' => $actual_calname); unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; |
|
From: <cl...@us...> - 2004-05-10 19:10:19
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8558/functions Modified Files: ical_parser.php Log Message: Fix for byday in monthly. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** ical_parser.php 27 Apr 2004 22:38:02 -0000 1.152 --- ical_parser.php 10 May 2004 19:09:54 -0000 1.153 *************** *** 483,487 **** foreach($byday as $day) { ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); ! $nth = $byday_arr[2]-1; $on_day = two2threeCharDays($byday_arr[3]); $on_day_num = two2threeCharDays($byday_arr[3],false); --- 483,492 ---- foreach($byday as $day) { ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); ! //Added for 2.0 when no modifier is set ! if ($byday_arr[2] != '') { ! $nth = $byday_arr[2]-1; ! } else { ! $nth = 0; ! } $on_day = two2threeCharDays($byday_arr[3]); $on_day_num = two2threeCharDays($byday_arr[3],false); *************** *** 833,837 **** $data = '1971'.$dtstart_check[2].$dtstart_check[3]; } - echo $data.'<br>'; $allday_start = $data; $start_date = $allday_start; --- 838,841 ---- |
|
From: <cl...@us...> - 2004-04-27 22:38:18
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26064/functions Modified Files: ical_parser.php Log Message: Fix for COMPLETED and DUE for VTODO. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.151 retrieving revision 1.152 diff -C2 -d -r1.151 -r1.152 *** ical_parser.php 27 Apr 2004 15:26:22 -0000 1.151 --- ical_parser.php 27 Apr 2004 22:38:02 -0000 1.152 *************** *** 728,733 **** ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); ! $start_date = $regs[1] . $regs[2] . $regs[3]; ! $start_time = $regs[4] . $regs[5]; $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); --- 728,733 ---- ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); ! $due_date = $regs[1] . $regs[2] . $regs[3]; ! $due_time = $regs[4] . $regs[5]; $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); *************** *** 775,780 **** ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); ! $start_date = $regs[1] . $regs[2] . $regs[3]; ! $start_time = $regs[4] . $regs[5]; $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); --- 775,780 ---- ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); ! $completed_date = $regs[1] . $regs[2] . $regs[3]; ! $completed_time = $regs[4] . $regs[5]; $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); |
|
From: <cl...@us...> - 2004-04-27 20:57:15
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2801/rss Modified Files: rss.php Log Message: Fixed calendar path for filemtime Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** rss.php 27 Nov 2002 20:34:24 -0000 1.16 --- rss.php 27 Apr 2004 20:56:57 -0000 1.17 *************** *** 19,23 **** // calculate a value for Last Modified and ETag ! $filemod = filemtime("../calendars/$cal.ics"); $filemodtime = date("r", $filemod); --- 19,23 ---- // calculate a value for Last Modified and ETag ! $filemod = filemtime("$calendar_path/$cal.ics"); $filemodtime = date("r", $filemod); |
|
From: <cl...@us...> - 2004-04-27 15:26:31
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24428/functions Modified Files: ical_parser.php Log Message: Dates on 1969 were not showing up. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.150 retrieving revision 1.151 diff -C2 -d -r1.150 -r1.151 *** ical_parser.php 6 Feb 2004 00:47:54 -0000 1.150 --- ical_parser.php 27 Apr 2004 15:26:22 -0000 1.151 *************** *** 830,837 **** if ((preg_match("/^DTSTART;VALUE=DATE/i", $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data))) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check); ! if ($dtstart_check[1] < 1969) { ! $dtstart_check[1] = '1990'; ! $data = $dtstart_check[1].$dtstart_check[2].$dtstart_check[3]; } $allday_start = $data; $start_date = $allday_start; --- 830,837 ---- if ((preg_match("/^DTSTART;VALUE=DATE/i", $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data))) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check); ! if ($dtstart_check[1] < 1970) { ! $data = '1971'.$dtstart_check[2].$dtstart_check[3]; } + echo $data.'<br>'; $allday_start = $data; $start_date = $allday_start; *************** *** 884,890 **** if (preg_match("/^DTEND;VALUE=DATE/i", $field)) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtend_check); ! if ($dtend_check[1] < 1969) { ! $dtend_check[1] = '1990'; ! $data = $dtend_check[1].$dtend_check[2].$dtend_check[3]; } $allday_end = $data; --- 884,889 ---- if (preg_match("/^DTEND;VALUE=DATE/i", $field)) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtend_check); ! if ($dtend_check[1] < 1970) { ! $data = '1971'.$dtend_check[2].$dtend_check[3]; } $allday_end = $data; |
|
From: <cl...@us...> - 2004-02-09 00:54:56
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27791/rss Modified Files: index.php Log Message: Initial wiring of rss index and template. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** index.php 26 Nov 2003 00:02:49 -0000 1.22 --- index.php 9 Feb 2004 00:51:49 -0000 1.23 *************** *** 2,93 **** define('BASE','../'); ! include(BASE.'functions/ical_parser.php'); ! include_once(BASE.'functions/calendar_functions.php'); $default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/rss/')); ! if (isset($HTTP_SERVER_VARS['HTTP_REFERER']) && $HTTP_SERVER_VARS['HTTP_REFERER'] != '') { ! $back_page = $HTTP_SERVER_VARS['HTTP_REFERER']; ! } else { ! $back_page = BASE.$default_view.'.php?cal='.$cal.'&getdate='.$getdate; ! } $current_view = "rssindex"; $display_date = "$calendar_lang - RSS Info"; ! include (BASE.'includes/header.inc.php'); ?> ! <center> ! <table border="0" width="700" cellspacing="0" cellpadding="0"> ! <tr> ! <td width="520" valign="top" align="center"> ! <table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder"> ! <tr> ! <td align="center" valign="middle"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="120" class="navback"><?php echo '<a href="'.$back_page.'"><img src="'.BASE.'styles/'.$style_sheet.'/back.gif" alt=" " border="0" align="left"></a>'; ?></td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo 'RSS Information'; ?></font></td> ! </tr> ! </table> ! </td> ! <td align="right" width="120" class="navback"> ! <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td><?php echo '<a class="psf" href="'.BASE.'day.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/day_on.gif" alt=" " border="0"></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'week.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/week_on.gif" alt=" " border="0"></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'month.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/month_on.gif" alt=" " border="0"></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'year.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/year_on.gif" alt=" " border="0"></td>'; ?> ! </tr> ! </table> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! <tr> ! <td class="dayborder"><img src="../images/spacer.gif" width="1" height="5" alt=" "></td> ! </tr> ! <?php if ($enable_rss == "yes") { ?> ! <tr> ! <td> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> ! <tr> ! <td width="2%"></td> ! <td width="98%" valign="top" align="left"> ! <br> ! <?php echo "$this_site_is_lang "; ?><a class="psf" href="http://www.oreillynet.com/rss/">RSS 0.91 enabled</a>.<br> ! <br> ! <?php ! ! // build the <option> tags ! $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED); ! foreach ($filelist as $file) { ! // $cal_filename is the filename of the calendar without .ics ! // $cal is a urlencoded version of $cal_filename ! // $cal_displayname is $cal_filename with occurrences of "32" replaced with " " ! $cal_filename_tmp = substr($file,0,-4); ! $cal_tmp = urlencode($cal_filename_tmp); ! $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! echo '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br>'; ! echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br>'; ! echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br>'; ! echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br>'; ! $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; ! echo '<br><br>'; ! } ! ?> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! <?php } else { ?> ! <tr> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20">RSS is not enabled on this site.</font></td> ! </tr> ! <?php } ?> ! </table> ! </td> ! </tr> ! </table> ! </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> --- 2,56 ---- define('BASE','../'); ! require_once(BASE.'functions/ical_parser.php'); ! require_once(BASE.'functions/calendar_functions.php'); ! $default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/rss/')); ! $current_view = "rssindex"; $display_date = "$calendar_lang - RSS Info"; ! ! $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED); ! foreach ($filelist as $file) { ! // $cal_filename is the filename of the calendar without .ics ! // $cal is a urlencoded version of $cal_filename ! // $cal_displayname is $cal_filename with occurrences of "32" replaced with " " ! $cal_filename_tmp = substr($file,0,-4); ! $cal_tmp = urlencode($cal_filename_tmp); ! $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! $rss_list = '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br>'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br>'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br>'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br>'; ! $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; ! } ! ! ! $page = new Page(BASE.'templates/'.$template.'/rss_index.tpl'); ! ! $page->replace_tags(array( ! 'header' => BASE.'templates/'.$template.'/header.tpl', ! 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', ! 'event_js' => BASE.'functions/event.js', ! 'default_path' => $default_path, ! 'template' => $template, ! 'cal' => $cal, ! 'getdate' => $getdate, ! 'calendar_name' => $calendar_name, ! 'display_date' => $display_date, ! 'current_view' => $current_view, ! 'sidebar_date' => $sidebar_date, ! 'rss_powered' => $rss_powered, ! 'rss_list' => $rss_list, ! 'rss_available' => '', ! 'rssdisable' => '', ! 'rss_valid' => '', ! 'todo_js' => '', ! 'show_search' => '' ! )); ! ! $page->output(); ! ! ! ?> ! \ No newline at end of file |
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27791 Modified Files: admin.php day.php month.php preferences.php print.php search.php week.php year.php Log Message: Initial wiring of rss index and template. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin.php 8 Feb 2004 23:46:47 -0000 1.12 --- admin.php 9 Feb 2004 00:51:48 -0000 1.13 *************** *** 52,55 **** --- 52,56 ---- 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', + 'default_path' => '', 'template' => $template, 'cal' => $cal, Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** day.php 8 Feb 2004 00:43:13 -0000 1.110 --- day.php 9 Feb 2004 00:51:48 -0000 1.111 *************** *** 41,44 **** --- 41,45 ---- 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', + 'default_path' => '', 'template' => $template, 'cal' => $cal, Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** month.php 3 Feb 2004 23:02:10 -0000 1.115 --- month.php 9 Feb 2004 00:51:48 -0000 1.116 *************** *** 61,64 **** --- 61,65 ---- 'display_date' => $display_date, 'rss_powered' => $rss_powered, + 'default_path' => '', 'rss_available' => '', 'rss_valid' => '', Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** preferences.php 8 Feb 2004 23:46:47 -0000 1.43 --- preferences.php 9 Feb 2004 00:51:48 -0000 1.44 *************** *** 137,140 **** --- 137,141 ---- 'footer' => BASE.'templates/'.$template.'/footer.tpl', 'template' => $template, + 'default_path' => '', 'cal' => $cal, 'getdate' => $getdate, Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** print.php 8 Feb 2004 00:43:13 -0000 1.21 --- print.php 9 Feb 2004 00:51:48 -0000 1.22 *************** *** 57,60 **** --- 57,61 ---- 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', + 'default_path' => '', 'template' => $template, 'cal' => $cal, Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** search.php 8 Feb 2004 23:46:47 -0000 1.28 --- search.php 9 Feb 2004 00:51:48 -0000 1.29 *************** *** 277,280 **** --- 277,281 ---- 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', + 'default_path' => '', 'template' => $template, 'cal' => $cal, Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** week.php 8 Feb 2004 08:10:28 -0000 1.108 --- week.php 9 Feb 2004 00:51:48 -0000 1.109 *************** *** 44,47 **** --- 44,48 ---- 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', + 'default_path' => '', 'template' => $template, 'cal' => $cal, Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** year.php 1 Feb 2004 04:16:36 -0000 1.28 --- year.php 9 Feb 2004 00:51:48 -0000 1.29 *************** *** 2,6 **** define('BASE', './'); ! include_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/template.php'); $current_view = 'year'; --- 2,6 ---- define('BASE', './'); ! require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/template.php'); $current_view = 'year'; *************** *** 21,28 **** --- 21,30 ---- 'footer' => BASE.'templates/'.$template.'/footer.tpl', 'template' => $template, + 'default_path' => '', 'cal' => $cal, 'getdate' => $getdate, 'calendar_name' => $calendar_name, 'display_date' => $this_year, + 'default_path' => '', 'rss_powered' => $rss_powered, 'rss_available' => '', |
|
From: <cl...@us...> - 2004-02-09 00:54:56
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27791/languages Modified Files: english.inc.php Log Message: Initial wiring of rss index and template. Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** english.inc.php 8 Feb 2004 22:37:03 -0000 1.54 --- english.inc.php 9 Feb 2004 00:51:48 -0000 1.55 *************** *** 114,118 **** $lang['l_submit'] = 'Submit'; $lang['l_delete'] = 'Delete'; ! $all_cal_comb_lang = 'All calendars combined'; // New for 2.0 --- 114,118 ---- $lang['l_submit'] = 'Submit'; $lang['l_delete'] = 'Delete'; ! $all_cal_comb_lang = 'All Combined'; // New for 2.0 *************** *** 120,132 **** $lang['l_admin_subhead'] = 'Manage your calendars from this page'; $lang['l_prefs_subhead'] = 'Sets a cookie for visiting this site'; // - navigation ! $back_lang = 'Back'; ! $next_lang = 'Next'; ! $prev_lang = 'Prev'; ! $day_view_lang = 'Day View'; ! $week_view_lang = 'Week View'; ! $month_view_lang = 'Month View'; ! $year_view_lang = 'Year View'; // --------------------------------- --- 120,135 ---- $lang['l_admin_subhead'] = 'Manage your calendars from this page'; $lang['l_prefs_subhead'] = 'Sets a cookie for visiting this site'; + $lang['l_rss_info'] = 'RSS Information'; + $lang['l_rss_subhead'] = 'Basic RSS feeds available for each calendar'; + $lang['l_rss_notenabled'] = 'RSS is not enabled on this site'; // - navigation ! $lang['l_back'] = 'Back'; ! $lang['l_next'] = 'Next'; ! $lang['l_prev'] = 'Prev'; ! $lang['l_day_view'] = 'Day View'; ! $lang['l_week_view'] = 'Week View'; ! $lang['l_month_view'] = 'Month View'; ! $lang['l_year_view'] = 'Year View'; // --------------------------------- |
|
From: <cl...@us...> - 2004-02-09 00:54:56
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27791/templates/default Modified Files: header.tpl Added Files: rss_index.tpl Log Message: Initial wiring of rss index and template. --- NEW FILE: rss_index.tpl --- {HEADER} <center> <table border="0" width="520" cellspacing="0" cellpadding="0"> <tr> <td width="520" valign="top" align="center"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td align="center" valign="middle"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_RSS_INFO}</span><br /><span class="V9G">{L_RSS_SUBHEAD}</span></div></td> <td valign="top" align="right" width="120" class="navback"> <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> <td><a class="psf" href="../day.php?cal={CAL}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> <td><a class="psf" href="../week.php?cal={CAL}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> <td><a class="psf" href="../month.php?cal={CAL}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> <td><a class="psf" href="../year.php?cal={CAL}&getdate={GETDATE}"><img src="../templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> </div> </td> </tr> </table> </td> </tr> <tr> <td class="dayborder"><img src="../images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> <tr> <td width="2%"></td> <td width="98%" valign="top" align="left"> <br /> {L_THIS_SITE_IS} <a class="psf" href="http://www.oreillynet.com/rss/">RSS 0.91 enabled</a>.<br> <br /> {RSS_LIST} <br /> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table> <table width="520" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tbll"><img src="../images/spacer.gif" alt="" width="8" height="4" /></td> <td class="tblbot"><img src="../images/spacer.gif" alt="" width="8" height="4" /></td> <td class="tblr"><img src="../images/spacer.gif" alt="" width="8" height="4" /></td> </tr> </table> </center> {FOOTER} Index: header.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/header.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** header.tpl 1 Feb 2004 04:16:37 -0000 1.5 --- header.tpl 9 Feb 2004 00:51:49 -0000 1.6 *************** *** 5,9 **** <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title>{CALENDAR_NAME} - {DISPLAY_DATE}</title> ! <link rel="stylesheet" type="text/css" href="templates/{TEMPLATE}/default.css"> <!-- switch rss_available on --> <link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_VIEW}/rss/rss.php?cal={CAL}&rssview={CURRENT_VIEW}"> --- 5,9 ---- <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title>{CALENDAR_NAME} - {DISPLAY_DATE}</title> ! <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css"> <!-- switch rss_available on --> <link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_VIEW}/rss/rss.php?cal={CAL}&rssview={CURRENT_VIEW}"> |
|
From: <cl...@us...> - 2004-02-08 23:49:55
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14468/templates/default Modified Files: search.tpl Log Message: Initial wiring of search.tpl. Index: search.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/search.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** search.tpl 29 Jan 2004 00:19:29 -0000 1.1 --- search.tpl 8 Feb 2004 23:46:47 -0000 1.2 *************** *** 1,38 **** {HEADER} <center> ! <table border="0" width="700" cellspacing="0" cellpadding="0"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="120" class="navback"><a href="{BACK_PAGE}"><img src="templates/{TEMPLATE}/images/back.gif" alt="{L_BACK}" border="0" align="left"></a></td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20">{L_RESULTS}</font></td> ! </tr> ! </table> ! </td> ! <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0"></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0"></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0"></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0"></a></td> </tr> </table> </td> ! </tr> </table> </td> </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> <td align="left"> <div style="padding: 10px;"> ! <div align="center"><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div> <!-- switch results on --> <font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{DAYOFMONTH}</a></b></font><br> --- 1,33 ---- {HEADER} <center> ! <table border="0" width="520" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_RESULTS}</span><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td> ! <td valign="top" align="right" width="120" class="navback"> ! <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> + </div> </td> ! </tr> </table> </td> </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="1" alt=" "></td> </tr> <tr> <td align="left"> <div style="padding: 10px;"> ! <div><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div> <!-- switch results on --> <font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{DAYOFMONTH}</a></b></font><br> *************** *** 99,103 **** <div align="center"> {SEARCH_BOX} - <p class="V9G">{L_SEARCH_TOOK} {SEARCH_TOOK)</p> </div> <br> --- 94,97 ---- *************** *** 106,110 **** --- 100,112 ---- </tr> </table> + <table width="520" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> </center> + {FOOTER} |
|
From: <cl...@us...> - 2004-02-08 23:49:55
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14468 Modified Files: admin.php preferences.php search.php Log Message: Initial wiring of search.tpl. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin.php 8 Feb 2004 22:37:03 -0000 1.11 --- admin.php 8 Feb 2004 23:46:47 -0000 1.12 *************** *** 3,9 **** define('BASE', './'); - require_once(BASE.'functions/init.inc.php'); require_once(BASE.'functions/admin_functions.php'); ! require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); --- 3,8 ---- define('BASE', './'); require_once(BASE.'functions/admin_functions.php'); ! require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/template.php'); Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** preferences.php 31 Jan 2004 22:59:29 -0000 1.42 --- preferences.php 8 Feb 2004 23:46:47 -0000 1.43 *************** *** 2,6 **** define('BASE','./'); ! include_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/template.php'); $display_date = $preferences_lang; --- 2,6 ---- define('BASE','./'); ! require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/template.php'); $display_date = $preferences_lang; Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** search.php 22 Nov 2003 20:02:39 -0000 1.27 --- search.php 8 Feb 2004 23:46:47 -0000 1.28 *************** *** 4,8 **** $current_view = 'search'; $display_date = $results_lang; ! include('./functions/ical_parser.php'); if (isset($HTTP_SERVER_VARS['HTTP_REFERER']) && $HTTP_SERVER_VARS['HTTP_REFERER'] != '') { --- 4,10 ---- $current_view = 'search'; $display_date = $results_lang; ! require_once(BASE.'functions/ical_parser.php'); ! require_once(BASE.'functions/list_functions.php'); ! require_once(BASE.'functions/template.php'); if (isset($HTTP_SERVER_VARS['HTTP_REFERER']) && $HTTP_SERVER_VARS['HTTP_REFERER'] != '') { *************** *** 73,243 **** $search_took = number_format(($search_ended-$search_started),3); - include (BASE.'includes/header.inc.php'); - - ?> - - <center> - <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td align="left" width="120" class="navback"><?php echo '<a href="'.$back_page.'"><img src="styles/'.$style_sheet.'/back.gif" alt="['.$back_lang.']" border="0" align="left"></a>'; ?></td> - <td class="navback"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo $results_lang; ?></font></td> - </tr> - </table> - </td> - <td align="right" width="120" class="navback"> - <table width="120" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td><?php echo '<a class="psf" href="day.php?cal='.$cal.'&getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/day_on.gif" alt="'.$day_view_lang.'" border="0"></a></td>'; ?> - <td><?php echo '<a class="psf" href="week.php?cal='.$cal.'&getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/week_on.gif" alt="'.$week_view_lang.'" border="0"></a></td>'; ?> - <td><?php echo '<a class="psf" href="month.php?cal='.$cal.'&getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/month_on.gif" alt="'.$month_view_lang.'" border="0"></a></td>'; ?> - <td><?php echo '<a class="psf" href="year.php?cal='.$cal.'&getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/year_on.gif" alt="'.$year_view_lang.'" border="0"></a></td>'; ?> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> - </tr> - <tr> - <td align="left"> - <div style="padding: 10px;"> - <?php - - echo '<div align="center"><p class="V12">'.$query_lang.': '.$formatted_search.'</p></div>'; - - if (isset($the_arr) && is_array($the_arr)) { - foreach($the_arr as $val) { - $key = $val['date']; - if ($key > 1) { - $dayofmonth = strtotime ($key); - $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); - echo '<font class="V12"><b><a class="ps3" href="day.php?cal='.$cal.'&getdate='.$key.'">'.$dayofmonth.'</a></b></font><br>'; - } - if ($val["event_text"]) { - $event_text = stripslashes(urldecode($val["event_text"])); - $description = stripslashes(urldecode($val["description"])); - $event_start = $val["event_start"]; - $event_end = $val["event_end"]; - $event_calna = $val["calname"]; - $event_start = date ($timeFormat, strtotime ("$event_start")); - $event_end = date ($timeFormat, strtotime ("$event_end")); - $event_start = "$event_start - $event_end"; - if (!$val["event_start"]) { - $event_start = "$all_day_lang"; - $event_start2 = ''; - $event_end = ''; - } - echo '<div style="margin-left: 10px; margin-bottom: 10px;">'; - echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n"; - echo "<tr>\n"; - echo "<td width=\"120\" class=\"G10BOLD\">$time_lang:</td>\n"; - echo "<td align=\"left\" class=\"G10B\">$event_start</td>\n"; - echo "</tr>\n"; - echo "<tr>\n"; - echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$summary_lang:</td>\n"; - echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$event_text</td>\n"; - echo "</tr>\n"; - if (isset($val['recur'])) { - $recur = $val['recur']; - echo "<tr>\n"; - echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">Recurring event:</td>\n"; - echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$recur</td>\n"; - echo "</tr>\n"; - } - if ($val["description"]) { - echo "<tr>\n"; - echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$description_lang:</td>\n"; - echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$description</td>\n"; - echo "</tr>\n"; - } - echo "</table>\n"; - echo '</div>'; - if (isset($val['exceptions'])) { - echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; - foreach($val['exceptions'] as $val2) { - $key = $val2['date']; - $dayofmonth = strtotime ($key); - $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); - echo "<td align=\"left\" colspan=\"2\"><font class=\"V10\"><i>$exception_lang</i>: <a class=\"ps3\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a></font></td></tr>"; - - if ($val2["event_text"]) { - $event_text = stripslashes(urldecode($val2["event_text"])); - $description = stripslashes(urldecode($val2["description"])); - $event_start = $val2["event_start"]; - $event_end = $val2["event_end"]; - $event_start = date ($timeFormat, strtotime ("$event_start")); - $event_end = date ($timeFormat, strtotime ("$event_end")); - $event_start = "$event_start - $event_end"; - if (!$val2["event_start"]) { - $event_start = "$all_day_lang"; - $event_start2 = ''; - $event_end = ''; - } - echo "<tr>\n"; - echo "<td align=\"left\">\n"; - echo '<div style="margin-left: 10px;">'; - echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n"; - echo "<tr>\n"; - echo "<td width=\"100\" class=\"V10\">$time_lang:</td>\n"; - echo "<td align=\"left\" class=\"V10\">$event_start</td>\n"; - echo "</tr>\n"; - echo "<tr>\n"; - echo "<td valign=\"top\" width=\"100\" class=\"V10\">$summary_lang:</td>\n"; - echo "<td valign=\"top\" align=\"left\" class=\"V10\">$event_text</td>\n"; - echo "</tr>\n"; - if (isset($val2['recur'])) { - $recur = $val2['recur']; - echo "<tr>\n"; - echo "<td valign=\"top\" width=\"100\" class=\"V10\">$recurring_event_lang:</td>\n"; - echo "<td valign=\"top\" align=\"left\" class=\"V10\">$recur</td>\n"; - echo "</tr>\n"; - } - if ($val2["description"]) { - echo "<tr>\n"; - echo "<td valign=\"top\" width=\"100\" class=\"V10\">$description_lang:</td>\n"; - echo "<td valign=\"top\" align=\"left\" class=\"V10\">$description</td>\n"; - echo "</tr>\n"; - } - echo "</table>"; - echo '</div><br>'; - - } - } - } - } - } - } else { - echo '<div align="center">'; - echo '<p class="V12">'.$no_results_lang.'</p>'; - echo '</div>'; - } - - echo '<div align="center">'; - echo $search_box; - echo '<p class="V9G">'.sprintf($search_took_lang,$search_took).'</p></div>'; - echo '</div>'; - ?> - - </td> - </tr> - </table> - </td> - </tr> - </table> - </center> - <?php - - include (BASE.'includes/footer.inc.php'); - - // takes a boolean search and formats it into an array // use with sister function search_boolean() --- 75,78 ---- *************** *** 435,441 **** } ! function getmicrotime() { ! list($usec, $sec) = explode(' ',microtime()); ! return ((float)$usec + (float)$sec); ! } ?> --- 270,295 ---- } ! $page = new Page(BASE.'templates/'.$template.'/search.tpl'); ! ! $page->replace_tags(array( ! 'header' => BASE.'templates/'.$template.'/header.tpl', ! 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', ! 'event_js' => BASE.'functions/event.js', ! 'template' => $template, ! 'cal' => $cal, ! 'getdate' => $getdate, ! 'calendar_name' => $calendar_name, ! 'display_date' => $display_date, ! 'current_view' => $current_view, ! 'sidebar_date' => $sidebar_date, ! 'rss_powered' => $rss_powered, ! 'rss_available' => '', ! 'rss_valid' => '', ! 'todo_js' => '', ! 'show_search' => '' ! )); ! ! $page->output(); ! ?> |
|
From: <cl...@us...> - 2004-02-08 22:40:10
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31637/templates/default Modified Files: admin.tpl preferences.tpl Log Message: Tweeks of admin initial wiring of template. Index: admin.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/admin.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin.tpl 29 Jan 2004 00:19:28 -0000 1.3 --- admin.tpl 8 Feb 2004 22:37:03 -0000 1.4 *************** *** 1,28 **** {HEADER} <center> ! <table border="0" width="700" cellspacing="0" cellpadding="0"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="120" class="navback"><a href="{BACK_PAGE}"><img src="templates/{TEMPLATE}/images/back.gif" alt="{L_BACK}" border="0" align="left"></a></td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20">{L_ADMIN_HEADER}</font></td> ! </tr> ! </table> ! </td> ! <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0"></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0"></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0"></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0"></a></td> </tr> </table> </td> ! </tr> </table> </td> --- 1,23 ---- {HEADER} <center> ! <table border="0" width="520" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_ADMIN_HEADER}</span><br /><span class="V9G">{L_ADMIN_SUBHEAD}</span></div></td> ! <td valign="top" align="right" width="120" class="navback"> ! <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> + </div> </td> ! </tr> </table> </td> *************** *** 32,38 **** </tr> <tr> ! <td class="G10" align="right"> <!-- switch logged_in on --> ! <a href="admin.php?action=logout\">{LOGOUT_LANG}</a> <!-- switch logged_in off --> </td> --- 27,33 ---- </tr> <tr> ! <td align="right"> <!-- switch logged_in on --> ! <a href="admin.php?action=logout\">{L_LOGOUT}</a> <!-- switch logged_in off --> </td> *************** *** 46,50 **** <!-- switch login_error on --> ! <font color="red">{INVALID_LOGIN_LANG}</font> <!-- switch login_error off --> --- 41,45 ---- <!-- switch login_error on --> ! <font color="red">{L_INVALID_LOGIN}</font> <!-- switch login_error off --> *************** *** 53,66 **** <table cellspacing="0" cellpadding="0"> <tr> ! <td nowrap>{USERNAME_LANG}: </td> <td align="left"><input type="text" name="username"></td> </tr> <tr> ! <td>{PASSWORD_LANG}: </td> <td align="left"><input type="password" name="password"></td> </tr> <tr> <td> </td> ! <td align="left"><input type="submit" value="{$login_lang}"></td> </tr> <tr> --- 48,61 ---- <table cellspacing="0" cellpadding="0"> <tr> ! <td nowrap>{L_USERNAME}: </td> <td align="left"><input type="text" name="username"></td> </tr> <tr> ! <td>{L_PASSWORD}: </td> <td align="left"><input type="password" name="password"></td> </tr> <tr> <td> </td> ! <td align="left"><input type="submit" value="{L_LOGIN}"></td> </tr> <tr> *************** *** 75,108 **** <!-- switch action_message on --> ! <font color="green">{CAL_FILE_LANG} {FILENUMBER}: {ACTION_MSG}</font><br> <!-- switch action_message off --> ! <h2>{ADDUPDATE_CAL_LANG}</h2> ! <p>{ADDUPDATE_DESC_LANG}</p> <form action="admin.php" method="post" enctype="multipart/form-data"> <input type="hidden" name="action" value="addupdate"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> <tr> ! <td nowrap>{CAL_FILE_LANG} 1: </td> <td><input type="file" name="calfile[1]"></td> </tr> <tr> ! <td nowrap>{CAL_FILE_LANG} 2: </td> <td><input type="file" name="calfile[2]"></td> </tr> <tr> ! <td nowrap>{CAL_FILE_LANG} 3: </td> <td><input type="file" name="calfile[3]"></td> </tr> <tr> ! <td nowrap>{CAL_FILE_LANG} 4: </td> <td><input type="file" name="calfile[4]"></td> </tr> <tr> ! <td nowrap>{CAL_FILE_LANG} 5: </td> <td><input type="file" name="calfile[5]"></td> </tr> <tr> <td> </td> ! <td><input type="submit" value="{SUBMIT_LANG}"></td> </tr> <tr> --- 70,103 ---- <!-- switch action_message on --> ! <font color="green">{L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}</font><br> <!-- switch action_message off --> ! <b>{L_ADDUPDATE_CAL}</b> ! <p>{L_ADDUPDATE_DESC}</p> <form action="admin.php" method="post" enctype="multipart/form-data"> <input type="hidden" name="action" value="addupdate"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> <tr> ! <td nowrap>{L_CAL_FILE} 1: </td> <td><input type="file" name="calfile[1]"></td> </tr> <tr> ! <td nowrap>{L_CAL_FILE} 2: </td> <td><input type="file" name="calfile[2]"></td> </tr> <tr> ! <td nowrap>{L_CAL_FILE} 3: </td> <td><input type="file" name="calfile[3]"></td> </tr> <tr> ! <td nowrap>{L_CAL_FILE} 4: </td> <td><input type="file" name="calfile[4]"></td> </tr> <tr> ! <td nowrap>{L_CAL_FILE} 5: </td> <td><input type="file" name="calfile[5]"></td> </tr> <tr> <td> </td> ! <td><input type="submit" value="{L_SUBMIT}"></td> </tr> <tr> *************** *** 112,120 **** </form> ! <h2>{DELETE_CAL_LANG}</h2> <form action="admin.php" method="post"> {DELETE_TABLE} <input type="hidden" name="action" value="delete"> ! <p><input type="submit" value="{DELETE_LANG}"></p> <p>{DELETE_MSG} </p> </form> --- 107,115 ---- </form> ! <b>{L_DELETE_CAL}</b> <form action="admin.php" method="post"> {DELETE_TABLE} <input type="hidden" name="action" value="delete"> ! <p><input type="submit" value="{L_DELETE}"></p> <p>{DELETE_MSG} </p> </form> *************** *** 127,130 **** --- 122,132 ---- </tr> </table> + <table width="520" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> {FOOTER} Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** preferences.tpl 8 Feb 2004 01:10:00 -0000 1.7 --- preferences.tpl 8 Feb 2004 22:37:03 -0000 1.8 *************** *** 6,10 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_PREFERENCES}</span><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td> <td valign="top" align="right" width="120" class="navback"> <div style="padding-top: 3px;"> --- 6,10 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_PREFERENCES}</span><br /><span class="V9G">{L_PREFS_SUBHEAD}</span></div></td> <td valign="top" align="right" width="120" class="navback"> <div style="padding-top: 3px;"> |
|
From: <cl...@us...> - 2004-02-08 22:40:10
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31637/languages Modified Files: english.inc.php Log Message: Tweeks of admin initial wiring of template. Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** english.inc.php 3 Feb 2004 23:02:13 -0000 1.53 --- english.inc.php 8 Feb 2004 22:37:03 -0000 1.54 *************** *** 101,121 **** $lang['l_cal_file'] = 'Calendar File'; $lang['l_php_error'] = 'PHP Error'; ! $upload_error_gen_lang = 'There was a problem with your upload.'; ! $upload_error_lang[0] = 'There was a problem with your upload.'; ! $upload_error_lang[1] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[2] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[3] = 'The file you are trying upload was only partially uploaded.'; ! $upload_error_lang[4] = 'You must select a file for upload.'; ! $upload_error_type_lang = 'Only .ics files may be uploaded.'; ! $copy_error_lang = 'Failed to copy file'; ! $delete_error_lang = 'Failed to delete file'; ! $delete_success_lang = 'was deleted successfully.'; ! $action_success_lang = 'Your action was successful.'; ! $submit_lang = 'Submit'; ! $delete_lang = 'Delete'; $all_cal_comb_lang = 'All calendars combined'; // New for 2.0 ! $lang['l_legend'] = 'Legend'; // - navigation --- 101,123 ---- $lang['l_cal_file'] = 'Calendar File'; $lang['l_php_error'] = 'PHP Error'; ! $upload_error_gen_lang = 'There was a problem with your upload.'; ! $upload_error_lang[0] = 'There was a problem with your upload.'; ! $upload_error_lang[1] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[2] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[3] = 'The file you are trying upload was only partially uploaded.'; ! $upload_error_lang[4] = 'You must select a file for upload.'; ! $lang['l_upload_error_type'] = 'Only .ics files may be uploaded.'; ! $lang['l_copy_error'] = 'Failed to copy file'; ! $lang['l_delete_error'] = 'Failed to delete file'; ! $lang['l_delete_success'] = 'was deleted successfully.'; ! $lang['l_action_success'] = 'Your action was successful.'; ! $lang['l_submit'] = 'Submit'; ! $lang['l_delete'] = 'Delete'; $all_cal_comb_lang = 'All calendars combined'; // New for 2.0 ! $lang['l_legend'] = 'Legend'; ! $lang['l_admin_subhead'] = 'Manage your calendars from this page'; ! $lang['l_prefs_subhead'] = 'Sets a cookie for visiting this site'; // - navigation |
|
From: <cl...@us...> - 2004-02-08 22:40:10
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31637 Modified Files: admin.php config.inc.php Log Message: Tweeks of admin initial wiring of template. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin.php 26 Nov 2003 01:42:40 -0000 1.10 --- admin.php 8 Feb 2004 22:37:03 -0000 1.11 *************** *** 3,8 **** define('BASE', './'); ! include (BASE.'functions/init.inc.php'); ! include (BASE.'functions/admin_functions.php'); // Redirect if administration is not allowed --- 3,10 ---- define('BASE', './'); ! require_once(BASE.'functions/init.inc.php'); ! require_once(BASE.'functions/admin_functions.php'); ! require_once(BASE.'functions/list_functions.php'); ! require_once(BASE.'functions/template.php'); // Redirect if administration is not allowed *************** *** 42,281 **** } ! $calendar_name = $admin_header_lang; ! include (BASE.'includes/header.inc.php'); ! ! ?> ! <center> ! <table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder"> ! <tr> ! <td align="center" valign="middle"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="120" class="navback"><?php echo '<a href="'.BASE.'"><img src="'.BASE.'styles/'.$style_sheet.'/back.gif" alt=" " border="0" align="left"></a>'; ?></td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td> ! </tr> ! </table> ! </td> ! <td align="right" width="120" class="navback"> ! <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td><?php echo '<a class="psf" href="'.BASE.'day.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/day_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'week.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/week_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'month.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/month_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'year.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/year_on.gif" alt=" " border="0"></a></td>'; ?> ! </tr> ! </table> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> ! </tr> ! <tr> ! <td class="G10" align="right"><?php if ($auth_method != "none" && $is_loged_in == TRUE) { echo "<a href=\"{$HTTP_SERVER_VARS['PHP_SELF']}?action=logout\">{$logout_lang}</a>"; } ?> </td> ! </tr> ! <tr> ! <td> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> ! <tr> ! <td width="2%"></td> ! <td width="98%" valign="top" align="left"> ! <?php ! ! ! ! // If User is Not Logged In, Display The Login Page ! if ($is_loged_in == FALSE) { ! if (isset($username) && $username !='') { ! $login_error = "<font color=\"red\">$invalid_login_lang</font>"; ! } else { ! $login_error = ''; ! } ! ! echo <<<EOT ! <form action="{$HTTP_SERVER_VARS['PHP_SELF']}" method="post"> ! <table cellspacing="0" cellpadding="0"> ! <tr> ! <td nowrap>{$username_lang}: </td> ! <td align="left"><input type="text" name="username"></td> ! </tr> ! <tr> ! <td>{$password_lang}: </td> ! <td align="left"><input type="password" name="password"></td> ! </tr> ! <tr> ! <td> </td> ! <td align="left"><input type="submit" value="{$login_lang}"></td> ! </tr> ! <tr> ! <td align="center" colspan="3">{$login_error} </td> ! </tr> ! </table> ! </form> ! EOT; ! ! ! echo " ! </td> ! </tr> ! </table> ! </td> ! </tr> ! </table>"; ! ! include (BASE.'includes/footer.inc.php'); ! ! echo " ! </center> ! </body> ! </html>"; ! ! die(); ! } ! ! ! // The user is logged in if we get here ! ! ! ! // Add or Update a calendar ! $addupdate_msg = ''; ! $delete_msg = ''; ! if ((isset($action)) && ($action == "addupdate")) { ! $addupdate_msg = ""; ! ! for($filenumber=1; $filenumber<6; $filenumber++) { ! $file = $HTTP_POST_FILES['calfile']; ! $addupdate_success = FALSE; ! if (!is_uploaded_file_v4($file['tmp_name'][$filenumber])) { ! $upload_error = get_upload_error($file['error'][$filenumber]); ! } ! elseif (!is_uploaded_ics($file['name'][$filenumber])) { ! $upload_error = $upload_error_type_lang; ! } ! elseif (!copy_cal($file['tmp_name'][$filenumber], $file['name'][$filenumber])) { ! $upload_error = $copy_error_lang . " " . $file['tmp_name'][$filenumber] . " - " . $calendar_path . "/" . $file['name'][$filenumber]; ! } ! else { ! $addupdate_success = TRUE; ! } ! ! if ($addupdate_success) ! $addupdate_msg = $addupdate_msg . "<font color=\"green\">{$cal_file_lang} {$filenumber}: {$action_success_lang}</font><br>"; ! else ! $addupdate_msg = $addupdate_msg . "<font color=\"red\">{$cal_file_lang} {$filenumber}: {$upload_error}</font><br>"; ! } ! } ! // Delete a calendar ! // Not at all secure - need to strip out path info if used by users besides admin in the future ! if ($action == "delete") { ! $delete_msg = ""; ! foreach ($delete_calendar as $filename) { ! if (!delete_cal(urldecode($filename))) { ! $delete_msg = $delete_msg . "<font color=\"red\">" . $delete_error_lang . " " . urldecode(substr($filename,0,-4)) . "</font><br>"; ! } ! else { ! $delete_msg = $delete_msg . "<font color=\"green\">" . urldecode(substr($filename,0,-4)) . " " . $delete_success_lang . "</font><br>"; ! } ! } ! } ?> - <h2><?php echo $addupdate_cal_lang; ?></h2> - <p><?php echo $addupdate_desc_lang; ?></p> - <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post" enctype="multipart/form-data"> - <input type="hidden" name="action" value="addupdate"> - <table border="0" cellspacing="0"> - <tr> - <td nowrap><?php echo $cal_file_lang; ?> 1: </td> - <td><input type="file" name="calfile[1]"></td> - </tr> - <tr> - <td nowrap><?php echo $cal_file_lang; ?> 2: </td> - <td><input type="file" name="calfile[2]"></td> - </tr> - <tr> - <td nowrap><?php echo $cal_file_lang; ?> 3: </td> - <td><input type="file" name="calfile[3]"></td> - </tr> - <tr> - <td nowrap><?php echo $cal_file_lang; ?> 4: </td> - <td><input type="file" name="calfile[4]"></td> - </tr> - <tr> - <td nowrap><?php echo $cal_file_lang; ?> 5: </td> - <td><input type="file" name="calfile[5]"></td> - </tr> - <tr> - <td> </td> - <td><input type="submit" value="<?php echo $submit_lang; ?>"></td> - </tr> - <tr> - <td align="center" colspan="2"><?php echo $addupdate_msg; ?> </td> - </tr> - </table> - </form> - - <h2><?php echo $delete_cal_lang; ?></h2> - <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post"> - <input type="hidden" name="action" value="delete"> - <table border="0" cellspacing="0"> - <?php - - // Print Calendar Checkboxes - // - $COLUMNS_TO_PRINT = 3; - $column = 1; - $filelist = availableCalendarNames('', '', '', true); - foreach ($filelist as $file) { - if ($column > $COLUMNS_TO_PRINT) { - echo "</tr>"; - $column = 1; - } - if ($column == 1) { - echo "<tr>"; - } - - $cal_filename_tmp = substr($file,0,-4); - $cal_tmp = urlencode($file); - $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); - - echo "<td align=\"left\"><input name=\"delete_calendar[]\" value=\"$cal_tmp\" type=\"checkbox\">$cal_displayname_tmp</td>\n"; - - $column++; - } - // Print remaining empty columns if necessary - $number_of_columns = count($filelist); - while (gettype($number_of_columns/$COLUMNS_TO_PRINT) != "integer") { - echo "<td> </td>"; - $number_of_columns++; - } - ?> - </tr> - </table> - <p><input type="submit" value="<?php echo $delete_lang; ?>"></p> - <p><?php echo $delete_msg; ?> </p> - </form> - - </td> - </tr> - </table> - </td> - </tr> - </table> - </center> - - <?php include (BASE.'includes/footer.inc.php'); ?> - --- 44,75 ---- } ! $calendar_name = $lang['l_admin_header']; ! $page = new Page(BASE.'templates/'.$template.'/admin.tpl'); ! $page->replace_tags(array( ! 'header' => BASE.'templates/'.$template.'/header.tpl', ! 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', ! 'event_js' => BASE.'functions/event.js', ! 'template' => $template, ! 'cal' => $cal, ! 'getdate' => $getdate, ! 'calendar_name' => $calendar_name, ! 'display_date' => $display_date, ! 'current_view' => $current_view, ! 'sidebar_date' => $sidebar_date, ! 'rss_powered' => $rss_powered, ! 'rss_available' => '', ! 'rss_valid' => '', ! 'todo_js' => '', ! 'show_search' => '' ! )); ! $page->output(); ?> Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** config.inc.php 4 Feb 2004 22:39:45 -0000 1.139 --- config.inc.php 8 Feb 2004 22:37:03 -0000 1.140 *************** *** 50,54 **** // Administration settings ! $allow_admin = 'no'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method $auth_method = 'ftp'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic. $auth_internal_username = 'admin'; // Only used if $auth_method='internal'. The username for the administrator. --- 50,54 ---- // Administration settings ! $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method $auth_method = 'ftp'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic. $auth_internal_username = 'admin'; // Only used if $auth_method='internal'. The username for the administrator. |
|
From: <cl...@us...> - 2004-02-08 08:13:38
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894/functions Modified Files: template.php Log Message: Continued work on week.tpl. Allday is now wired. Replaced all ereg's on tempate with preg to increase template speed. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** template.php 8 Feb 2004 00:43:14 -0000 1.26 --- template.php 8 Feb 2004 08:10:30 -0000 1.27 *************** *** 13,19 **** $dayofmonth = strtotime ($key); $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); - echo "<tr><td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n"; - echo "<td align=\"left\" colspan=\"2\"><font class=\"V12\"><b>$dayofmonth</b></font></td></tr>"; - echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n"; // Pull out each day --- 13,16 ---- *************** *** 52,57 **** } function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day; // Replaces the allday events --- 49,127 ---- } + function draw_week($template_p) { + global $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view; + + for ($i=0; $i<7; $i++) { + $thisdate = date ('Ymd', $start_week_time); + $weekarray[$i] = $thisdate; + $start_week_time = strtotime('+1 day', $start_week_time); + } + + // Replaces the allday events + preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!is", $this->page, $match1); + preg_match("!<\!-- loop alldaysofweek on -->(.*)<\!-- loop allday on -->!is", $this->page, $match2); + preg_match("!<\!-- loop allday off -->(.*)<\!-- loop alldaysofweek off -->!is", $this->page, $match3); + $loop_ad = trim($match1[1]); + $loop_begin = trim($match2[1]); + $loop_end = trim($match3[1]); + foreach ($weekarray as $key => $get_date) { + $replace = $loop_begin; + if (is_array($master_array[$get_date]['-1'])) { + foreach ($master_array[$get_date]['-1'] as $allday) { + $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; + $event = openevent($event_calna, '', '', $allday, 1, 11, '<span class="V9W">', '</span>', 'psf', $event_url); + $loop_tmp = str_replace('{EVENT}', $event, $loop_ad); + $loop_tmp = str_replace('{CALNO}', $event_calno, $loop_tmp); + $replace .= $loop_tmp; + } + } + $replace .= $loop_end; + $weekreplace .= $replace; + } + $this->page = preg_replace('!<\!-- loop alldaysofweek on -->(.*)<\!-- loop alldaysofweek off -->!is', $weekreplace, $this->page); + + // Replaces the daysofweek + preg_match("!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!is", $this->page, $match1); + $loop_dof = trim($match1[1]); + $start_wt = strtotime(dateOfWeek($getdate, $week_start_day)); + $start_day = strtotime($week_start_day); + for ($i=0; $i<7; $i++) { + $day_num = date("w", $start_day); + $daylink = date('Ymd', $start_wt); + if ($current_view == 'day') { + $weekday = $daysofweek_lang[$day_num]; + } else { + $weekday = localizeDate($dateFormat_week_list, strtotime($daylink)); + } + + if ($daylink == $getdate) { + $row1 = 'rowToday'; + $row2 = 'rowOn'; + $row3 = 'rowToday'; + } else { + $row1 = 'rowOff'; + $row2 = 'rowOn'; + $row3 = 'rowOff'; + } + $start_day = strtotime("+1 day", $start_day); + $start_wt = strtotime("+1 day", $start_wt); + $loop_tmp = str_replace('{DAY}', $weekday, $loop_dof); + $loop_tmp = str_replace('{DAYLINK}', $daylink, $loop_tmp); + $loop_tmp = str_replace('{ROW1}', $row1, $loop_tmp); + $loop_tmp = str_replace('{ROW2}', $row2, $loop_tmp); + $loop_tmp = str_replace('{ROW3}', $row3, $loop_tmp); + $weekday_loop .= $loop_tmp; + } + $this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!is', $weekday_loop, $this->page); + + + } + function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view; // Replaces the allday events *************** *** 72,76 **** } } ! $this->page = ereg_replace('<!-- loop allday on -->(.*)<!-- loop allday off -->', $replace, $this->page); // Replaces the daysofweek --- 142,146 ---- } } ! $this->page = preg_replace('!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!is', $replace, $this->page); // Replaces the daysofweek *************** *** 81,86 **** for ($i=0; $i<7; $i++) { $day_num = date("w", $start_day); - $weekday = $daysofweek_lang[$day_num]; $daylink = date('Ymd', $start_wt); if ($daylink == $getdate) { $row1 = 'rowToday'; --- 151,160 ---- for ($i=0; $i<7; $i++) { $day_num = date("w", $start_day); $daylink = date('Ymd', $start_wt); + if ($current_view == 'day') { + $weekday = $daysofweek_lang[$day_num]; + } else { + $weekday = localizeDate($dateFormat_week_list, strtotime($daylink)); + } if ($daylink == $getdate) { $row1 = 'rowToday'; *************** *** 101,105 **** $weekday_loop .= $loop_tmp; } ! $this->page = ereg_replace('<!-- loop daysofweek on -->(.*)<!-- loop daysofweek off -->', $weekday_loop, $this->page); } --- 175,179 ---- $weekday_loop .= $loop_tmp; } ! $this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!is', $weekday_loop, $this->page); } *************** *** 140,149 **** } ! $this->page = ereg_replace('<!-- switch t_allday on -->(.*)<!-- switch t_allday off -->', $replace_ad, $this->page); ! $this->page = ereg_replace('<!-- switch t_event on -->(.*)<!-- switch t_event off -->', $replace_e, $this->page); } else { ! $this->page = ereg_replace('<!-- switch tomorrows_events on -->(.*)<!-- switch tomorrows_events off -->', '', $this->page); } --- 214,223 ---- } ! $this->page = preg_replace('!<\!-- switch t_allday on -->(.*)<\!-- switch t_allday off -->!is', $replace_ad, $this->page); ! $this->page = preg_replace('!<\!-- switch t_event on -->(.*)<\!-- switch t_event off -->!is', $replace_e, $this->page); } else { ! $this->page = preg_replace('!<\!-- switch tomorrows_events on -->(.*)<\!-- switch tomorrows_events off -->!is', '', $this->page); } *************** *** 204,208 **** } } ! $this->page = ereg_replace('<!-- switch show_completed on -->(.*)<!-- switch show_normal off -->', $nugget2, $this->page); } } --- 278,282 ---- } } ! $this->page = preg_replace('!<\!-- switch show_completed on -->(.*)<\!-- switch show_normal off -->!is', $nugget2, $this->page); } } *************** *** 329,333 **** $return = preg_replace('!<\!-- loop weekday on -->(.*)<\!-- loop weekday off -->!is', $weekday_loop, $template_p); ! $return = ereg_replace('<!-- loop monthweeks on -->(.*)<!-- loop monthweeks off -->', $middle, $return); $return = str_replace('{MONTH_TITLE}', $month_title, $return); $return = str_replace('{CAL}', $cal, $return); --- 403,407 ---- $return = preg_replace('!<\!-- loop weekday on -->(.*)<\!-- loop weekday off -->!is', $weekday_loop, $template_p); ! $return = preg_replace('!<\!-- loop monthweeks on -->(.*)<\!-- loop monthweeks off -->!is', $middle, $return); $return = str_replace('{MONTH_TITLE}', $month_title, $return); $return = str_replace('{CAL}', $cal, $return); *************** *** 386,390 **** } while ($this_month == $check_month); ! $this->page = ereg_replace('<!-- loop showbottomevents_odd on -->(.*)<!-- loop showbottomevents_even off -->', $middle, $this->page); } --- 460,464 ---- } while ($this_month == $check_month); ! $this->page = preg_replace('!<\!-- loop showbottomevents_odd on -->(.*)<\!-- loop showbottomevents_even off -->!is', $middle, $this->page); } *************** *** 414,418 **** // This removes any unfilled tags if (!$data) { ! $this->page = ereg_replace('<!-- switch ' . $tag . ' on -->(.*)<!-- switch ' . $tag . ' off -->', '', $this->page); } --- 488,492 ---- // This removes any unfilled tags if (!$data) { ! $this->page = preg_replace('!<\!-- switch ' . $tag . ' on -->(.*)<\!-- switch ' . $tag . ' off -->!is', '', $this->page); } |
|
From: <cl...@us...> - 2004-02-08 08:13:38
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894/templates/default Modified Files: day.tpl default.css week.tpl Log Message: Continued work on week.tpl. Allday is now wired. Replaced all ereg's on tempate with preg to increase template speed. Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** day.tpl 6 Feb 2004 18:26:51 -0000 1.10 --- day.tpl 8 Feb 2004 08:10:30 -0000 1.11 *************** *** 25,31 **** <tr> <td colspan="2"> ! <table width="100%" border="0" cellspacing="1" cellpadding="2"> <tr> ! <td align="left" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&getdate={PREV_DAY}'"> <span class="V12"><a class="psf" href="day.php?cal={CAL}&getdate={PREV_DAY}">«</a></span> </td> --- 25,31 ---- <tr> <td colspan="2"> ! <table width="100%" border="0" cellspacing="0" cellpadding="2"> <tr> ! <td align="left" valign="top" width="20" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='day.php?cal={CAL}&getdate={PREV_DAY}'"> <span class="V12"><a class="psf" href="day.php?cal={CAL}&getdate={PREV_DAY}">«</a></span> </td> Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** default.css 6 Feb 2004 18:26:52 -0000 1.10 --- default.css 8 Feb 2004 08:10:30 -0000 1.11 *************** *** 16,22 **** .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} ! .rowOn { background-color: #cfc; } ! .rowOff { background-color: #E1E8F1; } ! .rowToday { background-color: #cff; } --- 16,24 ---- .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} ! .rowOn { background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; } ! .rowOn2 { background-color: #cfc; border-top: 1px solid #fff; } ! .rowOff { background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; } ! .rowOff2 { background-color: #E1E8F1; border-top: 1px solid #fff; border-left: } ! .rowToday { background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; } *************** *** 93,97 **** a.ps3:visited { color: #000000; background-color: transparent; } a.ps3:active { color: #000000; background-color: transparent; } ! a.ps3:hover { color: #000000; background-color: transparent; text-decoration: underline;} /* Body attributes */ --- 95,99 ---- a.ps3:visited { color: #000000; background-color: transparent; } a.ps3:active { color: #000000; background-color: transparent; } ! a.ps3:hover { color: #000000; background-color: transparent; } /* Body attributes */ Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** week.tpl 8 Feb 2004 00:43:14 -0000 1.4 --- week.tpl 8 Feb 2004 08:10:30 -0000 1.5 *************** *** 31,55 **** <tr> <td align="center" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="2"> <tr> ! <td align="left" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={PREV_WEEKK}'"> ! <span class="V12"> <a class="psf" href="week.php?cal={CAL}&getdate={PREV_WEEK}">«</a></span> </td> ! <td align="right" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={NEXT_WEEK}'"> ! <span class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={NEXT_WEEK}">»</a> </span> </td> <!-- loop daysofweek on --> ! <td width="80" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&getdate={DAYLINK}'"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}"><span class="V9">{DAY}</span></a> </td> <!-- loop daysofweek off --> </tr> ! <tr> ! <td width="60" class="rowOff" colspan="2"> <!-- loop alldaysofweek on --> ! <td> <!-- loop allday on --> <div class="alldaybg_{CALNO}"> ! {EVENT} </div> <!-- loop allday off --> --- 31,61 ---- <tr> <td align="center" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="left" valign="top" width="15" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='week.php?cal={CAL}&getdate={PREV_WEEK}'"> ! <div class="V12"> <a class="psf" href="week.php?cal={CAL}&getdate={PREV_WEEK}">«</a></div> </td> ! <td align="left" valign="top" width="15" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={PREV_DAY}'"> ! <div class="V12"> <a class="psf" href="week.php?cal={CAL}&getdate={PREV_DAY}">‹</a></div> ! </td> ! <td align="right" valign="top" width="15" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={NEXT_DAY}'"> ! <div class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={NEXT_DAY}">›</a> </div> ! </td> ! <td align="right" valign="top" width="15" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={NEXT_WEEK}'"> ! <div class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={NEXT_WEEK}">»</a> </div> </td> <!-- loop daysofweek on --> ! <td width="80" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='week.php?cal={CAL}&getdate={DAYLINK}'"> ! <a class="ps3" href="week.php?cal={CAL}&getdate={DAYLINK}"><span class="V9BOLD">{DAY}</span></a> </td> <!-- loop daysofweek off --> </tr> ! <tr valign="top"> ! <td width="60" class="rowOff2" colspan="4"> <!-- loop alldaysofweek on --> ! <td width="80" class="rowOff"> <!-- loop allday on --> <div class="alldaybg_{CALNO}"> ! <b>{EVENT}</b> </div> <!-- loop allday off --> *************** *** 58,152 **** </tr> <tr> ! <td rowspan="4" align="center" valign="top" width="60" class="timeborder" colspan="2"> 8:00 AM </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> </tr> <tr> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> </tr> <tr> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> </tr> <tr> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> ! <td bgcolor="#ffffff" colspan="1" class="weekborder"> </td> --- 64,158 ---- </tr> <tr> ! <td colspan="4" rowspan="4" align="center" valign="top" width="60" class="timeborder"> 8:00 AM </td> ! <td width="80" colspan="1" class="weekborder"> </td> ! <td width="80" colspan="1" class="weekborder"> </td> ! <td width="80" colspan="1" class="weekborder"> </td> ! <td width="80" colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> </tr> <tr> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> </tr> <tr> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> </tr> <tr> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> ! <td width="80"colspan="1" class="weekborder"> </td> |
|
From: <cl...@us...> - 2004-02-08 08:13:38
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894 Modified Files: week.php Log Message: Continued work on week.tpl. Allday is now wired. Replaced all ereg's on tempate with preg to increase template speed. Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** week.php 8 Feb 2004 00:43:13 -0000 1.107 --- week.php 8 Feb 2004 08:10:28 -0000 1.108 *************** *** 71,75 **** )); ! $page->draw_day($this->page); $page->tomorrows_events($this->page); $page->get_vtodo($this->page); --- 71,75 ---- )); ! $page->draw_week($this->page); $page->tomorrows_events($this->page); $page->get_vtodo($this->page); |
|
From: <cl...@us...> - 2004-02-08 01:12:58
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19812/templates/default Modified Files: preferences.tpl Log Message: Tweeks. Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** preferences.tpl 8 Feb 2004 00:43:14 -0000 1.6 --- preferences.tpl 8 Feb 2004 01:10:00 -0000 1.7 *************** *** 1,20 **** {HEADER} <center> ! <table border="0" width="650" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="120" class="navback"><a href="{BACK_PAGE}"><img src="templates/{TEMPLATE}/images/back.gif" alt="{L_BACK}" border="0" align="left" /></a></td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20">{L_PREFERENCES}</font></td> ! </tr> ! </table> ! </td> ! <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr> <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> --- 1,14 ---- {HEADER} <center> ! <table border="0" width="520" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_PREFERENCES}</span><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td> ! <td valign="top" align="right" width="120" class="navback"> ! <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr valign="top"> <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> *************** *** 23,37 **** </tr> </table> </td> ! </tr> </table> </td> </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> </tr> <tr> <td> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> <!-- switch message on --> <tr> --- 17,32 ---- </tr> </table> + </div> </td> ! </tr> </table> </td> </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="1" alt=" " /></td> </tr> <tr> <td> ! <table width="100%" border="0" cellspacing="0" cellpadding="5"> <!-- switch message on --> <tr> *************** *** 40,94 **** <!-- switch message off --> <tr> ! <td width="2%"></td> ! <td width="98%" valign="top" align="left"> <form action="preferences.php?action=setcookie" METHOD="post"> ! <table border="0" width="620" cellspacing="2" cellpadding="2" align="center"> ! <tr> ! <td align="left" valign="top" width="300" nowrap>{L_SELECT_LANG}</td> ! <td align="left" valign="top" width="20"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><select name="cookie_language" class="query_style">{LANGUAGE_SELECT}</select></td> </tr> ! <tr> ! <td align="left" valign="top" width="300" nowrap>{L_SELECT_CAL}</td> ! <td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select></td> </tr> ! <tr> ! <td align="left" valign="top" width="300" nowrap>{L_SELECT_VIEW}</td> ! <td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><select name="cookie_view" class="query_style">{VIEW_SELECT}</select></td> </tr> ! <tr> ! <td align="left" valign="top" width="300" nowrap>{L_SELECT_TIME}</td> ! <td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><select name="cookie_time" class="query_style">{TIME_SELECT}</select></td> </tr> ! <tr> ! <td align="left" valign="top" width="300" nowrap>{L_SELECT_DAY}</td> ! <td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><select name="cookie_startday" class="query_style">{STARTDAY_SELECT}</select></td> </tr> ! <tr> ! <td align="left" valign="top" width="300" nowrap>{L_SELECT_STYLE}</td> ! <td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><select name="cookie_style" class="query_style">{STYLE_SELECT}</select></td> </tr> <!-- switch cookie_already_set on --> ! <tr> ! <td align="left" valign="top" nowrap>{L_UNSET_PREFS}</td> ! <td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><INPUT TYPE="checkbox" NAME="unset" VALUE="true"></td> </tr> <!-- switch cookie_already_set off --> <!-- switch cookie_not_set on --> ! <tr> ! <td align="left" valign="top" nowrap> </td> ! <td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td align="left" valign="top"><input type="submit" name="set" value="{L_SET_PREFS}" /></td> </tr> <!-- switch cookie_not_set off --> </table> </form> - <br> </td> </tr> --- 35,87 ---- <!-- switch message off --> <tr> ! <td valign="top" align="left"> <form action="preferences.php?action=setcookie" METHOD="post"> ! <table border="0" width="100%" cellspacing="2" cellpadding="2" align="center"> ! <tr align="left" valign="top"> ! <td width="80%" nowrap>{L_SELECT_LANG}:</td> ! <td width="10%"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td width="10%"><select name="cookie_language" class="query_style">{LANGUAGE_SELECT}</select></td> </tr> ! <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_CAL}:</td> ! <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select></td> </tr> ! <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_VIEW}:</td> ! <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><select name="cookie_view" class="query_style">{VIEW_SELECT}</select></td> </tr> ! <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_TIME}:</td> ! <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><select name="cookie_time" class="query_style">{TIME_SELECT}</select></td> </tr> ! <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_DAY}:</td> ! <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><select name="cookie_startday" class="query_style">{STARTDAY_SELECT}</select></td> </tr> ! <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_STYLE}:</td> ! <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><select name="cookie_style" class="query_style">{STYLE_SELECT}</select></td> </tr> <!-- switch cookie_already_set on --> ! <tr align="left" valign="top"> ! <td nowrap>{L_UNSET_PREFS}:</td> ! <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><INPUT TYPE="checkbox" NAME="unset" VALUE="true"></td> </tr> <!-- switch cookie_already_set off --> <!-- switch cookie_not_set on --> ! <tr align="left" valign="top"> ! <td nowrap> </td> ! <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><input type="submit" name="set" value="{L_SET_PREFS}" /></td> </tr> <!-- switch cookie_not_set off --> </table> </form> </td> </tr> *************** *** 97,101 **** </tr> </table> ! <table width="650" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> --- 90,94 ---- </tr> </table> ! <table width="520" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> |
|
From: <cl...@us...> - 2004-02-08 00:46:12
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15538/templates/default Modified Files: preferences.tpl print.tpl week.tpl Log Message: Placed print template in place, started wiring print.php Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** preferences.tpl 5 Feb 2004 07:06:11 -0000 1.5 --- preferences.tpl 8 Feb 2004 00:43:14 -0000 1.6 *************** *** 97,100 **** --- 97,107 ---- </tr> </table> + <table width="650" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> </center> Index: print.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/print.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** print.tpl 28 Jan 2004 19:10:26 -0000 1.1 --- print.tpl 8 Feb 2004 00:43:14 -0000 1.2 *************** *** 1,29 **** <center> ! <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="90" class="navback"><a href="{PRINTVIEW}.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/back.gif" alt="{L_BACK}" border="0" align="left"></a>'; ?></td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="right" width="40%" class="navback"><a class="psf" href="print.php?cal={CAL}&getdate={PREV}&printview={PRINTVIEW}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right"></a></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20">{display_date}</font></td> ! <td align="left" width="40%" class="navback"><a class="psf" href="print.php?cal={CAL}&getdate={NEXT}&printview={PRINTVIEW}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left"></a></td> ! </tr> ! </table> ! </td> ! <td align="right" width="90" class="navback"> ! <table width="90" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0"></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0"></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0"></a></td> </tr> </table> </td> ! </tr> ! </table> </td> </tr> --- 1,23 ---- + {HEADER} <center> ! <table border="0" width="650" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{DISPLAY_DATE}</span><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td> ! <td valign="top" align="right" width="120" class="navback"> ! <div style="padding-top: 3px;"> ! <table width="90" border="0" cellpadding="0" cellspacing="0"> ! <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> </tr> </table> + </div> </td> ! </tr> ! </table> </td> </tr> *************** *** 33,90 **** <tr> <td colspan="3"> ! <table border="0" cellspacing="0" cellpadding="0" width="100%"> ! <tr> ! <td align="center" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td colspan="3" height="1"></td> ! </tr> ! <tr> ! <td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td> ! <td align="left" colspan="2"><font class="V12"><b>{DAYOFMONTH}</b></font></td> ! </tr> ! <tr> ! <td colspan="3"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> ! </tr> ! ! <!-- loop events on --> ! <tr> ! <td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td> ! <td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td> ! <td align="left"> ! <table width="100%" border="0" cellspacing="1" cellpadding="1"> ! <tr> ! <td width="100" class="G10BOLD">{L_TIME}:</td> ! <td align="left" class="G10B">{EVENT_START}</td> ! </tr> ! <tr> ! <td valign="top" width="100" class="G10BOLD">{L_SUMMARY}:</td> ! <td valign="top" align="left" class="G10B">{EVENT_TEXT}</td> ! </tr> ! <!-- switch description_events on --> ! <tr> ! <td valign="top" width="100" class="G10BOLD">{L_DESCRIPTION}:</td> ! <td valign="top" align="left" class="G10B">{DESCRIPTION}</td> ! </tr> ! <!-- switch description_events off --> ! </table> ! </td> ! </tr> <tr> ! <td colspan="3"><img src="images/spacer.gif" width="1" height="10" alt=" "></td> </tr> - <!-- loop events off --> - - <!-- switch no_events on --> <tr> ! <td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td> ! <td align="left" colspan="2"><font class="V12"><br><center><b>{L_ZERO_EVENTS}</b></center></font><br></td> </tr> <tr> ! <td colspan="3"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> </tr> ! <!-- switch no_events off --> ! ! </table> </td> </tr> --- 27,58 ---- <tr> <td colspan="3"> ! <table border="0" cellspacing="0" cellpadding="5" width="100%"> ! <tr> ! <td align="left" valign="top"> ! <div class="V12"><b>{DAYOFMONTH}</b></div> ! <!-- loop events on --> ! <div style="padding: 6px;"> ! <table width="100%" border="0" cellspacing="1" cellpadding="1"> <tr> ! <td width="100" class="G10BOLD">{L_TIME}:</td> ! <td align="left" class="G10B">{EVENT_START}</td> </tr> <tr> ! <td valign="top" width="100" class="G10BOLD">{L_SUMMARY}:</td> ! <td valign="top" align="left" class="G10B">{EVENT_TEXT}</td> </tr> + <!-- switch description_events on --> <tr> ! <td valign="top" width="100" class="G10BOLD">{L_DESCRIPTION}:</td> ! <td valign="top" align="left" class="G10B">{DESCRIPTION}</td> </tr> ! <!-- switch description_events off --> ! </table> ! </div> ! <!-- loop events off --> ! ! <!-- switch no_events on --> ! <div class="V12"><b>{L_ZERO_EVENTS}</b></div> ! <!-- switch no_events off --> </td> </tr> *************** *** 93,94 **** --- 61,70 ---- </tr> </table> + <table width="650" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> + {FOOTER} \ No newline at end of file Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** week.tpl 7 Feb 2004 22:55:14 -0000 1.3 --- week.tpl 8 Feb 2004 00:43:14 -0000 1.4 *************** *** 34,41 **** <tr> <td align="left" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={PREV_WEEKK}'"> ! <span class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={PREV_WEEK}">«</a></span> </td> <td align="right" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={NEXT_WEEK}'"> ! <span class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={NEXT_WEEK}">»</a></span> </td> <!-- loop daysofweek on --> --- 34,41 ---- <tr> <td align="left" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={PREV_WEEKK}'"> ! <span class="V12"> <a class="psf" href="week.php?cal={CAL}&getdate={PREV_WEEK}">«</a></span> </td> <td align="right" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&getdate={NEXT_WEEK}'"> ! <span class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={NEXT_WEEK}">»</a> </span> </td> <!-- loop daysofweek on --> *************** *** 46,49 **** --- 46,61 ---- </tr> <tr> + <td width="60" class="rowOff" colspan="2"> + <!-- loop alldaysofweek on --> + <td> + <!-- loop allday on --> + <div class="alldaybg_{CALNO}"> + {EVENT} + </div> + <!-- loop allday off --> + </td> + <!-- loop alldaysofweek off --> + </tr> + <tr> <td rowspan="4" align="center" valign="top" width="60" class="timeborder" colspan="2"> 8:00 AM *************** *** 147,150 **** --- 159,169 ---- </tr> </table> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> </td> <td width="10"> |
