From 980dbb40bb2cb239f127f8718cd9502ac0498e8b Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Mon, 29 Dec 2008 08:20:52 +0000 Subject: change version for release --- calendars/US Holidays.ics | 2 +- default_config.php | 2 +- functions/template.php | 2 +- templates/default/month_medium.tpl | 8 ++++---- templates/default/rss_index.tpl | 8 ++++---- templates/green/day.tpl | 2 +- templates/green/month.tpl | 2 +- templates/grey/day.tpl | 2 +- templates/grey/month.tpl | 2 +- templates/red/day.tpl | 2 +- templates/red/month.tpl | 2 +- templates/tan/day.tpl | 2 +- templates/tan/month.tpl | 2 +- year.php | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/calendars/US Holidays.ics b/calendars/US Holidays.ics index f9e20bc..d800f6e 100644 --- a/calendars/US Holidays.ics +++ b/calendars/US Holidays.ics @@ -355,7 +355,7 @@ TRANSP:OPAQUE UID:862A217C-131B-41C8-944D-442B97D2AF3D DTSTART;VALUE=DATE:19970120 DTSTAMP:20050930T230748Z -SUMMARY:Martin Luther King\, Jr's Davy +SUMMARY:Martin Luther King\, Jr's Day CREATED:20081223T190054Z DTEND;VALUE=DATE:19970121 RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=1;BYDAY=3MO diff --git a/default_config.php b/default_config.php index 397443c..4eeadc4 100644 --- a/default_config.php +++ b/default_config.php @@ -2,7 +2,7 @@ class Configs{ private static $instance; private function __construct(){ - $this->phpicalendar_version = '2.3rc1.7'; + $this->phpicalendar_version = '2.3'; // Configuration file for PHP iCalendar 2.25rc1 // // To set values, change the text between the single quotes diff --git a/functions/template.php b/functions/template.php index 62bd9e4..dc43af2 100644 --- a/functions/template.php +++ b/functions/template.php @@ -978,7 +978,7 @@ class Page { $switch['ALLDAY'] .= (isset($val['location']) && $val['location'] != '') ? $val['location']."
" : ''; $switch['ALLDAY'] .= ''; } else { - $switch['ALLDAY'] .= ' '; + $switch['ALLDAY'] = ' '; } } else { $start2 = date($timeFormat_small, $val['start_unixtime']); diff --git a/templates/default/month_medium.tpl b/templates/default/month_medium.tpl index 96e8e6b..8088a0e 100644 --- a/templates/default/month_medium.tpl +++ b/templates/default/month_medium.tpl @@ -22,8 +22,8 @@ {DAY}
- {ALLDAY} - {EVENT} + {ALLDAY} + {EVENT}
@@ -31,8 +31,8 @@ {DAY}
- {ALLDAY} - {EVENT} + {ALLDAY} + {EVENT}
diff --git a/templates/default/rss_index.tpl b/templates/default/rss_index.tpl index fac312f..3f76e96 100644 --- a/templates/default/rss_index.tpl +++ b/templates/default/rss_index.tpl @@ -13,10 +13,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/green/day.tpl b/templates/green/day.tpl index d0bcef2..a1db506 100644 --- a/templates/green/day.tpl +++ b/templates/green/day.tpl @@ -13,7 +13,7 @@
- + diff --git a/templates/green/month.tpl b/templates/green/month.tpl index 6b64f1a..7dcff53 100644 --- a/templates/green/month.tpl +++ b/templates/green/month.tpl @@ -12,7 +12,7 @@ - +
{L_DAY}{L_DAY} {L_WEEK} {L_MONTH} {L_YEAR}
{L_DAY} {L_WEEK}{L_MONTH}{L_MONTH} {L_YEAR}
diff --git a/templates/grey/day.tpl b/templates/grey/day.tpl index d0bcef2..a1db506 100644 --- a/templates/grey/day.tpl +++ b/templates/grey/day.tpl @@ -13,7 +13,7 @@
- + diff --git a/templates/grey/month.tpl b/templates/grey/month.tpl index 6b64f1a..7dcff53 100644 --- a/templates/grey/month.tpl +++ b/templates/grey/month.tpl @@ -12,7 +12,7 @@ - +
{L_DAY}{L_DAY} {L_WEEK} {L_MONTH} {L_YEAR}
{L_DAY} {L_WEEK}{L_MONTH}{L_MONTH} {L_YEAR}
diff --git a/templates/red/day.tpl b/templates/red/day.tpl index d0bcef2..a1db506 100644 --- a/templates/red/day.tpl +++ b/templates/red/day.tpl @@ -13,7 +13,7 @@
- + diff --git a/templates/red/month.tpl b/templates/red/month.tpl index 6b64f1a..7dcff53 100644 --- a/templates/red/month.tpl +++ b/templates/red/month.tpl @@ -12,7 +12,7 @@ - +
{L_DAY}{L_DAY} {L_WEEK} {L_MONTH} {L_YEAR}
{L_DAY} {L_WEEK}{L_MONTH}{L_MONTH} {L_YEAR}
diff --git a/templates/tan/day.tpl b/templates/tan/day.tpl index d0bcef2..a1db506 100644 --- a/templates/tan/day.tpl +++ b/templates/tan/day.tpl @@ -13,7 +13,7 @@
- + diff --git a/templates/tan/month.tpl b/templates/tan/month.tpl index 6b64f1a..7dcff53 100644 --- a/templates/tan/month.tpl +++ b/templates/tan/month.tpl @@ -12,7 +12,7 @@ - +
{L_DAY}{L_DAY} {L_WEEK} {L_MONTH} {L_YEAR}
{L_DAY} {L_WEEK}{L_MONTH}{L_MONTH} {L_YEAR}
diff --git a/year.php b/year.php index 6a0a6d0..9d5564d 100644 --- a/year.php +++ b/year.php @@ -4,7 +4,6 @@ $current_view = 'year'; require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); -header("Content-Type: text/html; charset=$phpiCal_config->charset"); ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); $this_day = $day_array2[3]; @@ -46,6 +45,7 @@ $page = new Page(BASE.'templates/'.$template.'/year.tpl'); $page->replace_files(array( 'header' => BASE.'templates/'.$template.'/header.tpl', + 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', 'sidebar' => BASE.'templates/'.$template.'/sidebar_year.tpl', 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' -- cgit v1.2.3