Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <cl...@us...> - 2004-05-19 03:45:20
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22817 Modified Files: day.php month.php week.php year.php Log Message: Code optimization: Specifically replace each language variable instead of looking for any. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** day.php 15 May 2004 23:56:17 -0000 1.114 --- day.php 19 May 2004 03:45:07 -0000 1.115 *************** *** 75,81 **** 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => $style_select )); $page->draw_day($this->page); $page->tomorrows_events($this->page); --- 75,106 ---- 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => $style_select, ! 'l_goprint' => $lang['l_goprint'], ! 'l_preferences' => $lang['l_preferences'], ! 'l_calendar' => $lang['l_calendar'], ! 'l_legend' => $lang['l_legend'], ! 'l_tomorrows' => $lang['l_tomorrows'], ! 'l_jump' => $lang['l_jump'], ! 'l_todo' => $lang['l_todo'], ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_subscribe' => $lang['l_subscribe'], ! 'l_download' => $lang['l_download'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); + if ($allow_login == 'yes') { + $page->replace_tags(array( + 'l_invalid_login' => $lang['l_invalid_login'], + 'l_password' => $lang['l_password'], + 'l_username' => $lang['l_username'], + 'l_login' => $lang['l_login'], + 'l_logout' => $lang['l_logout'] + )); + } + $page->draw_day($this->page); $page->tomorrows_events($this->page); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** month.php 16 May 2004 05:39:25 -0000 1.118 --- month.php 19 May 2004 03:45:08 -0000 1.119 *************** *** 49,53 **** $page = new Page(BASE.'templates/'.$template.'/month.tpl'); - $page->replace_tags(array( 'header' => BASE.'templates/'.$template.'/header.tpl', --- 49,52 ---- *************** *** 77,81 **** 'legend' => $list_calcolors, 'current_view' => $current_view, ! 'style_select' => $style_select )); --- 76,96 ---- 'legend' => $list_calcolors, 'current_view' => $current_view, ! 'style_select' => $style_select, ! 'l_goprint' => $lang['l_goprint'], ! 'l_preferences' => $lang['l_preferences'], ! 'l_calendar' => $lang['l_calendar'], ! 'l_legend' => $lang['l_legend'], ! 'l_tomorrows' => $lang['l_tomorrows'], ! 'l_jump' => $lang['l_jump'], ! 'l_todo' => $lang['l_todo'], ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_subscribe' => $lang['l_subscribe'], ! 'l_download' => $lang['l_download'], ! 'l_this_months' => $lang['l_this_months'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** week.php 15 May 2004 23:56:18 -0000 1.112 --- week.php 19 May 2004 03:45:08 -0000 1.113 *************** *** 80,84 **** 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => $style_select )); --- 80,99 ---- 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => $style_select, ! 'l_goprint' => $lang['l_goprint'], ! 'l_preferences' => $lang['l_preferences'], ! 'l_calendar' => $lang['l_calendar'], ! 'l_legend' => $lang['l_legend'], ! 'l_tomorrows' => $lang['l_tomorrows'], ! 'l_jump' => $lang['l_jump'], ! 'l_todo' => $lang['l_todo'], ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_subscribe' => $lang['l_subscribe'], ! 'l_download' => $lang['l_download'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** year.php 16 May 2004 07:05:39 -0000 1.30 --- year.php 19 May 2004 03:45:09 -0000 1.31 *************** *** 35,39 **** 'this_year' => $this_year, 'next_year' => $next_year, ! 'prev_year' => $prev_year )); --- 35,46 ---- 'this_year' => $this_year, 'next_year' => $next_year, ! 'prev_year' => $prev_year, ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_this_site_is' => $lang['l_this_site_is'] ! )); |
|
From: <cl...@us...> - 2004-05-19 03:45:19
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22817/functions Modified Files: template.php Log Message: Code optimization: Specifically replace each language variable instead of looking for any. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** template.php 16 May 2004 20:30:19 -0000 1.42 --- template.php 19 May 2004 03:45:09 -0000 1.43 *************** *** 786,790 **** } while ($whole_month == TRUE); ! $return = preg_replace('!<\!-- loop weekday on -->(.*)<\!-- loop weekday off -->!is', $weekday_loop, $template_p); $return = preg_replace('!<\!-- loop monthweeks on -->(.*)<\!-- loop monthweeks off -->!is', $middle, $return); $return = str_replace('{MONTH_TITLE}', $month_title, $return); --- 786,790 ---- } while ($whole_month == TRUE); ! $return = str_replace('<!-- loop weekday on -->'.$match1[1].'<!-- loop weekday off -->', $weekday_loop, $template_p); $return = preg_replace('!<\!-- loop monthweeks on -->(.*)<\!-- loop monthweeks off -->!is', $middle, $return); $return = str_replace('{MONTH_TITLE}', $month_title, $return); *************** *** 910,923 **** } - // Replace any languages - foreach ($lang as $tag => $data) { - $this->page = str_replace('{' . strtoupper($tag) . '}', $data, $this->page); - } - $php_ended = @getmicrotime(); $generated = number_format(($php_ended-$php_started),3); $this->page = str_replace('{GENERATED}', $generated, $this->page); if ($enable_rss != 'yes') { ! $this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!is', '', $this->page); } else { $this->page = str_replace('{BASE}', BASE, $this->page); --- 910,918 ---- } $php_ended = @getmicrotime(); $generated = number_format(($php_ended-$php_started),3); $this->page = str_replace('{GENERATED}', $generated, $this->page); if ($enable_rss != 'yes') { ! $this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!is', '', $this->page); } else { $this->page = str_replace('{BASE}', BASE, $this->page); |
|
From: <cl...@us...> - 2004-05-19 03:45:19
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22817/includes Modified Files: event.php Log Message: Code optimization: Specifically replace each language variable instead of looking for any. Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** event.php 16 May 2004 06:44:04 -0000 1.27 --- event.php 19 May 2004 03:45:09 -0000 1.28 *************** *** 33,37 **** if ($description) $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$description); ! if ($organizer) { $i=0; $display .= $organizer_lang . ' - '; --- 33,37 ---- if ($description) $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$description); ! if (is_array($organizer)) { $i=0; $display .= $organizer_lang . ' - '; *************** *** 42,46 **** $organizer = substr($organizers,0,-2); } ! if ($attendee) { $i=0; $display .= $attendee_lang . ' - '; --- 42,46 ---- $organizer = substr($organizers,0,-2); } ! if (is_array($attendee)) { $i=0; $display .= $attendee_lang . ' - '; |
|
From: <cl...@us...> - 2004-05-16 20:30:30
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/functions Modified Files: ical_parser.php template.php Log Message: Fix for recurrence-id moving whole day events. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.158 retrieving revision 1.159 diff -C2 -d -r1.158 -r1.159 *** ical_parser.php 15 May 2004 02:42:14 -0000 1.158 --- ical_parser.php 16 May 2004 20:30:19 -0000 1.159 *************** *** 148,153 **** --- 148,155 ---- if ($uid_valid && isset($processed[$uid]) && isset($recurrence_id['date'])) { + $old_start_date = $processed[$uid][0]; $old_start_time = $processed[$uid][1]; + if ($recurrence_id['value'] == 'DATE') $old_start_time = '-1'; $start_date_tmp = $recurrence_id['date']; if (!isset($start_date)) $start_date = $old_start_date; *************** *** 167,171 **** --- 169,177 ---- if (isset($master_array[$start_date_tmp][$old_start_time][$uid])) { unset($master_array[$start_date_tmp][$old_start_time][$uid]); // SJBO added $uid twice here + if (sizeof($master_array[$start_date_tmp][$old_start_time]) == 0) { + unset($master_array[$start_date_tmp][$old_start_time]); + } } + $write_processed = false; } else { *************** *** 222,226 **** if (!isset($hour)) $hour = 00; if (!isset($minute)) $minute = 00; ! $processed[$uid] = array($start_date,($hour.$minute)); } --- 228,232 ---- if (!isset($hour)) $hour = 00; if (!isset($minute)) $minute = 00; ! $processed[$uid] = array($start_date,($hour.$minute), $type); } Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** template.php 16 May 2004 19:39:13 -0000 1.41 --- template.php 16 May 2004 20:30:19 -0000 1.42 *************** *** 557,561 **** $return_etmp = ''; ! if (is_array($master_array[$next_day])) { foreach ($master_array[$next_day] as $event_times) { foreach ($event_times as $val) { --- 557,561 ---- $return_etmp = ''; ! if (is_array($master_array[$next_day]) && sizeof($master_array[$next_day]) > 0) { foreach ($master_array[$next_day] as $event_times) { foreach ($event_times as $val) { |
|
From: <cl...@us...> - 2004-05-16 19:58:16
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11680 Modified Files: README Log Message: Updated for 2.0 beta. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** README 15 May 2004 02:42:13 -0000 1.63 --- README 16 May 2004 19:58:06 -0000 1.64 *************** *** 88,95 **** Changes: -------- ! 1.2 ! -Workaround for events starting between 0000 and 0100 ! -Started templating system ! -Removed all styles except for defualt 1.1 --- 88,104 ---- Changes: -------- ! 2.0 beta ! -New templating system. ! -Workaround for events starting between 0000 and 0100. ! -Removed all styles except for default. ! -Moved all HTML to XHTML. ! -Revamped CSS. ! -Added legends and calendar colors. ! -HTTP authentication added for admin.php. ! -Sessions added for locked calendars. ! -Mozilla calendar support added to publish.php. ! -RSS supports ports other than 80. ! -RSS respects $calendar_path. ! -Various bug fixes. 1.1 *************** *** 101,105 **** 1.0 ! -Added return false to popups -Added workaround for improperly set DTSTART dates. --- 110,114 ---- 1.0 ! -Added return false to popups. -Added workaround for improperly set DTSTART dates. |
|
From: <cl...@us...> - 2004-05-16 19:39:24
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8380 Modified Files: print.php Log Message: Print view wired for templates, XHTML valid. Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** print.php 9 Feb 2004 00:51:48 -0000 1.22 --- print.php 16 May 2004 19:39:13 -0000 1.23 *************** *** 83,89 **** )); ! $page->draw_day($this->page); ! $page->tomorrows_events($this->page); ! $page->get_vtodo($this->page); $page->output(); --- 83,87 ---- )); ! $page->draw_print($this->page); $page->output(); |
|
From: <cl...@us...> - 2004-05-16 19:39:23
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8380/templates/default Modified Files: print.tpl Log Message: Print view wired for templates, XHTML valid. Index: print.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/print.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** print.tpl 8 Feb 2004 00:43:14 -0000 1.2 --- print.tpl 16 May 2004 19:39:14 -0000 1.3 *************** *** 11,17 **** <table width="90" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> </tr> </table> --- 11,17 ---- <table width="90" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview=week"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview=month"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> </tr> </table> *************** *** 23,27 **** </tr> <tr> ! <td colspan="3" class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> --- 23,27 ---- </tr> <tr> ! <td colspan="3" class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> </tr> <tr> *************** *** 30,33 **** --- 30,34 ---- <tr> <td align="left" valign="top"> + <!-- switch some_events on --> <div class="V12"><b>{DAYOFMONTH}</b></div> <!-- loop events on --> *************** *** 51,57 **** </div> <!-- loop events off --> <!-- switch no_events on --> ! <div class="V12"><b>{L_ZERO_EVENTS}</b></div> <!-- switch no_events off --> </td> --- 52,59 ---- </div> <!-- loop events off --> + <!-- switch some_events off --> <!-- switch no_events on --> ! <div class="V12"><b>{L_NO_RESULTS}</b></div> <!-- switch no_events off --> </td> *************** *** 68,70 **** --- 70,73 ---- </tr> </table> + </center> {FOOTER} \ No newline at end of file |
|
From: <cl...@us...> - 2004-05-16 19:39:23
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8380/functions Modified Files: template.php Log Message: Print view wired for templates, XHTML valid. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** template.php 16 May 2004 06:44:04 -0000 1.40 --- template.php 16 May 2004 19:39:13 -0000 1.41 *************** *** 18,22 **** 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); --- 18,27 ---- function draw_print($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $printview, $dateFormat_day, $timeFormat, $week_start, $week_end, $lang; ! preg_match("!<\!-- loop events on -->(.*)<\!-- loop events off -->!is", $this->page, $match1); ! preg_match("!<\!-- switch some_events on -->(.*)<\!-- loop events on -->!is", $this->page, $match3); ! $loop_event = trim($match1[1]); ! $loop_day = trim($match3[1]); ! foreach($master_array as $key => $val) { ereg ("([0-9]{6})([0-9]{2})", $key, $regs); *************** *** 25,28 **** --- 30,36 ---- $dayofmonth = strtotime ($key); $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); + $events_tmp = $loop_event; + $day_tmp = $loop_day; + //echo $dayofmonth; // Pull out each day *************** *** 35,62 **** $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; ! } } --- 43,79 ---- $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 = $lang['l_all_day']; ! $event_start2 = ''; ! $event_end = ''; ! } } ! if ($description == '') { ! $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); } + + $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}'); + $replace = array($event_start, $event_text, $description); + $events_tmp = str_replace($search, $replace, $events_tmp); + $some_events .= $events_tmp; + $events_tmp = $loop_event; } } + $day_tmp = str_replace('{DAYOFMONTH}', $dayofmonth, $day_tmp); + $final .= $day_tmp.$some_events; + unset ($day_tmp, $some_events); } } if ($events_week < 1) { ! $this->page = preg_replace('!<\!-- switch some_events on -->(.*)<\!-- switch some_events off -->!is', '', $this->page); ! } else { ! $this->page = preg_replace('!<\!-- switch some_events on -->(.*)<\!-- switch some_events off -->!is', $final, $this->page); ! $this->page = preg_replace('!<\!-- switch no_events on -->(.*)<\!-- switch no_events off -->!is', '', $this->page); ! } } |
|
From: <cl...@us...> - 2004-05-16 17:39:06
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15509/templates/default Modified Files: rss_index.tpl Log Message: RSS XHTML validation and bug fixes. Index: rss_index.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/rss_index.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rss_index.tpl 15 May 2004 02:42:17 -0000 1.2 --- rss_index.tpl 16 May 2004 17:38:56 -0000 1.3 *************** *** 1,7 **** {HEADER} <center> ! <table border="0" width="520" cellspacing="0" cellpadding="0"> <tr> ! <td width="520" valign="top" align="center"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> --- 1,7 ---- {HEADER} <center> ! <table border="0" width="700" cellspacing="0" cellpadding="0"> <tr> ! <td width="700" valign="top" align="center"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> *************** *** 27,31 **** </tr> <tr> ! <td class="dayborder"><img src="../images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> --- 27,31 ---- </tr> <tr> ! <td class="dayborder"><img src="../images/spacer.gif" width="1" height="5" alt=" " /></td> </tr> <tr> *************** *** 49,53 **** </tr> </table> ! <table width="520" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tbll"><img src="../images/spacer.gif" alt="" width="8" height="4" /></td> --- 49,53 ---- </tr> </table> ! <table width="700" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tbll"><img src="../images/spacer.gif" alt="" width="8" height="4" /></td> |
|
From: <cl...@us...> - 2004-05-16 17:39:06
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15509/rss Modified Files: index.php Log Message: RSS XHTML validation and bug fixes. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** index.php 15 May 2004 02:42:16 -0000 1.25 --- index.php 16 May 2004 17:38:56 -0000 1.26 *************** *** 18,26 **** $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! $rss_list = '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br />'; ! $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } --- 18,26 ---- $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! $rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&lrssview=week<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br /><br />'; ! $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } *************** *** 31,37 **** 'header' => BASE.'templates/'.$template.'/header.tpl', 'footer' => BASE.'templates/'.$template.'/footer.tpl', - 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', ! 'default_path' => $default_path, 'template' => $template, 'cal' => $cal, --- 31,36 ---- 'header' => BASE.'templates/'.$template.'/header.tpl', 'footer' => BASE.'templates/'.$template.'/footer.tpl', 'event_js' => BASE.'functions/event.js', ! 'default_path' => $default_path.'/', 'template' => $template, 'cal' => $cal, |
|
From: <cl...@us...> - 2004-05-16 17:09:11
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9224/templates/default Modified Files: preferences.tpl Log Message: Validated XHMTL for preferences Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** preferences.tpl 8 Feb 2004 22:37:03 -0000 1.8 --- preferences.tpl 16 May 2004 17:09:01 -0000 1.9 *************** *** 36,68 **** <tr> <td valign="top" align="left"> ! <form action="preferences.php?action=setcookie" METHOD="post"> <table border="0" width="100%" cellspacing="2" cellpadding="2" align="center"> <tr align="left" valign="top"> ! <td width="80%" nowrap>{L_SELECT_LANG}:</td> <td width="10%"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td width="10%"><select name="cookie_language" class="query_style">{LANGUAGE_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_CAL}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_VIEW}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_view" class="query_style">{VIEW_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_TIME}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_time" class="query_style">{TIME_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_DAY}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_startday" class="query_style">{STARTDAY_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap>{L_SELECT_STYLE}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_style" class="query_style">{STYLE_SELECT}</select></td> --- 36,68 ---- <tr> <td valign="top" align="left"> ! <form action="preferences.php?action=setcookie" method="post"> <table border="0" width="100%" cellspacing="2" cellpadding="2" align="center"> <tr align="left" valign="top"> ! <td width="80%" nowrap="nowrap">{L_SELECT_LANG}:</td> <td width="10%"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td width="10%"><select name="cookie_language" class="query_style">{LANGUAGE_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap="nowrap">{L_SELECT_CAL}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap="nowrap">{L_SELECT_VIEW}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_view" class="query_style">{VIEW_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap="nowrap">{L_SELECT_TIME}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_time" class="query_style">{TIME_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap="nowrap">{L_SELECT_DAY}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_startday" class="query_style">{STARTDAY_SELECT}</select></td> </tr> <tr align="left" valign="top"> ! <td nowrap="nowrap">{L_SELECT_STYLE}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_style" class="query_style">{STYLE_SELECT}</select></td> *************** *** 70,81 **** <!-- switch cookie_already_set on --> <tr align="left" valign="top"> ! <td nowrap>{L_UNSET_PREFS}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><INPUT TYPE="checkbox" NAME="unset" VALUE="true"></td> </tr> <!-- switch cookie_already_set off --> <!-- switch cookie_not_set on --> <tr align="left" valign="top"> ! <td nowrap> </td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><input type="submit" name="set" value="{L_SET_PREFS}" /></td> --- 70,81 ---- <!-- switch cookie_already_set on --> <tr align="left" valign="top"> ! <td nowrap="nowrap">{L_UNSET_PREFS}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><input type="checkbox" name="unset" value="true" /></td> </tr> <!-- switch cookie_already_set off --> <!-- switch cookie_not_set on --> <tr align="left" valign="top"> ! <td nowrap="nowrap"> </td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><input type="submit" name="set" value="{L_SET_PREFS}" /></td> |
|
From: <cl...@us...> - 2004-05-16 17:09:11
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9224 Modified Files: preferences.php Log Message: Validated XHMTL for preferences Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** preferences.php 9 Feb 2004 00:51:48 -0000 1.44 --- preferences.php 16 May 2004 17:09:01 -0000 1.45 *************** *** 80,86 **** $language_tmp = urlencode(ucfirst(substr($file, 0, -8))); if ($language_tmp == $cookie_language) { ! $language_select .= "<option value=\"$language_tmp\" selected>$language_tmp</option>\n"; } else { ! $language_select .= "<option value=\"$language_tmp\">$language_tmp</option>\n"; } } --- 80,86 ---- $language_tmp = urlencode(ucfirst(substr($file, 0, -8))); if ($language_tmp == $cookie_language) { ! $language_select .= '<option value="'.$language_tmp.'" selected="selected">'.$language_tmp.'</option>'; } else { ! $language_select .= '<option value="'.$language_tmp.'">'.$language_tmp.'</option>'; } } *************** *** 92,105 **** // select for dayview ! $view_select = ($cookie_view == 'day') ? '<option value="day" selected>{L_DAY}</option>' : '<option value="day">{L_DAY}</option>'; ! $view_select .= ($cookie_view == 'week') ? '<option value="week" selected>{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>'; ! $view_select .= ($cookie_view == 'month') ? '<option value="month" selected>{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>'; // select for time for ($i = 000; $i <= 1200; $i += 100) { $s = sprintf("%04d", $i); ! $time_select .= "<option value=\"$s\""; if ($s == $cookie_time) { ! $time_select .= " selected"; } $time_select .= ">$s</option>\n"; --- 92,105 ---- // select for dayview ! $view_select = ($cookie_view == 'day') ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>'; ! $view_select .= ($cookie_view == 'week') ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>'; ! $view_select .= ($cookie_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>'; // select for time for ($i = 000; $i <= 1200; $i += 100) { $s = sprintf("%04d", $i); ! $time_select .= '<option value="'.$s.'"'; if ($s == $cookie_time) { ! $time_select .= ' selected="selected"'; } $time_select .= ">$s</option>\n"; *************** *** 109,116 **** $i=0; foreach ($daysofweek_lang as $daysofweek) { ! if ($startdays[$i] == "$cookie_startday") { ! $startday_select .= "<option value=\"$startdays[$i]\" selected>$daysofweek</option>\n"; } else { ! $startday_select .= "<option value=\"$startdays[$i]\">$daysofweek</option>\n"; } $i++; --- 109,116 ---- $i=0; foreach ($daysofweek_lang as $daysofweek) { ! if ($startdays[$i] == $cookie_startday) { ! $startday_select .= '<option value="'.$startdays[$i].'" selected="selected">'.$daysofweek.'</option>'; } else { ! $startday_select .= '<option value="'.$startdays[$i].'">'.$daysofweek.'</option>'; } $i++; *************** *** 122,126 **** if (!is_file($file)) { $file_disp = ucfirst($file); ! $style_select .= ($file == "$cookie_style") ? "<option value=\"$file\" selected>$file_disp</option>\n" : "<option value=\"$file\">$file_disp</option>\n"; } } --- 122,126 ---- if (!is_file($file)) { $file_disp = ucfirst($file); ! $style_select .= ($file == "$cookie_style") ? "<option value=\"$file\" selected=\"selected\">$file_disp</option>\n" : "<option value=\"$file\">$file_disp</option>\n"; } } |
|
From: <cl...@us...> - 2004-05-16 07:06:21
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17475/templates/default Modified Files: default.css month_medium.tpl year.tpl Log Message: Year XHTML validation. Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** default.css 16 May 2004 05:39:26 -0000 1.17 --- default.css 16 May 2004 07:05:41 -0000 1.18 *************** *** 62,65 **** --- 62,68 ---- .monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } .monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } + .yearreg { background-color: #fff; height: 30px; width: 30px; text-align: left; vertical-align: top; } + .yearoff { background-color: #F2F2F2; height: 30px; width: 30px; text-align: left; vertical-align: top; } + .yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: left; vertical-align: top; } .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } .montheventline { border-right: 1px dotted #A1A5A9; } Index: month_medium.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_medium.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** month_medium.tpl 5 Feb 2004 07:06:11 -0000 1.4 --- month_medium.tpl 16 May 2004 07:05:41 -0000 1.5 *************** *** 12,26 **** </tr> <!-- loop monthweeks on --> ! <tr height="30"> <!-- 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"> {ALLDAY} {EVENT} --- 12,26 ---- </tr> <!-- loop monthweeks on --> ! <tr> <!-- loop monthdays on --> <!-- switch notthismonth on --> ! <td class="yearoff" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#F2F2F2'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate={DAYLINK}'"> ! <div align="right" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> </td> <!-- switch notthismonth off --> <!-- switch istoday on --> ! <td class="yearreg" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#FFFFFF'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate={DAYLINK}'"> ! <div align="right" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> ! <div align="center"> {ALLDAY} {EVENT} *************** *** 29,35 **** <!-- 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"> {ALLDAY} {EVENT} --- 29,35 ---- <!-- switch istoday off --> <!-- switch ismonth on --> ! <td class="yearreg" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#FFFFFF'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate={DAYLINK}'"> ! <div align="right" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> ! <div align="center"> {ALLDAY} {EVENT} Index: year.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/year.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** year.tpl 15 May 2004 02:42:17 -0000 1.5 --- year.tpl 16 May 2004 07:05:41 -0000 1.6 *************** *** 15,19 **** <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"> <font class="H20">{THIS_YEAR}</font> </td> --- 15,19 ---- <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="nowrap" valign="middle"> <font class="H20">{THIS_YEAR}</font> </td> |
|
From: <cl...@us...> - 2004-05-16 07:06:06
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17475 Modified Files: year.php Log Message: Year XHTML validation. Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** year.php 9 Feb 2004 00:51:48 -0000 1.29 --- year.php 16 May 2004 07:05:39 -0000 1.30 *************** *** 31,34 **** --- 31,35 ---- 'rss_valid' => '', 'todo_available' => '', + 'todo_js' => '', 'event_js' => '', 'this_year' => $this_year, |
|
From: <cl...@us...> - 2004-05-16 06:44:13
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13919/includes Modified Files: event.php Log Message: Fixed month_event_lines, month_bottom popups, and all-day language on event.php. Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** event.php 28 Jan 2004 07:27:23 -0000 1.26 --- event.php 16 May 2004 06:44:04 -0000 1.27 *************** *** 29,33 **** } if ($start == '' && $end == '' && (isset($start) && isset($end))) { ! $event_times = $all_day_lang; } --- 29,33 ---- } if ($start == '' && $end == '' && (isset($start) && isset($end))) { ! $event_times = $lang['l_all_day']; } |
|
From: <cl...@us...> - 2004-05-16 06:44:13
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13919/functions Modified Files: template.php Log Message: Fixed month_event_lines, month_bottom popups, and all-day language on event.php. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** template.php 16 May 2004 05:39:26 -0000 1.39 --- template.php 16 May 2004 06:44:04 -0000 1.40 *************** *** 698,702 **** $first_of_month = $minical_year.$minical_month."01"; $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); - $month_event_lines = 0; $i = 0; $whole_month = TRUE; --- 698,701 ---- *************** *** 800,804 **** $switch['START_TIME'] = $lang['l_all_day']; $switch['DESCRIPTION'] = urldecode($val['description']); ! $switch['EVENT_TEXT'] = openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); } else { $event_start = $val['start_unixtime']; --- 799,803 ---- $switch['START_TIME'] = $lang['l_all_day']; $switch['DESCRIPTION'] = urldecode($val['description']); ! $switch['EVENT_TEXT'] = openevent($switch['CALNAME'], '', '', $val, $month_event_lines, 15, '', '', 'psf', $switch['URL']); } else { $event_start = $val['start_unixtime']; *************** *** 807,811 **** $event_end = date($timeFormat, @strtotime ($event_end)); $switch['START_TIME'] = $event_start . ' - ' . $event_end; ! $switch['EVENT_TEXT'] = openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); $switch['DESCRIPTION'] = urldecode($val['description']); } --- 806,810 ---- $event_end = date($timeFormat, @strtotime ($event_end)); $switch['START_TIME'] = $event_start . ' - ' . $event_end; ! $switch['EVENT_TEXT'] = openevent($switch['CALNAME'], '', '', $val, 0, 15, '', '', 'psf', $switch['URL']); $switch['DESCRIPTION'] = urldecode($val['description']); } |
|
From: <cl...@us...> - 2004-05-16 05:39:35
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3973/templates/default Modified Files: calendar_nav.tpl default.css month.tpl month_large.tpl Log Message: Added RSS check, updated month for XHTML validation. Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** calendar_nav.tpl 15 May 2004 03:07:22 -0000 1.9 --- calendar_nav.tpl 16 May 2004 05:39:26 -0000 1.10 *************** *** 16,26 **** <td width="160" valign="top"> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> ! <tr height="20"> ! <td align="center" class="sideback"><b>{L_JUMP}</b></td> </tr> <tr> <td> <div style="padding: 5px;"> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> --- 16,26 ---- <td width="160" valign="top"> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> ! <tr> ! <td align="center" class="sideback"><div style="height:20px;"><b>{L_JUMP}</b></div></td> </tr> <tr> <td> <div style="padding: 5px;"> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> *************** *** 33,37 **** <!-- switch show_search off --> <!-- switch show_goto on --> ! <form style="margin-bottom:0;" action="day.php" method="GET"> <input type="hidden" name="cal" value="{URL_CAL}"> <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> --- 33,37 ---- <!-- switch show_search off --> <!-- switch show_goto on --> ! <form style="margin-bottom:0;" action="day.php" method="get"> <input type="hidden" name="cal" value="{URL_CAL}"> <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> *************** *** 56,61 **** <td width="160" valign="top"> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> ! <tr height="20"> ! <td align="center" class="sideback"><b>{CALENDAR_NAME}</b></td> </tr> <tr> --- 56,61 ---- <td width="160" valign="top"> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> ! <tr> ! <td align="center" class="sideback"><div style="height:20px;"><b>{CALENDAR_NAME}</b></div></td> </tr> <tr> Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** default.css 16 May 2004 04:13:28 -0000 1.16 --- default.css 16 May 2004 05:39:26 -0000 1.17 *************** *** 50,67 **** .eventbg { background-color: #6699CC; } - - /*.eventbg2 { background-color: #6699CC; border-right: 1px solid #fff; }*/ - - - .eventbg2week { background-color: #6699CC; border-right: 1px solid #A1A5A9; } - - .eventbg2week_1 { background-color: #6699CC; border-right: 1px solid #A1A5A9; } - .eventbg2week_2 { background-color: #666699; border-right: 1px solid #A1A5A9; } - .eventbg2week_3 { background-color: #999999; border-right: 1px solid #A1A5A9; } - .eventbg2week_4 { background-color: #6B84C7; border-right: 1px solid #A1A5A9; } - .eventbg2week_5 { background-color: #9999CC; border-right: 1px solid #A1A5A9; } - .eventbg2week_6 { background-color: #6876E7; border-right: 1px solid #A1A5A9; } - .eventbg2week_7 { background-color: #73738C; border-right: 1px solid #A1A5A9; } - .calborder { background-color: #fff; border: 1px #A1A5A9 solid; } .dateback { background-color: #eee; } --- 50,53 ---- *************** *** 73,79 **** .sideback { background-image: url(images/side_bg.gif); } .monthback { background-color: #A1A5A9; } ! .monthreg { background-color: #FFFFFF; } ! .monthoff { background-color: #F2F2F2; } ! .monthon { background-color: #F2F9FF; } .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } .montheventline { border-right: 1px dotted #A1A5A9; } --- 59,65 ---- .sideback { background-image: url(images/side_bg.gif); } .monthback { background-color: #A1A5A9; } ! .monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } ! .monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } ! .monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } .montheventline { border-right: 1px dotted #A1A5A9; } Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** month.tpl 15 May 2004 02:42:17 -0000 1.12 --- month.tpl 16 May 2004 05:39:26 -0000 1.13 *************** *** 3,7 **** <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> ! <td align="center" valign="middle" bgcolor="white"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> --- 3,7 ---- <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> ! <td align="center" valign="middle"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> *************** *** 42,46 **** <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> --- 42,46 ---- <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="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> *************** *** 53,57 **** <!-- loop showbottomevents_odd on --> <tr align="left" valign="top"> ! <td width="170" nowrap> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br /> <span class="V9G">{START_TIME}</span> --- 53,57 ---- <!-- loop showbottomevents_odd on --> <tr align="left" valign="top"> ! <td width="170" nowrap="nowrap"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br /> <span class="V9G">{START_TIME}</span> *************** *** 64,68 **** <!-- loop showbottomevents_even on --> <tr align="left" valign="top"> ! <td width="170" nowrap bgcolor="#EEEEEE"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br /> <span class="V9G">{START_TIME}</span> --- 64,68 ---- <!-- loop showbottomevents_even on --> <tr align="left" valign="top"> ! <td width="170" nowrap="nowrap" bgcolor="#EEEEEE"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br /> <span class="V9G">{START_TIME}</span> Index: month_large.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_large.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** month_large.tpl 2 Feb 2004 23:10:02 -0000 1.6 --- month_large.tpl 16 May 2004 05:39:26 -0000 1.7 *************** *** 8,15 **** </tr> <!-- loop monthweeks on --> ! <tr height="105"> <!-- loop monthdays on --> <!-- switch notthismonth on --> ! <td valign="top" align="left" class="monthoff" width="105" height="105"> <div align="right"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}"><font class="G10G">{DAY}</font></a> --- 8,15 ---- </tr> <!-- loop monthweeks on --> ! <tr> <!-- loop monthdays on --> <!-- switch notthismonth on --> ! <td class="monthoff"> <div align="right"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}"><font class="G10G">{DAY}</font></a> *************** *** 20,24 **** <!-- switch notthismonth off --> <!-- switch istoday on --> ! <td valign="top" align="left" class="monthon" width="105" height="105"> <div align="right"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> --- 20,24 ---- <!-- switch notthismonth off --> <!-- switch istoday on --> ! <td class="monthon"> <div align="right"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> *************** *** 29,33 **** <!-- switch istoday off --> <!-- switch ismonth on --> ! <td valign="top" align="left" class="monthreg" width="105" height="105"> <div align="right"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> --- 29,33 ---- <!-- switch istoday off --> <!-- switch ismonth on --> ! <td class="monthreg"> <div align="right"> <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> |
|
From: <cl...@us...> - 2004-05-16 05:39:34
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3973 Modified Files: month.php Log Message: Added RSS check, updated month for XHTML validation. Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** month.php 15 May 2004 23:56:18 -0000 1.117 --- month.php 16 May 2004 05:39:25 -0000 1.118 *************** *** 76,79 **** --- 76,80 ---- 'list_weeks' => $list_weeks, 'legend' => $list_calcolors, + 'current_view' => $current_view, 'style_select' => $style_select )); |
|
From: <cl...@us...> - 2004-05-16 05:39:34
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3973/functions Modified Files: template.php Log Message: Added RSS check, updated month for XHTML validation. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** template.php 16 May 2004 04:13:28 -0000 1.38 --- template.php 16 May 2004 05:39:26 -0000 1.39 *************** *** 868,872 **** function output() { ! global $template, $php_started, $lang; // Looks for {MONTH} before sending page out --- 868,872 ---- function output() { ! global $template, $php_started, $lang, $enable_rss; // Looks for {MONTH} before sending page out *************** *** 902,905 **** --- 902,910 ---- $generated = number_format(($php_ended-$php_started),3); $this->page = str_replace('{GENERATED}', $generated, $this->page); + if ($enable_rss != 'yes') { + $this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!is', '', $this->page); + } else { + $this->page = str_replace('{BASE}', BASE, $this->page); + } print($this->page); } |
|
From: <cl...@us...> - 2004-05-16 04:47:51
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/languages Modified Files: brazilian.inc.php english.inc.php Log Message: Language update. Index: brazilian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/brazilian.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** brazilian.inc.php 22 Nov 2003 03:45:33 -0000 1.7 --- brazilian.inc.php 16 May 2004 04:47:42 -0000 1.8 *************** *** 8,129 **** // Submit new translations to ch...@ch... ! $day_lang = 'Dia'; ! $week_lang = 'Semana'; ! $month_lang = 'Mês'; ! $year_lang = 'Ano'; ! $calendar_lang = 'Calendário'; ! $next_day_lang = 'Dia seguinte'; ! $next_month_lang = 'Mês seguinte'; ! $next_week_lang = 'Próxima semana'; ! $next_year_lang = 'Ano Seguinte'; ! $last_day_lang = 'Dia anterior'; ! $last_month_lang = 'Mês anterior'; ! $last_week_lang = 'Semana anterior'; ! $last_year_lang = 'Ano anterior'; ! $subscribe_lang = 'Assinar'; ! $download_lang = 'Download'; ! $powered_by_lang = 'Powered by'; ! $event_lang = 'Evento'; ! $event_start_lang = 'Hora de início'; ! $event_end_lang = 'Hora de fim'; ! $this_months_lang = 'Eventos deste mês'; ! $date_lang = 'Data'; ! $summary_lang = 'Sumário'; ! $all_day_lang = 'Evento dia todo'; ! $notes_lang = 'Notas'; ! $this_years_lang = 'Eventos deste ano'; ! $today_lang = 'Hoje'; ! $this_week_lang = 'Esta semana'; ! $this_month_lang = 'Este mês'; ! $jump_lang = 'Ir para'; ! $tomorrows_lang = 'Eventos para amanha'; ! $goday_lang = 'Ir para Hoje'; ! $goweek_lang = 'Ir para este semana'; ! $gomonth_lang = 'Ir para este mês'; ! $goyear_lang = 'Ir para este ano'; ! $search_lang = 'Buscar'; // the verb ! $results_lang = 'Buscar Resultados'; ! $query_lang = 'Questão: '; // will be followed by the search query ! $no_results_lang = 'Eventos não encontrados'; ! $goprint_lang = 'Versão para imprimir'; ! $time_lang = 'Hora'; ! $summary_lang = 'Resumo'; ! $description_lang = 'Descrição'; ! $this_site_is_lang = 'Esse site é'; ! $no_events_day_lang = 'Não há eventos para hoje.'; ! $no_events_week_lang = 'Não há eventos para esta semana.'; ! $no_events_month_lang = 'Não há eventos para esse mês.'; ! $rss_day_date = 'g:i A'; // Lists just the time ! $rss_week_date = '%b %e'; // Lists just the day ! $rss_month_date = '%b %e'; // Lists just the day ! $rss_language = 'en-us'; ! $search_took_lang = 'Search took %s seconds'; ! $recurring_event_lang = 'Recurring event'; ! $exception_lang = 'Exception'; ! $no_query_lang = 'No query given'; ! $preferences_lang = 'Preferences'; ! $printer_lang = 'Printer'; ! $select_lang_lang = 'Select your default language:'; ! $select_cal_lang = 'Select your default calendar:'; ! $select_view_lang = 'Select your default view:'; ! $select_time_lang = 'Select your default start time:'; ! $select_day_lang = 'Select your default start day of week:'; ! $select_style_lang = 'Select your default style:'; ! $set_prefs_lang = 'Set preferences'; ! $completed_date_lang = 'Completed on'; ! $completed_lang = 'Completed'; ! $created_lang = 'Created:'; ! $due_lang = 'Due:'; ! $priority_lang = 'Priority:'; ! $priority_high_lang = 'High'; ! $priority_low_lang = 'Low'; ! $priority_medium_lang = 'Medium'; ! $priority_none_lang = 'None'; ! $status_lang = 'Status:'; ! $todo_lang = 'To do items'; ! $unfinished_lang = 'Unfinished'; ! $prefs_set_lang = 'Your preferences have been set.'; ! $prefs_unset_lang = 'Preferences unset. Changes will take place next page load.'; ! $unset_prefs_lang = 'Unset preferences:'; ! $organizer_lang = 'Organizer'; ! $attendee_lang = 'Attendee'; ! $status_lang = 'Status'; ! $location_lang = 'Location'; ! $admin_header_lang = 'PHP iCalendar Administration'; ! $username_lang = 'Username'; ! $password_lang = 'Password'; ! $login_lang = 'Login'; ! $invalid_login_lang = 'Wrong username or password.'; ! $addupdate_cal_lang = 'Add or Update a Calendar'; ! $addupdate_desc_lang = 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.'; ! $delete_cal_lang = 'Delete a Calendar'; ! $logout_lang = 'Logout'; ! $cal_file_lang = 'Calendar File'; ! $php_error_lang = 'PHP Error'; ! $upload_error_gen_lang = 'There was a problem with your upload.'; ! $upload_error_lang[0] = 'There was a problem with your upload.'; ! $upload_error_lang[1] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[2] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[3] = 'The file you are trying upload was only partially uploaded.'; ! $upload_error_lang[4] = 'You must select a file for upload.'; ! $upload_error_type_lang = 'Only .ics files may be uploaded.'; ! $copy_error_lang = 'Failed to copy file'; ! $delete_error_lang = 'Failed to delete file'; ! $delete_success_lang = 'was deleted successfully.'; ! $action_success_lang = 'Your action was successful.'; ! $submit_lang = 'Submit'; ! $delete_lang = 'Delete'; ! // ----- New for 1.0 ! $all_cal_comb_lang = 'All calendars combined'; // - navigation ! $back_lang = 'Back'; ! $next_lang = 'Next'; ! $prev_lang = 'Prev'; ! $day_view_lang = 'Day View'; ! $week_view_lang = 'Week View'; ! $month_view_lang = 'Month View'; ! $year_view_lang = 'Year View'; // --------------------------------- --- 8,135 ---- // Submit new translations to ch...@ch... ! $lang['l_day'] = 'Dia'; ! $lang['l_week'] = 'Semana'; ! $lang['l_month'] = 'Mês'; ! $lang['l_year'] = 'Ano'; ! $lang['l_calendar'] = 'Calendário'; ! $lang['l_next_day'] = 'Dia seguinte'; ! $lang['l_next_month'] = 'Mês seguinte'; ! $lang['l_next_week'] = 'Próxima semana'; ! $lang['l_next_year'] = 'Ano Seguinte'; ! $lang['l_last_day'] = 'Dia anterior'; ! $lang['l_last_month'] = 'Mês anterior'; ! $lang['l_last_week'] = 'Semana anterior'; ! $lang['l_last_year'] = 'Ano anterior'; ! $lang['l_subscribe'] = 'Assinar'; ! $lang['l_download'] = 'Download'; ! $lang['l_powered_by'] = 'Powered by'; ! $lang['l_event'] = 'Evento'; ! $lang['l_event_start'] = 'Hora de início'; ! $lang['l_event_end'] = 'Hora de fim'; ! $lang['l_this_months'] = 'Eventos deste mês'; ! $lang['l_date'] = 'Data'; ! $lang['l_summary'] = 'Sumário'; ! $lang['l_all_day'] = 'Evento dia todo'; ! $lang['l_notes'] = 'Notas'; ! $lang['l_this_years'] = 'Eventos deste ano'; ! $lang['l_today'] = 'Hoje'; ! $lang['l_this_week'] = 'Esta semana'; ! $lang['l_this_month'] = 'Este mês'; ! $lang['l_jump'] = 'Ir para'; ! $lang['l_tomorrows'] = 'Eventos para amanha'; ! $lang['l_goday'] = 'Ir para Hoje'; ! $lang['l_goweek'] = 'Ir para este semana'; ! $lang['l_gomonth'] = 'Ir para este mês'; ! $lang['l_goyear'] = 'Ir para este ano'; ! $lang['l_search'] = 'Buscar'; // the verb ! $lang['l_results'] = 'Buscar Resultados'; ! $lang['l_query'] = 'Questão: '; // will be followed by the search query ! $lang['l_no_results'] = 'Eventos não encontrados'; ! $lang['l_goprint'] = 'Versão para imprimir'; ! $lang['l_time'] = 'Hora'; ! $lang['l_summary'] = 'Resumo'; ! $lang['l_description'] = 'Descrição'; ! $lang['l_this_site_is'] = 'Esse site é'; ! $lang['l_no_events_day'] = 'Não há eventos para hoje.'; ! $lang['l_no_events_week'] = 'Não há eventos para esta semana.'; ! $lang['l_no_events_month'] = 'Não há eventos para esse mês.'; ! $lang['l_rss_day_date'] = 'g:i A'; // Lists just the time ! $lang['l_rss_week_date'] = '%b %e'; // Lists just the day ! $lang['l_rss_month_date'] = '%b %e'; // Lists just the day ! $lang['l_rsslanguage'] = 'en-us'; ! $lang['l_search_took'] = 'Search took %s seconds'; ! $lang['l_recurring_event'] = 'Recurring event'; ! $lang['l_exception'] = 'Exception'; ! $lang['l_no_query'] = 'No query given'; ! $lang['l_preferences'] = 'Preferences'; ! $lang['l_printer'] = 'Printer'; ! $lang['l_select_lang'] = 'Select your default language:'; ! $lang['l_select_cal'] = 'Select your default calendar:'; ! $lang['l_select_view'] = 'Select your default view:'; ! $lang['l_select_time'] = 'Select your default start time:'; ! $lang['l_select_day'] = 'Select your default start day of week:'; ! $lang['l_select_style'] = 'Select your default style:'; ! $lang['l_set_prefs'] = 'Set preferences'; ! $lang['l_completed_date'] = 'Completed on'; ! $lang['l_completed'] = 'Completed'; ! $lang['l_created'] = 'Created:'; ! $lang['l_due'] = 'Due:'; ! $lang['l_priority'] = 'Priority:'; ! $lang['l_priority_high'] = 'High'; ! $lang['l_priority_low'] = 'Low'; ! $lang['l_priority_medium'] = 'Medium'; ! $lang['l_priority_none'] = 'None'; ! $lang['l_status'] = 'Status:'; ! $lang['l_todo'] = 'To do items'; ! $lang['l_unfinished'] = 'Unfinished'; ! $lang['l_prefs_set'] = 'Your preferences have been set.'; ! $lang['l_prefs_unset'] = 'Preferences unset. Changes will take place next page load.'; ! $lang['l_unset_prefs'] = 'Unset preferences:'; ! $lang['l_organizer'] = 'Organizer'; ! $lang['l_attendee'] = 'Attendee'; ! $lang['l_status'] = 'Status'; ! $lang['l_location'] = 'Location'; ! $lang['l_admin_header'] = 'PHP iCalendar Administration'; ! $lang['l_username'] = 'Username'; ! $lang['l_password'] = 'Password'; ! $lang['l_login'] = 'Login'; ! $lang['l_invalid_login'] = 'Wrong username or password.'; ! $lang['l_addupdate_cal'] = 'Add or Update a Calendar'; ! $lang['l_addupdate_desc'] = 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.'; ! $lang['l_delete_cal'] = 'Delete a Calendar'; ! $lang['l_logout'] = 'Logout'; ! $lang['l_cal_file'] = 'Calendar File'; ! $lang['l_php_error'] = 'PHP Error'; ! $lang['l_upload_error_gen'] = 'There was a problem with your upload.'; ! $lang['l_upload_error'][0] = 'There was a problem with your upload.'; ! $lang['l_upload_error'][1] = 'The file you are trying to upload is too big.'; ! $lang['l_upload_error'][2] = 'The file you are trying to upload is too big.'; ! $lang['l_upload_error'][3] = 'The file you are trying upload was only partially uploaded.'; ! $lang['l_upload_error'][4] = 'You must select a file for upload.'; ! $lang['l_upload_error_type'] = 'Only .ics files may be uploaded.'; ! $lang['l_copy_error'] = 'Failed to copy file'; ! $lang['l_delete_error'] = 'Failed to delete file'; ! $lang['l_delete_success'] = 'was deleted successfully.'; ! $lang['l_action_success'] = 'Your action was successful.'; ! $lang['l_submit'] = 'Submit'; ! $lang['l_delete'] = 'Delete'; ! $all_cal_comb_lang = 'All combined'; ! // New for 2.0 ! $lang['l_legend'] = 'Legend'; ! $lang['l_admin_subhead'] = 'Manage your calendars from this page'; ! $lang['l_prefs_subhead'] = 'Sets a cookie for visiting this site'; ! $lang['l_rss_info'] = 'RSS Information'; ! $lang['l_rss_subhead'] = 'Basic RSS feeds available for each calendar'; ! $lang['l_rss_notenabled'] = 'RSS is not enabled on this site'; // - navigation ! $lang['l_back'] = 'Back'; ! $lang['l_next'] = 'Next'; ! $lang['l_prev'] = 'Prev'; ! $lang['l_day_view'] = 'Day View'; ! $lang['l_week_view'] = 'Week View'; ! $lang['l_month_view'] = 'Month View'; ! $lang['l_year_view'] = 'Year View'; // --------------------------------- *************** *** 185,196 **** // Error messages - %s will be replaced with a variable ! $error_title_lang = 'Erro!'; ! $error_window_lang = 'Aconteceu um erro!'; ! $error_calendar_lang = 'O calendário "%s" estava sendo processado quando ocorreu este erro.'; ! $error_path_lang = 'Não foi possível abrir: "%s"'; ! $error_back_lang = 'Por favor use o botão de "Back" para voltar.'; ! $error_remotecal_lang = 'Este servidor bloqueia calendários remotos que nao foram aprovados.'; ! $error_restrictedcal_lang = 'Tentou acessar um calendário o qual é restrito o acesso neste servidor.'; ! $error_invalidcal_lang = 'Arquivo de calendário inválido. Por favor tente usar outro calendário.'; ?> --- 191,202 ---- // Error messages - %s will be replaced with a variable ! $lang['l_error_title'] = 'Erro!'; ! $lang['l_error_window'] = 'Aconteceu um erro!'; ! $lang['l_error_calendar'] = 'O calendário "%s" estava sendo processado quando ocorreu este erro.'; ! $lang['l_error_path'] = 'Não foi possível abrir: "%s"'; ! $lang['l_error_back'] = 'Por favor use o botão de "Back" para voltar.'; ! $lang['l_error_remotecal'] = 'Este servidor bloqueia calendários remotos que nao foram aprovados.'; ! $lang['l_error_restrictedcal'] = 'Tentou acessar um calendário o qual é restrito o acesso neste servidor.'; ! $lang['l_error_invalidcal'] = 'Arquivo de calendário inválido. Por favor tente usar outro calendário.'; ?> Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** english.inc.php 9 Feb 2004 00:51:48 -0000 1.55 --- english.inc.php 16 May 2004 04:47:42 -0000 1.56 *************** *** 105,111 **** $upload_error_lang[1] = 'The file you are trying to upload is too big.'; $upload_error_lang[2] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[3] = 'The file you are trying upload was only partially uploaded.'; ! $upload_error_lang[4] = 'You must select a file for upload.'; ! $lang['l_upload_error_type'] = 'Only .ics files may be uploaded.'; $lang['l_copy_error'] = 'Failed to copy file'; $lang['l_delete_error'] = 'Failed to delete file'; --- 105,111 ---- $upload_error_lang[1] = 'The file you are trying to upload is too big.'; $upload_error_lang[2] = 'The file you are trying to upload is too big.'; ! $upload_error_lang[3] = 'The file you are trying upload was only partially uploaded.'; ! $upload_error_lang[4] = 'You must select a file for upload.'; ! $lang['l_upload_error_type'] = 'Only .ics files may be uploaded.'; $lang['l_copy_error'] = 'Failed to copy file'; $lang['l_delete_error'] = 'Failed to delete file'; *************** *** 114,118 **** $lang['l_submit'] = 'Submit'; $lang['l_delete'] = 'Delete'; ! $all_cal_comb_lang = 'All Combined'; // New for 2.0 --- 114,118 ---- $lang['l_submit'] = 'Submit'; $lang['l_delete'] = 'Delete'; ! $all_cal_comb_lang = 'All Combined'; // New for 2.0 *************** *** 189,200 **** // Error messages - %s will be replaced with a variable ! $lang['l_error_title'] = 'Error!'; ! $lang['l_error_window'] = 'There was an error!'; ! $lang['l_error_calendar'] = 'The calendar "%s" was being processed when this error occurred.'; ! $lang['l_error_path'] = 'Unable to open the path: "%s"'; ! $lang['l_error_back'] = 'Please use the "Back" button to return.'; ! $lang['l_error_remotecal'] = 'This server blocks remote calendars which have not been approved.'; ! $lang['l_error_restrictedcal'] = 'You have tried to access a calendar that is restricted on this server.'; ! $lang['l_error_invalidcal'] = 'Invalid calendar file. Please try a different calendar.'; ?> --- 189,200 ---- // Error messages - %s will be replaced with a variable ! $lang['l_error_title'] = 'Error!'; ! $lang['l_error_window'] = 'There was an error!'; ! $lang['l_error_calendar'] = 'The calendar "%s" was being processed when this error occurred.'; ! $lang['l_error_path'] = 'Unable to open the path: "%s"'; ! $lang['l_error_back'] = 'Please use the "Back" button to return.'; ! $lang['l_error_remotecal'] = 'This server blocks remote calendars which have not been approved.'; ! $lang['l_error_restrictedcal'] = 'You have tried to access a calendar that is restricted on this server.'; ! $lang['l_error_invalidcal'] = 'Invalid calendar file. Please try a different calendar.'; ?> |
|
From: <cl...@us...> - 2004-05-16 04:13:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/functions Modified Files: template.php Log Message: Fixed week template, streamlined CSS. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** template.php 15 May 2004 23:56:19 -0000 1.37 --- template.php 16 May 2004 04:13:28 -0000 1.38 *************** *** 62,66 **** function draw_week($template_p) { ! global $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength; for ($i=0; $i<7; $i++) { --- 62,85 ---- function draw_week($template_p) { ! global $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength, $timeFormat_small; ! ! // Figure out colspans ! $dayborder = 0; ! $thisdate = $start_week_time; ! $swt = $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)); ! } for ($i=0; $i<7; $i++) { *************** *** 68,72 **** $weekarray[$i] = $thisdate; $start_week_time = strtotime('+1 day', $start_week_time); ! } // Replaces the allday events --- 87,91 ---- $weekarray[$i] = $thisdate; $start_week_time = strtotime('+1 day', $start_week_time); ! } // Replaces the allday events *************** *** 78,82 **** $loop_end = trim($match3[1]); foreach ($weekarray as $key => $get_date) { ! $replace = $loop_begin; if (is_array($master_array[$get_date]['-1'])) { foreach ($master_array[$get_date]['-1'] as $allday) { --- 97,103 ---- $loop_end = trim($match3[1]); foreach ($weekarray as $key => $get_date) { ! $replace = $loop_begin; ! $colspan = 'colspan="'.$nbrGridCols[$get_date].'"'; ! $replace = str_replace('{COLSPAN}', $colspan, $replace); if (is_array($master_array[$get_date]['-1'])) { foreach ($master_array[$get_date]['-1'] as $allday) { *************** *** 122,130 **** $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; } --- 143,150 ---- $start_day = strtotime("+1 day", $start_day); $start_wt = strtotime("+1 day", $start_wt); ! $colspan = 'colspan="'.$nbrGridCols[$daylink].'"'; ! $search = array('{DAY}', '{DAYLINK}', '{ROW1}', '{ROW2}', '{ROW3}', '{COLSPAN}'); ! $replace = array($weekday, $daylink, $row1, $row2, $row3, $colspan); ! $loop_tmp = str_replace($search, $replace, $loop_dof); $weekday_loop .= $loop_tmp; } *************** *** 132,151 **** // Build the body - $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)); - } preg_match("!<\!-- loop row on -->(.*)<\!-- loop row off -->!is", $this->page, $match2); preg_match("!<\!-- loop event on -->(.*)<\!-- loop event off -->!is", $this->page, $match3); --- 152,155 ---- *************** *** 159,163 **** $this_month = $day_array2[2]; $this_year = $day_array2[1]; ! $thisdate = $start_week_time; for ($i=0;$i<7;$i++) { $thisday = date("Ymd", $thisdate); --- 163,167 ---- $this_month = $day_array2[2]; $this_year = $day_array2[1]; ! $thisdate = $swt; for ($i=0;$i<7;$i++) { $thisday = date("Ymd", $thisdate); *************** *** 174,186 **** if (ereg("([0-9]{1,2}):00", $key)) { $weekdisplay .= '<tr>'; ! $weekdisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; } elseif ($cal_time == $day_start) { $size_tmp = 60 - (int)substr($cal_time,2,2); $weekdisplay .= '<tr>'; ! $weekdisplay .= '<td rowspan="' . ($size_tmp / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; } else { - $weekdisplay .= '<tr>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; --- 178,189 ---- if (ereg("([0-9]{1,2}):00", $key)) { $weekdisplay .= '<tr>'; ! $weekdisplay .= '<td colspan="4" rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; } elseif ($cal_time == $day_start) { $size_tmp = 60 - (int)substr($cal_time,2,2); $weekdisplay .= '<tr>'; ! $weekdisplay .= '<td colspan="4" rowspan="' . ($size_tmp / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; } else { $weekdisplay .= '<tr>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; *************** *** 188,192 **** // initialize $thisdate again ! $thisdate = $start_week_time; // loop this part 7 times, one for each day --- 191,195 ---- // initialize $thisdate again ! $thisdate = $swt; // loop this part 7 times, one for each day *************** *** 241,245 **** } ! $weekdisplay .= "<td colspan=\"" . $nbrGridCols[$thisday] . "\" $class> </td>\n"; } else { --- 244,250 ---- } ! $drawWidth = 1; ! $colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth); ! $weekdisplay .= "<td width=\"$colspan_width\" colspan=\"" . $nbrGridCols[$thisday] . "\" $class> </td>\n"; } else { *************** *** 253,257 **** $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']); --- 258,262 ---- $event_length[$thisday][$i]["state"] = "started"; $event_start = $this_time_arr[($event_length[$thisday][$i]["key"])]["start_unixtime"]; ! $event_start = date ($timeFormat_small, $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']); *************** *** 261,265 **** $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; } ! $weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; --- 266,271 ---- $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; } ! $colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth); ! $weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; *************** *** 357,365 **** $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; } --- 363,369 ---- $start_day = strtotime("+1 day", $start_day); $start_wt = strtotime("+1 day", $start_wt); ! $search = array('{DAY}', '{DAYLINK}', '{ROW1}', '{ROW2}', '{ROW3}'); ! $replace = array($weekday, $daylink, $row1, $row2, $row3); ! $loop_tmp = str_replace($search, $replace, $loop_dof); $weekday_loop .= $loop_tmp; } *************** *** 527,531 **** 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); --- 531,535 ---- function tomorrows_events() { ! global $template, $getdate, $master_array, $next_day, $timeFormat, $tomorrows_events_lines; preg_match("!<\!-- switch t_allday on -->(.*)<\!-- switch t_allday off -->!is", $this->page, $match1); *************** *** 572,576 **** 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); --- 576,580 ---- function get_vtodo() { ! global $template, $getdate, $master_array, $next_day, $timeFormat, $tomorrows_events_lines; preg_match("!<\!-- switch show_completed on -->(.*)<\!-- switch show_completed off -->!is", $this->page, $match1); |
|
From: <cl...@us...> - 2004-05-16 04:13:36
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/templates/default Modified Files: default.css week.tpl Log Message: Fixed week template, streamlined CSS. Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** default.css 13 May 2004 18:38:15 -0000 1.15 --- default.css 16 May 2004 04:13:28 -0000 1.16 *************** *** 83,110 **** /* This is the main link style */ a.psf { text-decoration: none; } ! a.psf:link { color: #0066FF; background-color: transparent; } ! a.psf:visited { color: #0066FF; background-color: transparent; } ! a.psf:active { color: #3366CC; background-color: transparent; } ! a.psf:hover { color: #000099; background-color: transparent; } /* This is the link style for the mini-cals */ a.ps2 { text-decoration: underline; } ! a.ps2:link { color: #0066FF; background-color: transparent; } ! a.ps2:visited { color: #0066FF; background-color: transparent; } ! a.ps2:active { color: #3366CC; background-color: transparent; } ! a.ps2:hover { color: #000099; background-color: transparent; } /* This is the link style for year months */ a.ps3 { text-decoration: none; } ! a.ps3:link { color: #000; background-color: transparent; } ! a.ps3:visited { color: #000; background-color: transparent; } ! a.ps3:active { color: #000; background-color: transparent; } ! a.ps3:hover { color: #000; background-color: transparent; } /* This is the link style for events */ a.ps { text-decoration: none; } ! a.ps:link { color: #fff; background-color: transparent; } ! a.ps:visited { color: #fff; background-color: transparent; } ! a.ps:active { color: #fff; background-color: transparent; } a.ps:hover { color: #fff; text-decoration: underline; } --- 83,110 ---- /* This is the main link style */ a.psf { text-decoration: none; } ! a.psf:link { color: #0066FF; } ! a.psf:visited { color: #0066FF; } ! a.psf:active { color: #3366CC; } ! a.psf:hover { color: #000099; text-decoration: underline; } /* This is the link style for the mini-cals */ a.ps2 { text-decoration: underline; } ! a.ps2:link { color: #0066FF; } ! a.ps2:visited { color: #0066FF; } ! a.ps2:active { color: #3366CC; } ! a.ps2:hover { color: #000099; } /* This is the link style for year months */ a.ps3 { text-decoration: none; } ! a.ps3:link { color: #000; } ! a.ps3:visited { color: #000; } ! a.ps3:active { color: #000; } ! a.ps3:hover { color: #000; text-decoration: underline; } /* This is the link style for events */ a.ps { text-decoration: none; } ! a.ps:link { color: #fff; } ! a.ps:visited { color: #fff; } ! a.ps:active { color: #fff; } a.ps:hover { color: #fff; text-decoration: underline; } Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** week.tpl 14 May 2004 05:42:31 -0000 1.6 --- week.tpl 16 May 2004 04:13:28 -0000 1.7 *************** *** 45,50 **** <div class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={NEXT_WEEK}">»</a> </div> </td> <!-- loop daysofweek on --> ! <td width="80" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='week.php?cal={CAL}&getdate={DAYLINK}'"> <a class="ps3" href="day.php?cal={CAL}&getdate={DAYLINK}"><span class="V9BOLD">{DAY}</span></a> </td> --- 45,51 ---- <div class="V12"><a class="psf" href="week.php?cal={CAL}&getdate={NEXT_WEEK}">»</a> </div> </td> + <td width="1"></td> <!-- loop daysofweek on --> ! <td width="80" {COLSPAN} align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='week.php?cal={CAL}&getdate={DAYLINK}'"> <a class="ps3" href="day.php?cal={CAL}&getdate={DAYLINK}"><span class="V9BOLD">{DAY}</span></a> </td> *************** *** 52,61 **** </tr> <tr valign="top"> ! <td width="60" class="rowOff2" colspan="4"> <!-- loop alldaysofweek on --> ! <td width="80" class="rowOff"> <!-- loop allday on --> <div class="alldaybg_{CALNO}"> <b>{EVENT}</b> </div> <!-- loop allday off --> --- 53,64 ---- </tr> <tr valign="top"> ! <td width="60" class="rowOff2" colspan="4"><img src="images/spacer.gif" width="60" height="1" alt=" " /></td> ! <td width="1"></td> <!-- loop alldaysofweek on --> ! <td width="80" {COLSPAN} class="rowOff"> <!-- loop allday on --> <div class="alldaybg_{CALNO}"> <b>{EVENT}</b> + <img src="images/spacer.gif" width="80" height="1" alt=" " /> </div> <!-- loop allday off --> *************** *** 63,68 **** <!-- loop alldaysofweek off --> </tr> - </table> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> <!-- loop row on --> <tr> --- 66,69 ---- *************** *** 106,110 **** </td> <td width="10"> ! <img src="images/spacer.gif" width="10" height="1" alt=" "> </td> <td width="170" valign="top"> --- 107,111 ---- </td> <td width="10"> ! <img src="images/spacer.gif" width="10" height="1" alt=" " /> </td> <td width="170" valign="top"> |
|
From: <cl...@us...> - 2004-05-15 23:56:28
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12793/functions Modified Files: template.php Log Message: Subscribe and Download links work on all templates. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** template.php 15 May 2004 02:42:15 -0000 1.36 --- template.php 15 May 2004 23:56:19 -0000 1.37 *************** *** 5,8 **** --- 5,20 ---- class Page { var $page; + function draw_subscribe($template_p) { + global $template, $getdate, $cal, $ALL_CALENDARS_COMBINED, $subscribe_path, $download_filename; + preg_match("!<\!-- switch display_download on -->(.*)<\!-- switch display_download off -->!is", $this->page, $match1); + $subscribe = trim($match2[1]); + if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') { + $this->page = str_replace('{SUBSCRIBE_PATH}', $subscribe_path, $this->page); + $this->page = str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page); + } else { + $this->page = preg_replace('!<\!-- switch display_download on -->(.*)<\!-- switch display_download off -->!is', '', $this->page); + } + } + function draw_print($template_p) { global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day; |
|
From: <cl...@us...> - 2004-05-15 23:56:28
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12793 Modified Files: day.php month.php week.php Log Message: Subscribe and Download links work on all templates. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** day.php 15 May 2004 03:29:57 -0000 1.113 --- day.php 15 May 2004 23:56:17 -0000 1.114 *************** *** 81,84 **** --- 81,85 ---- $page->tomorrows_events($this->page); $page->get_vtodo($this->page); + $page->draw_subscribe($this->page); $page->output(); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** month.php 9 Feb 2004 00:51:48 -0000 1.116 --- month.php 15 May 2004 23:56:18 -0000 1.117 *************** *** 80,83 **** --- 80,84 ---- $page->monthbottom($this->page); + $page->draw_subscribe($this->page); $page->output(); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** week.php 15 May 2004 03:29:58 -0000 1.111 --- week.php 15 May 2004 23:56:18 -0000 1.112 *************** *** 86,89 **** --- 86,90 ---- $page->tomorrows_events($this->page); $page->get_vtodo($this->page); + $page->draw_subscribe($this->page); $page->output(); |
|
From: <jo...@us...> - 2004-05-15 03:30:16
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9762 Modified Files: day.php week.php Log Message: Corrected check for $allow_login configuration flag. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** day.php 14 May 2004 21:09:16 -0000 1.112 --- day.php 15 May 2004 03:29:57 -0000 1.113 *************** *** 36,40 **** // login/logout $is_logged_in = ($username != '' && !$invalid_login) ? true : false; ! $show_user_login = (!$is_logged_in && $allow_login); $login_querys = login_querys(); $logout_querys = logout_querys(); --- 36,40 ---- // login/logout $is_logged_in = ($username != '' && !$invalid_login) ? true : false; ! $show_user_login = (!$is_logged_in && $allow_login == 'yes'); $login_querys = login_querys(); $logout_querys = logout_querys(); *************** *** 84,86 **** $page->output(); ! ?> \ No newline at end of file --- 84,86 ---- $page->output(); ! ?> Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** week.php 14 May 2004 21:09:16 -0000 1.110 --- week.php 15 May 2004 03:29:58 -0000 1.111 *************** *** 39,43 **** // login/logout $is_logged_in = ($username != '' && !$invalid_login) ? true : false; ! $show_user_login = (!$is_logged_in && $allow_login); $login_querys = login_querys(); $logout_querys = logout_querys(); --- 39,43 ---- // login/logout $is_logged_in = ($username != '' && !$invalid_login) ? true : false; ! $show_user_login = (!$is_logged_in && $allow_login == 'yes'); $login_querys = login_querys(); $logout_querys = logout_querys(); *************** *** 89,91 **** $page->output(); ! ?> \ No newline at end of file --- 89,91 ---- $page->output(); ! ?> |
