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-02-08 00:46:12
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15538/functions Modified Files: template.php Log Message: Placed print template in place, started wiring print.php Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** template.php 6 Feb 2004 18:26:49 -0000 1.25 --- template.php 8 Feb 2004 00:43:14 -0000 1.26 *************** *** 5,8 **** --- 5,55 ---- class Page { var $page; + function draw_print($template_p) { + global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day; + foreach($master_array as $key => $val) { + ereg ("([0-9]{6})([0-9]{2})", $key, $regs); + if ((($regs[1] == $parse_month) && ($printview == "month")) || (($key == $getdate) && ($printview == "day")) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == "week"))) { + $events_week++; + $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 + foreach ($val as $new_val) { + foreach ($new_val as $new_key2 => $new_val2) { + if ($new_val2["event_text"]) { + $event_text = stripslashes(urldecode($new_val2["event_text"])); + $description = stripslashes(urldecode($new_val2["description"])); + $event_start = $new_val2["event_start"]; + $event_end = $new_val2["event_end"]; + if (isset($new_val2["display_end"])) $event_end = $new_val2["display_end"]; + $event_start = date ($timeFormat, strtotime ("$event_start")); + $event_end = date ($timeFormat, strtotime ("$event_end")); + $event_start = "$event_start - $event_end"; + if (!$new_val2["event_start"]) { + $event_start = "$all_day_lang"; + $event_start2 = ''; + $event_end = ''; + } + + $middle = ''; + + if ($new_val2["description"]) { + $middle = ''; + } + $middle = ''; + } + } + } + } + } + + if ($events_week < 1) { + $middle = $no_events; + } + } + function draw_day($template_p) { global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day; |
|
From: <cl...@us...> - 2004-02-08 00:46:12
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15538 Modified Files: day.php print.php week.php Log Message: Placed print template in place, started wiring print.php Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** day.php 6 Feb 2004 05:49:05 -0000 1.109 --- day.php 8 Feb 2004 00:43:13 -0000 1.110 *************** *** 45,48 **** --- 45,49 ---- 'getdate' => $getdate, 'calendar_name' => $calendar_name, + 'current_view' => $current_view, 'display_date' => $display_date, 'sidebar_date' => $sidebar_date, Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** print.php 16 Nov 2003 07:02:37 -0000 1.20 --- print.php 8 Feb 2004 00:43:13 -0000 1.21 *************** *** 2,6 **** define('BASE', './'); ! include(BASE.'functions/ical_parser.php'); $cal_displayname2 = $calendar_name . " $calendar_lang"; if (strlen($cal_displayname2) > 24) { --- 2,8 ---- define('BASE', './'); ! require_once(BASE.'functions/ical_parser.php'); ! require_once(BASE.'functions/list_functions.php'); ! require_once(BASE.'functions/template.php'); $cal_displayname2 = $calendar_name . " $calendar_lang"; if (strlen($cal_displayname2) > 24) { *************** *** 48,171 **** } ! 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="90" class="navback"><?php echo '<a href="'.$printview.'.php?cal='.$cal.'&getdate='.$getdate.'"><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="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$prev&printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$print_prev_nav]\" border=\"0\" align=\"right\"></a>"; ?></td> - <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td> - <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$next&printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$print_next_nav]\" 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><?php echo '<a class="psf" href="print.php?cal='.$cal.'&getdate='.$getdate.'&printview=day"><img src="styles/'.$style_sheet.'/day_on.gif" alt="'.$day_lang.' View" border="0"></a></td>'; ?> - <td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&getdate='.$getdate.'&printview=week"><img src="styles/'.$style_sheet.'/week_on.gif" alt="'.$week_lang.' View" border="0"></a></td>'; ?> - <td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&getdate='.$getdate.'&printview=month"><img src="styles/'.$style_sheet.'/month_on.gif" alt="'.$month_lang.' View" border="0"></a></td>'; ?> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td colspan="3" class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> - </tr> - <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> - <?php - // Iterate the entire master array - foreach($master_array as $key => $val) { - - // Pull out only this months - ereg ("([0-9]{6})([0-9]{2})", $key, $regs); - if ((($regs[1] == $parse_month) && ($printview == "month")) || (($key == $getdate) && ($printview == "day")) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == "week"))) { - $events_week++; - $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 - foreach ($val as $new_val) { - - // Pull out each time - foreach ($new_val as $new_key2 => $new_val2) { - if ($new_val2["event_text"]) { - $event_text = stripslashes(urldecode($new_val2["event_text"])); - $description = stripslashes(urldecode($new_val2["description"])); - $event_start = $new_val2["event_start"]; - $event_end = $new_val2["event_end"]; - if (isset($new_val2["display_end"])) $event_end = $new_val2["display_end"]; - $event_start = date ($timeFormat, strtotime ("$event_start")); - $event_end = date ($timeFormat, strtotime ("$event_end")); - $event_start = "$event_start - $event_end"; - if (!$new_val2["event_start"]) { - $event_start = "$all_day_lang"; - $event_start2 = ''; - $event_end = ''; - } - echo "<tr>\n"; - echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n"; - echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n"; - echo "<td align=\"left\">\n"; - echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n"; - echo "<tr>\n"; - echo "<td width=\"100\" 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 ($new_val2["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 "</td>\n"; - echo "</tr>\n"; - echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"10\" alt=\" \"></td></tr>\n"; - } - } - } - } - } - - if ($events_week < 1) { - 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\"><br><center><b>$zero_events</b></center></font><br></td></tr>"; - echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n"; - } - - ?> - </table> - </td> - </tr> - </table> - </td> - </tr> - </table> - </center> - <?php include (BASE.'includes/footer.inc.php'); ?> --- 50,90 ---- } ! $page = new Page(BASE.'templates/'.$template.'/print.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, ! 'current_view' => $current_view, ! 'display_date' => $display_date, ! 'sidebar_date' => $sidebar_date, ! 'rss_powered' => $rss_powered, ! 'rss_available' => '', ! 'rss_valid' => '', ! 'todo_js' => '', ! 'show_search' => '', ! 'next_day' => $next_day, ! 'prev_day' => $prev_day, ! 'show_goto' => '', ! 'is_logged_in' => '', ! 'list_icals' => $list_icals, ! 'list_years' => $list_years, ! 'list_months' => $list_months, ! 'list_weeks' => $list_weeks, ! 'list_jumps' => $list_jumps, ! 'legend' => $list_calcolors, ! 'style_select' => $style_select ! )); ! ! $page->draw_day($this->page); ! $page->tomorrows_events($this->page); ! $page->get_vtodo($this->page); ! ! $page->output(); ?> Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** week.php 7 Feb 2004 22:55:10 -0000 1.106 --- week.php 8 Feb 2004 00:43:13 -0000 1.107 *************** *** 49,52 **** --- 49,53 ---- 'calendar_name' => $calendar_name, 'display_date' => $display_date, + 'current_view' => $current_view, 'sidebar_date' => $sidebar_date, 'rss_powered' => $rss_powered, |
|
From: <cl...@us...> - 2004-02-07 22:58:17
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28322 Modified Files: week.php Log Message: Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** week.php 5 Feb 2004 23:45:54 -0000 1.105 --- week.php 7 Feb 2004 22:55:10 -0000 1.106 *************** *** 14,19 **** $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); ! $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); ! $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); $end_week_time = $start_week_time + (6 * 25 * 60 * 60); --- 14,19 ---- $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); ! $next_day = date('Ymd', strtotime("+1 day", $unix_time)); ! $prev_day = date('Ymd', strtotime("-1 day", $unix_time)); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); $end_week_time = $start_week_time + (6 * 25 * 60 * 60); *************** *** 56,60 **** --- 56,62 ---- 'show_search' => '', 'next_day' => $next_day, + 'next_week' => $next_week, 'prev_day' => $prev_day, + 'prev_week' => $prev_week, 'show_goto' => '', 'is_logged_in' => '', *************** *** 69,72 **** --- 71,76 ---- $page->draw_day($this->page); + $page->tomorrows_events($this->page); + $page->get_vtodo($this->page); $page->output(); |
|
From: <cl...@us...> - 2004-02-07 22:58:11
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28322/templates/default Modified Files: week.tpl Log Message: Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** week.tpl 7 Feb 2004 21:04:49 -0000 1.2 --- week.tpl 7 Feb 2004 22:55:14 -0000 1.3 *************** *** 1,8 **** {HEADER} <center> ! <table border="0" width="720" cellspacing="0" cellpadding="0"> <tr> ! <td width="540" valign="top"> ! <table width="540" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td align="center" valign="middle"> --- 1,8 ---- {HEADER} [...1643 lines suppressed...] ! </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> ! </table> </td> </tr> --- 140,144 ---- </td> </tr> ! </table> </td> </tr> |
|
From: <cl...@us...> - 2004-02-07 21:07:48
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7441/templates/default Modified Files: month.tpl week.tpl Log Message: Updated tops of week and month.tpl to match day.tpl. Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** month.tpl 5 Feb 2004 07:06:11 -0000 1.10 --- month.tpl 7 Feb 2004 21:04:49 -0000 1.11 *************** *** 5,22 **** <td align="center" valign="middle" bgcolor="white"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="120" class="navback"> </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="month.php?cal={CAL}&getdate={PREV_MONTH}"><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="month.php?cal={CAL}&getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></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> --- 5,14 ---- <td align="center" valign="middle" bgcolor="white"> <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="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> *************** *** 25,30 **** </tr> </table> </td> ! </tr> </table> </td> --- 17,23 ---- </tr> </table> + </div> </td> ! </tr> </table> </td> Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** week.tpl 5 Feb 2004 06:34:56 -0000 1.1 --- week.tpl 7 Feb 2004 21:04:49 -0000 1.2 *************** *** 8,42 **** <td align="center" valign="middle"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="120" class="navback"> ! ! </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="week.php?cal=all_calendars_combined971&getdate=20040128"><img src="styles/silver/left_day.gif" alt="[Previous Week]" border="0" align="right"></a> ! </td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"> ! <font class="H20">February 1 - February 7</font> ! </td> ! <td align="left" width="40%" class="navback"> ! <a class="psf" href="week.php?cal=all_calendars_combined971&getdate=20040211"><img src="styles/silver/right_day.gif" alt="[Next Week]" border="0" align="left"></a> ! </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> --- 8,27 ---- <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">{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="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> |
|
From: <cl...@us...> - 2004-02-06 18:29:36
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7515/templates/default Modified Files: day.tpl default.css Log Message: Minor rollover tweek for colors and on state. Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** day.tpl 6 Feb 2004 00:47:54 -0000 1.9 --- day.tpl 6 Feb 2004 18:26:51 -0000 1.10 *************** *** 27,39 **** <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={DAYLINK}'"> <span class="V12"><a class="psf" href="day.php?cal={CAL}&getdate={PREV_DAY}">«</a></span> </td> <!-- loop daysofweek on --> ! <td width="14%" align="center" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&getdate={DAYLINK}'"> <span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></span> </td> <!-- loop daysofweek off --> ! <td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&getdate={DAYLINK}'"> <span class="V12"><a class="psf" href="day.php?cal={CAL}&getdate={NEXT_DAY}">»</a></span> </td> --- 27,39 ---- <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> <!-- loop daysofweek on --> ! <td width="14%" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&getdate={DAYLINK}'"> <span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></span> </td> <!-- loop daysofweek off --> ! <td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&getdate={NEXT_DAY}'"> <span class="V12"><a class="psf" href="day.php?cal={CAL}&getdate={NEXT_DAY}">»</a></span> </td> Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** default.css 5 Feb 2004 20:05:51 -0000 1.9 --- default.css 6 Feb 2004 18:26:52 -0000 1.10 *************** *** 16,22 **** .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} ! .rowOn { background-color: #DFF7F7; } .rowOff { background-color: #E1E8F1; } ! .rowLent { background-color: #DDDDDD; } --- 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; } |
|
From: <cl...@us...> - 2004-02-06 18:29:35
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7515/functions Modified Files: template.php Log Message: Minor rollover tweek for colors and on state. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** template.php 6 Feb 2004 05:49:05 -0000 1.24 --- template.php 6 Feb 2004 18:26:49 -0000 1.25 *************** *** 36,43 **** --- 36,55 ---- $weekday = $daysofweek_lang[$day_num]; $daylink = date('Ymd', $start_wt); + 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; } *************** *** 100,106 **** $important = trim($match2[1]); $normal = trim($match3[1]); - $comp_data = ''; - $impt_data = ''; - $norm_data = ''; if (is_array($master_array['-2'])) { --- 112,115 ---- |
|
From: <cl...@us...> - 2004-02-06 05:51:46
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11491/templates/default Modified Files: sidebar.tpl Log Message: Initial wiring of vtodo. Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sidebar.tpl 6 Feb 2004 04:54:43 -0000 1.8 --- sidebar.tpl 6 Feb 2004 05:49:06 -0000 1.9 *************** *** 100,104 **** <!-- switch tomorrows_events off --> ! <!-- switch todo on --> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> --- 100,104 ---- <!-- switch tomorrows_events off --> ! <!-- switch vtodo on --> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> *************** *** 130,134 **** <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> </tr> ! <!-- switch show_normal on --> </table> </div> --- 130,134 ---- <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> </tr> ! <!-- switch show_normal off --> </table> </div> *************** *** 146,150 **** ! <!-- switch todo off --> {MONTH_SMALL|-1} --- 146,150 ---- ! <!-- switch vtodo off --> {MONTH_SMALL|-1} |
|
From: <cl...@us...> - 2004-02-06 05:51:45
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11491/functions Modified Files: template.php Log Message: Initial wiring of vtodo. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** template.php 6 Feb 2004 04:54:43 -0000 1.23 --- template.php 6 Feb 2004 05:49:05 -0000 1.24 *************** *** 91,94 **** --- 91,156 ---- } + function get_vtodo() { + global $template, $getdate, $master_array, $next_day, $timeFormat; + + preg_match("!<\!-- switch show_completed on -->(.*)<\!-- switch show_completed off -->!is", $this->page, $match1); + preg_match("!<\!-- switch show_important on -->(.*)<\!-- switch show_important off -->!is", $this->page, $match2); + preg_match("!<\!-- switch show_normal on -->(.*)<\!-- switch show_normal off -->!is", $this->page, $match3); + $completed = trim($match1[1]); + $important = trim($match2[1]); + $normal = trim($match3[1]); + $comp_data = ''; + $impt_data = ''; + $norm_data = ''; + + if (is_array($master_array['-2'])) { + foreach ($master_array['-2'] as $vtodo_times) { + foreach ($vtodo_times as $val) { + $vtodo_text = stripslashes(urldecode($val["vtodo_text"])); + if ($vtodo_text != "") { + if (isset($val["description"])) { + $description = urldecode($val["description"]); + } else { + $description = ""; + } + $completed_date = $val['completed_date']; + $event_calna = $val['calname']; + $status = $val["status"]; + $priority = $val['priority']; + $start_date = $val["start_date"]; + $due_date = $val['due_date']; + $vtodo_array = array( + 'cal' => $event_calna, + 'completed_date'=> $completed_date, + 'description' => $description, + 'due_date' => $due_date, + 'priority' => $priority, + 'start_date' => $start_date, + 'status' => $status, + 'vtodo_text' => $vtodo_text); + + $vtodo_array = base64_encode(serialize($vtodo_array)); + $vtodo_text = word_wrap(strip_tags(str_replace('<br>',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines); + $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); + $rep = array ($vtodo_text, $vtodo_array); + + if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) { + if ($show_completed == 'yes') { + $temp = $completed; + } + } elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) { + $temp = $important; + } else { + $temp = $normal; + } + $nugget1 = str_replace($data, $rep, $temp); + $nugget2 .= $nugget1; + } + } + $this->page = ereg_replace('<!-- switch show_completed on -->(.*)<!-- switch show_normal off -->', $nugget2, $this->page); + } + } + } + function draw_month($template_p, $offset = '+0', $type) { global $template, $getdate, $master_array, $this_year, $this_month, $dateFormat_month, $week_start_day, $cal, $minical_view, $month_event_lines, $daysofweekreallyshort_lang, $daysofweekshort_lang, $daysofweek_lang, $timeFormat_small, $timeFormat; |
|
From: <cl...@us...> - 2004-02-06 05:51:45
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11491 Modified Files: day.php Log Message: Initial wiring of vtodo. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** day.php 5 Feb 2004 23:45:54 -0000 1.108 --- day.php 6 Feb 2004 05:49:05 -0000 1.109 *************** *** 67,70 **** --- 67,71 ---- $page->draw_day($this->page); $page->tomorrows_events($this->page); + $page->get_vtodo($this->page); $page->output(); |
|
From: <cl...@us...> - 2004-02-06 04:57:23
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2439/functions Modified Files: template.php Log Message: Tomorrow's events turn off when none are present. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** template.php 5 Feb 2004 23:45:55 -0000 1.22 --- template.php 6 Feb 2004 04:54:43 -0000 1.23 *************** *** 80,87 **** } } - } ! $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); } --- 80,92 ---- } } ! $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); ! ! } } |
|
From: <cl...@us...> - 2004-02-06 04:57:23
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2439/templates/default Modified Files: sidebar.tpl Log Message: Tomorrow's events turn off when none are present. Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sidebar.tpl 5 Feb 2004 23:45:55 -0000 1.7 --- sidebar.tpl 6 Feb 2004 04:54:43 -0000 1.8 *************** *** 26,39 **** <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr height="20"> ! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td> </tr> <tr> --- 26,39 ---- <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr> ! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td> </tr> <tr> *************** *** 63,78 **** <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <!-- switch tomorrows_events on --> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr height="20"> ! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td> </tr> <tr> --- 63,78 ---- <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> <!-- switch tomorrows_events on --> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr> ! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td> </tr> <tr> *************** *** 91,100 **** <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <!-- switch tomorrows_events off --> --- 91,100 ---- <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> <!-- switch tomorrows_events off --> *************** *** 103,108 **** <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr height="20"> ! <td align="center" width="98%" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td> </tr> <tr> --- 103,108 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr> ! <td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td> </tr> <tr> *************** *** 138,147 **** <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> --- 138,147 ---- <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> *************** *** 151,177 **** <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> {MONTH_SMALL|+0} <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> {MONTH_SMALL|+1} <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> --- 151,177 ---- <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br /> {MONTH_SMALL|+0} <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> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br /> {MONTH_SMALL|+1} <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> |
|
From: <cl...@us...> - 2004-02-06 00:50:37
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18679/templates/default Modified Files: day.tpl Log Message: Fix for #888028, and some minor tweeks to day.tpl. Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** day.tpl 5 Feb 2004 20:05:51 -0000 1.8 --- day.tpl 6 Feb 2004 00:47:54 -0000 1.9 *************** *** 8,16 **** <td align="center" valign="middle"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" width="90%" class="navback"><div style="padding: 5px;" class="H20"> {DISPLAY_DATE}</div></td> ! <td align="right" width="10%" 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> --- 8,17 ---- <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">{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="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> *************** *** 19,22 **** --- 20,24 ---- </tr> </table> + </div> </td> </tr> *************** *** 57,61 **** <!-- loop row on --> <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> --- 59,63 ---- <!-- loop row on --> <tr> ! <td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td> <td width="1" height="15"></td> <td class="dayborder"> </td> *************** *** 75,78 **** --- 77,114 ---- <!-- 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> *************** *** 91,94 **** --- 127,266 ---- <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> |
|
From: <cl...@us...> - 2004-02-06 00:50:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18679/functions Modified Files: ical_parser.php Log Message: Fix for #888028, and some minor tweeks to day.tpl. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.149 retrieving revision 1.150 diff -C2 -d -r1.149 -r1.150 *** ical_parser.php 3 Feb 2004 23:02:11 -0000 1.149 --- ical_parser.php 6 Feb 2004 00:47:54 -0000 1.150 *************** *** 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, 'calnumber' => $calnumber, 'calname' => $actual_calname ); $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); } *************** *** 594,598 **** while ($start_time2 < $end_time2) { $start_date2 = date('Ymd', $start_time2); ! $master_array[($start_date2)][('-1')][]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); $start_time2 = strtotime('+1 day', $start_time2); } --- 594,598 ---- 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); } |
|
From: <cl...@us...> - 2004-02-05 23:48:33
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5307 Modified Files: day.php week.php Log Message: Wired Tomorrow's Events with new function. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** day.php 5 Feb 2004 04:59:19 -0000 1.107 --- day.php 5 Feb 2004 23:45:54 -0000 1.108 *************** *** 22,25 **** --- 22,26 ---- $display_date = localizeDate($dateFormat_day, $unix_time); + $sidebar_date = localizeDate($dateFormat_week_list, $unix_time); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); *************** *** 45,48 **** --- 46,50 ---- 'calendar_name' => $calendar_name, 'display_date' => $display_date, + 'sidebar_date' => $sidebar_date, 'rss_powered' => $rss_powered, 'rss_available' => '', *************** *** 64,67 **** --- 66,70 ---- $page->draw_day($this->page); + $page->tomorrows_events($this->page); $page->output(); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** week.php 5 Feb 2004 06:34:56 -0000 1.104 --- week.php 5 Feb 2004 23:45:54 -0000 1.105 *************** *** 11,15 **** $weekstart = 1; $unix_time = strtotime($getdate); - $thisday2 = localizeDate($dateFormat_week_list, $unix_time); $today_today = date('Ymd', strtotime("now + $second_offset seconds")); $next_week = date("Ymd", strtotime("+1 week", $unix_time)); --- 11,14 ---- *************** *** 22,25 **** --- 21,25 ---- $end_week = localizeDate($dateFormat_week, $end_week_time); $display_date = "$start_week - $end_week"; + $sidebar_date = localizeDate($dateFormat_week_list, $unix_time); // For the side months *************** *** 49,52 **** --- 49,53 ---- 'calendar_name' => $calendar_name, 'display_date' => $display_date, + 'sidebar_date' => $sidebar_date, 'rss_powered' => $rss_powered, 'rss_available' => '', |
|
From: <cl...@us...> - 2004-02-05 23:48:33
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5307/templates/default Modified Files: sidebar.tpl Log Message: Wired Tomorrow's Events with new function. Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sidebar.tpl 5 Feb 2004 07:06:11 -0000 1.6 --- sidebar.tpl 5 Feb 2004 23:45:55 -0000 1.7 *************** *** 1,7 **** <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> ! <td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={YESTERDAYS_DATE}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{PREV_LANG}" width="16" height="20" border="0" align="left"></a></td> ! <td align="center" width="112" class="sideback"><font class="G10BOLD">{DISPLAY_DATE}</font></td> ! <td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={TOMORROWS_DATE}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{NEXT_LANG}" width="16" height="20" border="0" align="right"></a></td> </tr> <tr> --- 1,7 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> ! <td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left"></a></td> ! <td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td> ! <td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right"></a></td> </tr> <tr> *************** *** 80,87 **** <div style="padding: 5px;"> <!-- switch t_allday on --> ! <i>{T_ALLDAY}</i><br> <!-- switch t_allday off --> <!-- switch t_event on --> ! • {T_EVENT}<br> <!-- switch t_event off --> </div> --- 80,87 ---- <div style="padding: 5px;"> <!-- switch t_allday on --> ! {T_ALLDAY}<br /> <!-- switch t_allday off --> <!-- switch t_event on --> ! • {T_EVENT}<br /> <!-- switch t_event off --> </div> |
|
From: <cl...@us...> - 2004-02-05 23:48:33
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5307/functions Modified Files: template.php Log Message: Wired Tomorrow's Events with new function. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** template.php 5 Feb 2004 07:06:11 -0000 1.21 --- template.php 5 Feb 2004 23:45:55 -0000 1.22 *************** *** 19,23 **** if ($event_calno < 1) $event_calno=1; if ($event_calno > 7) $event_calno=7; ! $event = openevent($event_calna, '', '', $allday, 0, '', '<span class="V10WB">', '</span>', 'psf', $url); $loop_tmp = str_replace('{EVENT}', $event, $loop_ad); $loop_tmp = str_replace('{CALNO}', $event_calno, $loop_tmp); --- 19,23 ---- if ($event_calno < 1) $event_calno=1; if ($event_calno > 7) $event_calno=7; ! $event = openevent($event_calna, '', '', $allday, 0, '', '<span class="V10WB">', '</span>', 'psf', $event_url); $loop_tmp = str_replace('{EVENT}', $event, $loop_ad); $loop_tmp = str_replace('{CALNO}', $event_calno, $loop_tmp); *************** *** 46,49 **** --- 46,89 ---- } + function tomorrows_events() { + global $template, $getdate, $master_array, $next_day, $timeFormat; + + preg_match("!<\!-- switch t_allday on -->(.*)<\!-- switch t_allday off -->!is", $this->page, $match1); + preg_match("!<\!-- switch t_event on -->(.*)<\!-- switch t_event off -->!is", $this->page, $match2); + $loop_t_ad = trim($match1[1]); + $loop_t_e = trim($match2[1]); + $return_adtmp = ''; + $return_etmp = ''; + + if (is_array($master_array[$next_day])) { + foreach ($master_array[$next_day] as $event_times) { + foreach ($event_times as $val) { + $event_text = stripslashes(urldecode($val["event_text"])); + $event_text = strip_tags($event_text, '<b><i><u>'); + if ($event_text != "") { + $event_start = $val["event_start"]; + $event_end = $val["event_end"]; + $event_calna = $val["calname"]; + $event_url = $val["url"]; + $event_start = date ($timeFormat, @strtotime ($event_start)); + $event_end = date ($timeFormat, @strtotime ($event_end)); + if (!isset($val["event_start"])) { + $event_start = $lang['l_all_day']; + $event_end = ''; + $return_adtmp = openevent($event_calna, $event_start, $event_end, $val, $tomorrows_events_lines, 21, '', '', 'psf', $event_url); + $replace_ad .= str_replace('{T_ALLDAY}', $return_adtmp, $loop_t_ad); + } else { + $return_etmp = openevent($event_calna, $event_start, $event_end, $val, $tomorrows_events_lines, 21, '', '', 'ps3', $event_url); + $replace_e .= str_replace('{T_EVENT}', $return_etmp, $loop_t_e); + } + } + } + } + } + + $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); + } + function draw_month($template_p, $offset = '+0', $type) { global $template, $getdate, $master_array, $this_year, $this_month, $dateFormat_month, $week_start_day, $cal, $minical_view, $month_event_lines, $daysofweekreallyshort_lang, $daysofweekshort_lang, $daysofweek_lang, $timeFormat_small, $timeFormat; |
|
From: <cl...@us...> - 2004-02-05 20:08:30
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14505/templates/default Modified Files: day.tpl default.css Log Message: Minor tweeks to the top of day Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** day.tpl 5 Feb 2004 07:06:11 -0000 1.7 --- day.tpl 5 Feb 2004 20:05:51 -0000 1.8 *************** *** 9,14 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td class="navback"><div style="padding: 5px;" class="H20"> {DISPLAY_DATE}</div></td> ! <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> --- 9,14 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="left" width="90%" class="navback"><div style="padding: 5px;" class="H20"> {DISPLAY_DATE}</div></td> ! <td align="right" width="10%" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> *************** *** 25,33 **** <table width="100%" border="0" cellspacing="1" cellpadding="2"> <tr> <!-- loop daysofweek on --> ! <td width="14%" align="center" class="sideback"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}"><span class="V9">{DAY}</span></a> </td> <!-- loop daysofweek off --> </tr> </table> --- 25,39 ---- <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={DAYLINK}'"> + <span class="V12"><a class="psf" href="day.php?cal={CAL}&getdate={PREV_DAY}">«</a></span> + </td> <!-- loop daysofweek on --> ! <td width="14%" align="center" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&getdate={DAYLINK}'"> ! <span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></span> </td> <!-- loop daysofweek off --> + <td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&getdate={DAYLINK}'"> + <span class="V12"><a class="psf" href="day.php?cal={CAL}&getdate={NEXT_DAY}">»</a></span> + </td> </tr> </table> Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** default.css 5 Feb 2004 04:07:57 -0000 1.8 --- default.css 5 Feb 2004 20:05:51 -0000 1.9 *************** *** 16,20 **** .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} ! --- 16,22 ---- .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} ! .rowOn { background-color: #DFF7F7; } ! .rowOff { background-color: #E1E8F1; } ! .rowLent { background-color: #DDDDDD; } |
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24566/templates/default Modified Files: calendar_nav.tpl day.tpl month.tpl month_medium.tpl preferences.tpl sidebar.tpl year.tpl Log Message: Cleaned up code, checking with the W3C HTML validator. Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** calendar_nav.tpl 3 Feb 2004 23:02:13 -0000 1.6 --- calendar_nav.tpl 5 Feb 2004 07:06:11 -0000 1.7 *************** *** 5,11 **** <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> --- 5,11 ---- <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> *************** *** 45,56 **** <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> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="160" valign="top"> --- 45,56 ---- <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> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="160" valign="top"> *************** *** 80,86 **** <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> --- 80,86 ---- <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> *************** *** 93,102 **** <table width="170" 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> </tr> ! </table> \ No newline at end of file --- 93,102 ---- <table width="170" 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> </tr> ! </table> Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** day.tpl 5 Feb 2004 06:34:56 -0000 1.6 --- day.tpl 5 Feb 2004 07:06:11 -0000 1.7 *************** *** 13,20 **** <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> --- 13,20 ---- <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> *************** *** 91,101 **** <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"><img src="images/spacer.gif" width="10" height="1" alt=" "></td> <td width="170" valign="top"> {SIDEBAR} --- 91,101 ---- <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"><img src="images/spacer.gif" width="10" height="1" alt=" " /></td> <td width="170" valign="top"> {SIDEBAR} Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** month.tpl 3 Feb 2004 00:29:33 -0000 1.9 --- month.tpl 5 Feb 2004 07:06:11 -0000 1.10 *************** *** 10,16 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={PREV_MONTH}"><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="month.php?cal={CAL}&getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left"></a></td> </tr> </table> --- 10,16 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={PREV_MONTH}"><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="month.php?cal={CAL}&getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td> </tr> </table> *************** *** 19,26 **** <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> --- 19,26 ---- <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> *************** *** 34,40 **** <table width="735" 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> --- 34,40 ---- <table width="735" 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> *************** *** 48,54 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={PREV_MONTH}"><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">{L_THIS_MONTHS}</font></td> ! <td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left"></a></td> </tr> </table> --- 48,54 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={PREV_MONTH}"><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">{L_THIS_MONTHS}</font></td> ! <td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td> </tr> </table> *************** *** 86,92 **** <table width="737" 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> --- 86,92 ---- <table width="737" 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> Index: month_medium.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_medium.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** month_medium.tpl 1 Feb 2004 02:20:05 -0000 1.3 --- month_medium.tpl 5 Feb 2004 07:06:11 -0000 1.4 *************** *** 15,24 **** <!-- loop monthdays on --> <!-- switch notthismonth on --> ! <td width="30" height="30" align="right" valign="top" class="monthoff" onmouseover="this.style.backgroundColor="#DDDDDD"" onmouseout="this.style.backgroundColor="#F2F2F2"" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate=20031228'"> <div align="right" valign="top" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> </td> <!-- switch notthismonth off --> <!-- switch istoday on --> ! <td width="30" height="30" align="right" valign="top" class="monthreg" onmouseover="this.style.backgroundColor="#DDDDDD"" onmouseout="this.style.backgroundColor="#FFFFFF"" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate=20040101'"> <div align="right" valign="top" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> <div align="center" valign="top"> --- 15,24 ---- <!-- loop monthdays on --> <!-- switch notthismonth on --> ! <td width="30" height="30" align="right" valign="top" class="monthoff" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#F2F2F2'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate=20031228'"> <div align="right" valign="top" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> </td> <!-- switch notthismonth off --> <!-- switch istoday on --> ! <td width="30" height="30" align="right" valign="top" class="monthreg" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#FFFFFF'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate=20040101'"> <div align="right" valign="top" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> <div align="center" valign="top"> *************** *** 29,33 **** <!-- switch istoday off --> <!-- switch ismonth on --> ! <td width="30" height="30" align="right" valign="top" class="monthreg" onmouseover="this.style.backgroundColor="#DDDDDD"" onmouseout="this.style.backgroundColor="#FFFFFF"" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate=20040101'"> <div align="right" valign="top" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> <div align="center" valign="top"> --- 29,33 ---- <!-- switch istoday off --> <!-- switch ismonth on --> ! <td width="30" height="30" align="right" valign="top" class="monthreg" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#FFFFFF'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate=20040101'"> <div align="right" valign="top" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> <div align="center" valign="top"> *************** *** 43,45 **** </td> </tr> ! </table> \ No newline at end of file --- 43,45 ---- </td> </tr> ! </table> Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** preferences.tpl 31 Jan 2004 02:07:22 -0000 1.4 --- preferences.tpl 5 Feb 2004 07:06:11 -0000 1.5 *************** *** 6,10 **** <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"> --- 6,10 ---- <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"> *************** *** 17,24 **** <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> --- 17,24 ---- <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> *************** *** 29,33 **** </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> --- 29,33 ---- </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> </tr> <tr> *************** *** 46,75 **** <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> --- 46,75 ---- <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> *************** *** 77,81 **** <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> --- 77,81 ---- <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> *************** *** 84,89 **** <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}"></button></td> </tr> <!-- switch cookie_not_set off --> --- 84,89 ---- <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 --> *************** *** 99,101 **** </center> ! {FOOTER} \ No newline at end of file --- 99,101 ---- </center> ! {FOOTER} Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sidebar.tpl 3 Feb 2004 23:02:13 -0000 1.5 --- sidebar.tpl 5 Feb 2004 07:06:11 -0000 1.6 *************** *** 113,117 **** <tr> <td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td> ! <td><img src="images/spacer.gif" width="2" height="1" border"0" /></td> <td><s><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></s></td> </tr> --- 113,117 ---- <tr> <td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td> ! <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><s><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></s></td> </tr> *************** *** 120,124 **** <tr> <td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle"></td> ! <td><img src="images/spacer.gif" width="2" height="1" border"0" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> </tr> --- 120,124 ---- <tr> <td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle"></td> ! <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> </tr> *************** *** 127,131 **** <tr> <td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td> ! <td><img src="images/spacer.gif" width="2" height="1" border"0" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> </tr> --- 127,131 ---- <tr> <td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td> ! <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> </tr> *************** *** 175,177 **** <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4"></td> </tr> ! </table> \ No newline at end of file --- 175,177 ---- <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4"></td> </tr> ! </table> Index: year.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/year.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** year.tpl 1 Feb 2004 04:16:37 -0000 1.3 --- year.tpl 5 Feb 2004 07:06:11 -0000 1.4 *************** *** 13,17 **** <tr> <td align="right" width="45%" class="navback"> ! <a class="psf" href="year.php?cal={CAL}&getdate={PREV_YEAR}"><img src="styles/silver/left_day.gif" alt="[Previous Year]" border="0" align="right"></a> </td> <td align="center" width="10%" class="navback" nowrap valign="middle"> --- 13,17 ---- <tr> <td align="right" width="45%" class="navback"> ! <a class="psf" href="year.php?cal={CAL}&getdate={PREV_YEAR}"><img src="styles/silver/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a> </td> <td align="center" width="10%" class="navback" nowrap valign="middle"> *************** *** 19,23 **** </td> <td align="left" width="45%" class="navback"> ! <a class="psf" href="year.php?cal={CAL}&getdate={NEXT_YEAR}"><img src="styles/silver/right_day.gif" alt="[Next Year]" border="0" align="left"></a> </td> </tr> --- 19,23 ---- </td> <td align="left" width="45%" class="navback"> ! <a class="psf" href="year.php?cal={CAL}&getdate={NEXT_YEAR}"><img src="styles/silver/right_day.gif" alt="[Next Year]" border="0" align="left" /></a> </td> </tr> *************** *** 27,34 **** <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> --- 27,34 ---- <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> *************** *** 46,50 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 46,50 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> *************** *** 52,56 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 52,56 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> *************** *** 60,64 **** <tr> <td colspan="5"> ! <img src="images/spacer.gif" width="1" height="20" alt=" "> </td> </tr> --- 60,64 ---- <tr> <td colspan="5"> ! <img src="images/spacer.gif" width="1" height="20" alt=" " /> </td> </tr> *************** *** 68,72 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 68,72 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> *************** *** 74,78 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 74,78 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> *************** *** 82,86 **** <tr> <td colspan="5"> ! <img src="images/spacer.gif" width="1" height="20" alt=" "> </td> </tr> --- 82,86 ---- <tr> <td colspan="5"> ! <img src="images/spacer.gif" width="1" height="20" alt=" " /> </td> </tr> *************** *** 90,94 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 90,94 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> *************** *** 96,100 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 96,100 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> *************** *** 104,108 **** <tr> <td colspan="5"> ! <img src="images/spacer.gif" width="1" height="20" alt=" "> </td> </tr> --- 104,108 ---- <tr> <td colspan="5"> ! <img src="images/spacer.gif" width="1" height="20" alt=" " /> </td> </tr> *************** *** 112,116 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 112,116 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> *************** *** 118,122 **** </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" "> </td> <td width="210" valign="top" align="left"> --- 118,122 ---- </td> <td width="20"> ! <img src="images/spacer.gif" width="20" height="1" alt=" " /> </td> <td width="210" valign="top" align="left"> |
|
From: <we...@us...> - 2004-02-05 07:08:42
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24566/functions Modified Files: list_functions.php template.php Log Message: Cleaned up code, checking with the W3C HTML validator. Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** list_functions.php 3 Feb 2004 23:02:12 -0000 1.3 --- list_functions.php 5 Feb 2004 07:06:11 -0000 1.4 *************** *** 15,19 **** global $template, $master_array; foreach ($master_array[-3] as $key => $val) { ! $return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif"> '.$val.'<br>'; } --- 15,19 ---- global $template, $master_array; foreach ($master_array[-3] as $key => $val) { ! $return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br>'; } *************** *** 115,117 **** ! ?> \ No newline at end of file --- 115,117 ---- ! ?> Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** template.php 5 Feb 2004 04:59:19 -0000 1.20 --- template.php 5 Feb 2004 07:06:11 -0000 1.21 *************** *** 123,127 **** $switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">'; $switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); ! $switch['ALLDAY'] .= '</span></div>'; } else { $switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0">'; --- 123,127 ---- $switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">'; $switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); ! $switch['ALLDAY'] .= '</div>'; } else { $switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0">'; *************** *** 136,140 **** $switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">'; $switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br>'; ! $switch['EVENT'] .= '</span></div>'; } else { $switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0">'; --- 136,140 ---- $switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">'; $switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br>'; ! $switch['EVENT'] .= '</div>'; } else { $switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0">'; *************** *** 300,302 **** } } ! ?> \ No newline at end of file --- 300,302 ---- } } ! ?> |
|
From: <cl...@us...> - 2004-02-05 06:37:25
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19311 Modified Files: week.php Log Message: Added week template. Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** week.php 20 Nov 2003 05:18:38 -0000 1.103 --- week.php 5 Feb 2004 06:34:56 -0000 1.104 *************** *** 3,7 **** $current_view = "week"; define('BASE', './'); ! include(BASE.'functions/ical_parser.php'); if ($minical_view == "current") $minical_view = "week"; --- 3,9 ---- $current_view = "week"; define('BASE', './'); ! require_once(BASE.'functions/ical_parser.php'); ! require_once(BASE.'functions/list_functions.php'); ! require_once(BASE.'functions/template.php'); if ($minical_view == "current") $minical_view = "week"; *************** *** 23,371 **** // For the side months 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]; ! $dayborder = 0; ! $thisdate = $start_week_time; ! for ($i=0;$i<7;$i++) { ! $thisday = date("Ymd", $thisdate); ! $nbrGridCols[$thisday] = 1; ! if (isset($master_array[$thisday])) { ! foreach($master_array[($thisday)] as $ovlKey => $ovlValue) { ! if ($ovlKey != "-1") { ! foreach($ovlValue as $ovl2Value) { ! $nbrGridCols[($thisday)] = kgv($nbrGridCols[($thisday)], ($ovl2Value["event_overlap"] + 1)); ! } ! } ! } ! } ! $thisdate = ($thisdate + (25 * 60 * 60)); ! } ! include (BASE.'includes/header.inc.php'); ! ?> ! <center> ! <table border="0" width="720" cellspacing="0" cellpadding="0"> ! <tr> ! <td width="540" valign="top"> ! <table width="540" 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"> </td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$prev_week\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$last_week_lang]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td> ! <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$next_week\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$next_week_lang]\" border=\"0\" align=\"left\"></a>"; ?></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> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> ! <tr> ! <td align="center" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td width="60"><img src="images/spacer.gif" width="60" height="1" alt=" "></td> ! <td width="1"></td> ! <?php ! $thisdate = $start_week_time; ! $i = 0; ! do { ! $thisday = date("Ymd", $thisdate); ! $colWidth = round(70 / $nbrGridCols[$thisday]); ! for ($j=0;$j < $nbrGridCols[$thisday];$j++) { ! echo "<td width=\"" . $colWidth . "\"><img src=\"images/spacer.gif\" width=\"" . $colWidth . "\" height=\"1\" alt=\" \"></td>\n"; ! } ! $thisdate = ($thisdate + (25 * 60 * 60)); ! $i++; ! } while ($i < 7); ! ?> ! </tr> ! <?php ! ! // print out the day names here ! echo "<tr>"; ! $thisdate = $start_week_time; ! $i = 0; ! echo "<td class=\"dateback\" width=\"60\"><img src=\"images/spacer.gif\" width=\"1\" height=\"12\" alt=\" \"></td>"; ! echo "<td class=\"dateback\" width=\"1\"></td>"; ! do { ! $thisday = date("Ymd", $thisdate); ! $thisday3 = localizeDate($dateFormat_week_list, $thisdate); ! echo "<td width=\"70\" colspan=\"" . $nbrGridCols[$thisday] . "\" valign=\"top\" align=\"center\" class=\"dateback\">\n"; ! echo "<font class=\"V9\"><a class=\"psf\" href=\"day.php?cal=$cal&getdate=$thisday\">$thisday3</a></font>\n"; ! echo "</td>\n"; ! $thisdate = ($thisdate + (25 * 60 * 60)); ! $i++; ! } while ($i < 7); ! echo "</tr>"; ! ?> ! <tr> ! <td width="60"><img src="images/spacer.gif" width="60" height="1" alt=" "></td> ! <td width="1"></td> ! <?php ! $thisdate = $start_week_time; ! $i = 0; ! do { ! $thisday = date("Ymd", $thisdate); ! $colWidth = round(70 / $nbrGridCols[$thisday]); ! for ($j=0;$j < $nbrGridCols[$thisday];$j++) { ! echo "<td width=\"" . $colWidth . "\"><img src=\"images/spacer.gif\" width=\"" . $colWidth . "\" height=\"1\" alt=\" \"></td>\n"; ! } ! $thisdate = ($thisdate + (25 * 60 * 60)); ! $i++; ! } while ($i < 7); ! ?> ! </tr> ! <?php ! // The all day events returned here. ! $allday_events_this_week = false; ! $thisdate = $start_week_time; ! for ($i=0;$i<7;$i++) { ! $thisday = date("Ymd", $thisdate); ! if (isset($master_array[($thisday)]["-1"])) { ! $allday_events_this_week = true; ! break; ! } ! $thisdate = ($thisdate + (25 * 60 * 60)); ! } ! if ($allday_events_this_week) { ! $thisdate = $start_week_time; ! $i = 0; ! echo "<tr>\n"; ! echo "<td class=\"dateback\" colspan=\"2\"></td>"; ! do { ! $thisday = date("Ymd", $thisdate); ! echo "<td class=\"dateback\" height=\"20\" colspan=\"" . $nbrGridCols[$thisday] . "\" valign=\"bottom\">\n"; ! if (isset($master_array[($thisday)]["-1"])) { ! echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\" class=\"V9\">\n"; ! foreach($master_array[($thisday)]["-1"] as $allday) { ! echo "<tr>\n"; ! $event_calno = $allday['calnumber']; ! $event_calna = $allday['calname']; ! $event_url = $allday['url']; ! if ($event_calno < 1) $event_calno=1; ! if ($event_calno > 7) $event_calno=7; ! echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">'; ! openevent("$event_calna", ! "", ! "", ! $allday, ! $allday_week_lines, ! 12, ! '<font color="#ffffff">', ! "</font>", ! "psf", ! $event_url); ! echo "</td></tr>\n"; ! } ! echo "</table>\n"; ! } ! echo "</td>\n"; ! $thisdate = ($thisdate + (25 * 60 * 60)); ! $i++; ! } while ($i < 7); ! echo "</tr>\n"; ! } ! $thisdate = $start_week_time; ! for ($i=0;$i<7;$i++) { ! $thisday = date("Ymd", $thisdate); ! $event_length[$thisday] = array (); ! $thisdate = ($thisdate + (25 * 60 * 60)); ! } ! foreach ($day_array as $key) { ! $cal_time = $key; ! ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp); ! $key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year); ! $key = date ($timeFormat, $key); ! ! ! if (ereg("([0-9]{1,2}):00", $key)) { ! echo "<tr>\n"; ! echo "<td rowspan=\"" . (60 / $gridLength) . "\" align=\"center\" valign=\"top\" width=\"60\" class=\"timeborder\">$key</td>\n"; ! echo "<td width=\"1\" height=\"" . $gridLength . "\"></td>\n"; ! } elseif("$cal_time" == "$day_start") { ! $size_tmp = 60 - (int)substr($cal_time,2,2); ! echo "<tr>\n"; ! echo "<td rowspan=\"" . ($size_tmp / $gridLength) . "\" align=\"center\" valign=\"top\" width=\"60\" class=\"timeborder\">$key</td>\n"; ! echo "<td width=\"1\" height=\"" . $gridLength . "\"></td>\n"; ! } else { ! ! echo "<tr>\n"; ! echo "<td width=\"1\" height=\"" . $gridLength . "\"></td>\n"; ! } ! ! // initialize $thisdate again ! $thisdate = $start_week_time; ! ! // loop this part 7 times, one for each day ! ! for ($week_loop=0; $week_loop<7; $week_loop++) { ! $thisday = date("Ymd", $thisdate); ! $dayborder = 0; ! unset($this_time_arr); ! if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { ! $this_time_arr = $master_array[$thisday][$cal_time]; ! } ! ! if ("$day_start" == "$cal_time" && isset($master_array[$thisday]) && is_array($master_array[$thisday])) { ! foreach($master_array[$thisday] 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[$thisday][$j])) { ! if ($event_length[$thisday][$j]["state"] == "ended") { ! $event_length[$thisday][$j] = array ("length" => ($drawEvent["draw_length"] / $gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin"); ! break; ! } ! $j++; ! } ! if ($j == sizeof($event_length[$thisday])) { ! array_push ($event_length[$thisday], array ("length" => ($drawEvent["draw_length"] / $gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin")); ! } ! } ! } ! ! if (sizeof($event_length[$thisday]) == 0) { ! if ($dayborder == 0) { ! $class = " class=\"weekborder\""; ! $dayborder++; ! } else { ! $class = ""; ! $dayborder = 0; ! } ! ! echo "<td bgcolor=\"#ffffff\" colspan=\"" . $nbrGridCols[$thisday] . "\" $class> </td>\n"; ! ! } else { ! $emptyWidth = $nbrGridCols[$thisday]; ! for ($i=0;$i<sizeof($event_length[$thisday]);$i++) { ! ! //echo $this_time_arr[($event_length[$thisday][$i]["key"])]["event_text"] . " ind: " . $i . " / anz: " . $event_length[$thisday][$i]["overlap"] . " = " . eventWidth($i,$event_length[$thisday][$i]["overlap"]) . "<br />"; ! $drawWidth = $nbrGridCols[$thisday] / ($event_length[$thisday][$i]["overlap"] + 1); ! $emptyWidth = $emptyWidth - $drawWidth; ! switch ($event_length[$thisday][$i]["state"]) { ! case "begin": ! $event_length[$thisday][$i]["state"] = "started"; ! $event_start = $this_time_arr[($event_length[$thisday][$i]["key"])]["start_unixtime"]; ! $event_start = date ($timeFormat, $event_start); ! $event_calno = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber']; ! $event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']); ! if ($event_calno < 1) $event_calno = 1; ! if ($event_calno > 7) $event_calno = 7; ! echo '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2week_'.$event_calno.'">'."\n"; ! echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; ! echo "<tr>\n"; ! echo "<td class=\"eventborder\"><font class=\"V10WB\"><b>$event_start</b></font></td>\n"; ! if ($event_status != '') { ! echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">'; ! echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">'; ! echo "</font></td>\n"; ! } ! echo "</tr>\n"; ! echo "<tr>\n"; ! echo "<td colspan=\"2\">\n"; ! echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n"; ! echo "<tr>\n"; ! echo '<td class="eventbg_'.$event_calno.'">'; ! $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; ! if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']); ! $event_end = date ($timeFormat, $event_end); ! $event_calna = $this_time_arr[($event_length[$thisday][$i]["key"])]['calname']; ! $event_url = $this_time_arr[($event_length[$thisday][$i]["key"])]['url']; ! openevent("$event_calna", ! "$event_start", ! "$event_end", ! $this_time_arr[($event_length[$thisday][$i]["key"])], ! $week_events_lines, ! 25, ! "<font class=\"V10W\">", ! "</font>", ! "psf", ! $event_url); ! echo "</td></tr>\n"; ! echo "</table>\n"; ! echo "</td>\n"; ! echo "</tr>\n"; ! echo "</table>\n"; ! echo "</td>\n"; ! break; ! case "started": ! break; ! case "ended": ! echo "<td bgcolor=\"#ffffff\" colspan=\"" . $drawWidth . "\" $class> </td>\n"; ! break; ! } ! $event_length[$thisday][$i]["length"]--; ! if ($event_length[$thisday][$i]["length"] == 0) { ! $event_length[$thisday][$i]["state"] = "ended"; ! } ! } ! //fill emtpy space on the right ! if ($emptyWidth > 0) { ! echo "<td bgcolor=\"#ffffff\" colspan=\"" . $emptyWidth . "\" $class> </td>\n"; ! } ! while (isset($event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"]) && $event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"] == "ended") { ! array_pop($event_length[$thisday]); ! } ! } ! $thisdate = ($thisdate + (25 * 60 * 60)); ! } ! echo "</tr>\n"; ! } ! ! ?> ! </table> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! </table> ! </td> ! <td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td> ! <td width="170" valign="top"> ! <?php include (BASE.'includes/sidebar.php'); ?> ! </td> ! </tr> ! </table> ! </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> --- 25,73 ---- // For the side months 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]; ! // select for calendars ! $list_icals = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED)); ! $list_years = list_years(); ! $list_months = list_months(); ! $list_weeks = list_weeks(); ! $list_jumps = list_jumps(); ! $list_calcolors = list_calcolors(); ! $page = new Page(BASE.'templates/'.$template.'/week.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, ! 'rss_powered' => $rss_powered, ! 'rss_available' => '', ! 'rss_valid' => '', ! 'todo_js' => '', ! 'show_search' => '', ! 'next_day' => $next_day, ! 'prev_day' => $prev_day, ! 'show_goto' => '', ! 'is_logged_in' => '', ! 'list_icals' => $list_icals, ! 'list_years' => $list_years, ! 'list_months' => $list_months, ! 'list_weeks' => $list_weeks, ! 'list_jumps' => $list_jumps, ! 'legend' => $list_calcolors, ! 'style_select' => $style_select ! )); ! ! $page->draw_day($this->page); ! $page->output(); + ?> \ No newline at end of file |
|
From: <cl...@us...> - 2004-02-05 06:37:25
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19311/templates/default Modified Files: day.tpl Added Files: week.tpl Log Message: Added week template. --- NEW FILE: week.tpl --- {HEADER} <center> <table border="0" width="720" cellspacing="0" cellpadding="0"> <tr> <td width="540" valign="top"> <table width="540" 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"> </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="week.php?cal=all_calendars_combined971&getdate=20040128"><img src="styles/silver/left_day.gif" alt="[Previous Week]" border="0" align="right"></a> </td> [...1704 lines suppressed...] </td> </tr> </table> </td> </tr> </table> </td> </tr> </table> </td> <td width="10"> <img src="images/spacer.gif" width="10" height="1" alt=" "> </td> <td width="170" valign="top"> {SIDEBAR} </td> </tr> </table> </center> {FOOTER} Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** day.tpl 5 Feb 2004 04:59:19 -0000 1.5 --- day.tpl 5 Feb 2004 06:34:56 -0000 1.6 *************** *** 9,13 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td class="navback"><font class="H20"> {DISPLAY_DATE}</font></td> <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> --- 9,13 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td class="navback"><div style="padding: 5px;" class="H20"> {DISPLAY_DATE}</div></td> <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> |
|
From: <cl...@us...> - 2004-02-05 05:01:49
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2028/templates/default Modified Files: day.tpl Log Message: Slight design change in day, wired up week days on day.php. Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** day.tpl 5 Feb 2004 00:15:37 -0000 1.4 --- day.tpl 5 Feb 2004 04:59:19 -0000 1.5 *************** *** 9,22 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="left" width="120" class="navback"> </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="day.php?cal={CAL}&getdate={PREV_DAY}"><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="day.php?cal={CAL}&getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left"></a></td> ! </tr> ! </table> ! </td> <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> --- 9,13 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td class="navback"><font class="H20"> {DISPLAY_DATE}</font></td> <td align="right" width="120" class="navback"> <table width="120" border="0" cellpadding="0" cellspacing="0"> *************** *** 30,33 **** --- 21,37 ---- </td> </tr> + <tr> + <td colspan="2"> + <table width="100%" border="0" cellspacing="1" cellpadding="2"> + <tr> + <!-- loop daysofweek on --> + <td width="14%" align="center" class="sideback"> + <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}"><span class="V9">{DAY}</span></a> + </td> + <!-- loop daysofweek off --> + </tr> + </table> + </td> + </tr> </table> </td> *************** *** 42,79 **** </td> </tr> - <!-- switch showdays on --> - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td colspan="7"><img src="images/spacer.gif" width="70" height="1" alt=" "></td> - </tr> - <tr> - <td width="74" valign="top" align="center" class="dateback"> - <font class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={THISDAY}">{DAY}</a></font> - </td> - <td width="74" valign="top" align="center" class="dateback"> - <font class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={THISDAY}">{DAY}</a></font> - </td> - <td width="74" valign="top" align="center" class="dateback"> - <font class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={THISDAY}">{DAY}</a></font> - </td> - <td width="74" valign="top" align="center" class="dateback"> - <font class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={THISDAY}">{DAY}</a></font> - </td> - <td width="74" valign="top" align="center" class="dateback"> - <font class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={THISDAY}">{DAY}</a></font> - </td> - <td width="74" valign="top" align="center" class="dateback"> - <font class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={THISDAY}">{DAY}</a></font> - </td> - <td width="74" valign="top" align="center" class="dateback"> - <font class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={THISDAY}">{DAY}</a></font> - </td> - </tr> - </table> - </td> - </tr> - <!-- switch showdays off --> <tr> <td align="center" valign="top" colspan="3"> --- 46,49 ---- |
|
From: <cl...@us...> - 2004-02-05 05:01:48
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2028/functions Modified Files: template.php Log Message: Slight design change in day, wired up week days on day.php. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** template.php 5 Feb 2004 00:15:37 -0000 1.19 --- template.php 5 Feb 2004 04:59:19 -0000 1.20 *************** *** 6,10 **** var $page; function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array ; $replace = ''; if (is_array($master_array[$getdate]['-1'])) { --- 6,12 ---- var $page; function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day; ! ! // Replaces the allday events $replace = ''; if (is_array($master_array[$getdate]['-1'])) { *************** *** 24,27 **** --- 26,47 ---- } $this->page = ereg_replace('<!-- loop allday on -->(.*)<!-- loop allday off -->', $replace, $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); + $weekday = $daysofweek_lang[$day_num]; + $daylink = date('Ymd', $start_wt); + $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); + $weekday_loop .= $loop_tmp; + } + $this->page = ereg_replace('<!-- loop daysofweek on -->(.*)<!-- loop daysofweek off -->', $weekday_loop, $this->page); + } |
|
From: <cl...@us...> - 2004-02-05 05:01:48
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2028 Modified Files: day.php Log Message: Slight design change in day, wired up week days on day.php. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** day.php 5 Feb 2004 00:15:37 -0000 1.106 --- day.php 5 Feb 2004 04:59:19 -0000 1.107 *************** *** 21,25 **** $prev_day = date('Ymd', strtotime("-1 day", $unix_time)); ! $display_date = localizeDate($dateFormat_week_list, $unix_time); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); --- 21,25 ---- $prev_day = date('Ymd', strtotime("-1 day", $unix_time)); ! $display_date = localizeDate($dateFormat_day, $unix_time); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); |
