From 2e0dde77d8a86e895302c4804023f747e987c9f8 Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Mon, 29 Dec 2008 05:23:46 +0000 Subject: tooltips for view nav icons --- functions/ical_parser.php | 4 +++- rss/rss_common.php | 7 ++++++- templates/default/day.tpl | 8 ++++---- templates/default/month.tpl | 8 ++++---- templates/default/preferences.tpl | 8 ++++---- templates/default/print.tpl | 8 ++++---- templates/default/search.tpl | 8 ++++---- templates/default/week.tpl | 8 ++++---- templates/default/year.tpl | 12 ++++++------ templates/green/day.tpl | 8 ++++---- templates/green/month.tpl | 8 ++++---- templates/green/print.tpl | 11 ++++++----- templates/green/search.tpl | 10 +++++----- templates/green/year.tpl | 12 ++++++------ templates/grey/day.tpl | 8 ++++---- templates/grey/event.tpl | 7 +++++-- templates/grey/month.tpl | 8 ++++---- templates/grey/print.tpl | 11 ++++++----- templates/grey/search.tpl | 10 +++++----- templates/grey/year.tpl | 12 ++++++------ templates/red/day.tpl | 8 ++++---- templates/red/month.tpl | 8 ++++---- templates/red/print.tpl | 11 ++++++----- templates/red/search.tpl | 10 +++++----- templates/red/year.tpl | 12 ++++++------ templates/tan/day.tpl | 8 ++++---- templates/tan/event.tpl | 7 +++++-- templates/tan/month.tpl | 8 ++++---- templates/tan/print.tpl | 10 +++++----- templates/tan/search.tpl | 10 +++++----- templates/tan/year.tpl | 12 ++++++------ 31 files changed, 148 insertions(+), 132 deletions(-) diff --git a/functions/ical_parser.php b/functions/ical_parser.php index cafcd0a..d79ba20 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -203,7 +203,9 @@ foreach ($cal_filelist as $cal_key=>$filename) { 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, - 'calname' => $actual_calname); + 'calname' => $actual_calname, + 'url' => $url + ); unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; break; diff --git a/rss/rss_common.php b/rss/rss_common.php index e36ceba..73d704f 100644 --- a/rss/rss_common.php +++ b/rss/rss_common.php @@ -42,9 +42,14 @@ if (isset($_GET['getdate']) && $_GET['getdate'] !=''){ switch ($rssview){ case 'day': $fromdate = $getdate; - $todate = $getdate; + $todate = date("Ymd", strtotime($getdate) + 60*60*24); $theview = $lang['l_day']; break; + case 'tomorrow': + $fromdate = date("Ymd",strtotime('tomorrow')); + $todate = date("Ymd", strtotime('tomorrow') + 60*60*24); + $theview = $lang['l_tomorrows'] ; + break; case 'week': $fromdate = dateOfWeek($getdate, 'Sunday'); $todate = date("Ymd", strtotime($fromdate) + 6*24*60*60); diff --git a/templates/default/day.tpl b/templates/default/day.tpl index ae7598c..d0bcef2 100644 --- a/templates/default/day.tpl +++ b/templates/default/day.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/default/month.tpl b/templates/default/month.tpl index 8466d7a..6b64f1a 100644 --- a/templates/default/month.tpl +++ b/templates/default/month.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/default/preferences.tpl b/templates/default/preferences.tpl index 4ffc22b..51fc37c 100644 --- a/templates/default/preferences.tpl +++ b/templates/default/preferences.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/default/print.tpl b/templates/default/print.tpl index 1aa8be3..a2d6a70 100644 --- a/templates/default/print.tpl +++ b/templates/default/print.tpl @@ -11,10 +11,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/default/search.tpl b/templates/default/search.tpl index 24fead7..87f60c8 100644 --- a/templates/default/search.tpl +++ b/templates/default/search.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/default/week.tpl b/templates/default/week.tpl index 451a8c6..d33d5f3 100644 --- a/templates/default/week.tpl +++ b/templates/default/week.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/default/year.tpl b/templates/default/year.tpl index eb89065..73db6c0 100644 --- a/templates/default/year.tpl +++ b/templates/default/year.tpl @@ -25,12 +25,12 @@ - - - - - - + + + + + +
{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 ae7598c..d0bcef2 100644 --- a/templates/green/day.tpl +++ b/templates/green/day.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/month.tpl b/templates/green/month.tpl index 8466d7a..6b64f1a 100644 --- a/templates/green/month.tpl +++ b/templates/green/month.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/green/print.tpl b/templates/green/print.tpl index dfc773b..a2d6a70 100644 --- a/templates/green/print.tpl +++ b/templates/green/print.tpl @@ -5,15 +5,16 @@ - + diff --git a/templates/grey/month.tpl b/templates/grey/month.tpl index 8466d7a..6b64f1a 100644 --- a/templates/grey/month.tpl +++ b/templates/grey/month.tpl @@ -10,10 +10,10 @@

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
+ {L_VIEW_CALENDARS}
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/green/search.tpl b/templates/green/search.tpl index dfb83e3..87f60c8 100644 --- a/templates/green/search.tpl +++ b/templates/green/search.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
@@ -30,7 +30,7 @@

{L_QUERY}: {FORMATTED_SEARCH}

- {DAYOFMONTH}
+ {L_STARTING_ON} {DAYOFMONTH}
diff --git a/templates/green/year.tpl b/templates/green/year.tpl index eb89065..73db6c0 100644 --- a/templates/green/year.tpl +++ b/templates/green/year.tpl @@ -25,12 +25,12 @@ diff --git a/templates/grey/day.tpl b/templates/grey/day.tpl index ae7598c..d0bcef2 100644 --- a/templates/grey/day.tpl +++ b/templates/grey/day.tpl @@ -13,10 +13,10 @@
- - - - - - + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/grey/event.tpl b/templates/grey/event.tpl index 43c2db2..b0a9a7f 100644 --- a/templates/grey/event.tpl +++ b/templates/grey/event.tpl @@ -15,9 +15,9 @@
-

{EVENT_TEXT} - ({EVENT_TIMES})

+

{L_SUMMARY}:{EVENT_TEXT} - ({EVENT_TIMES})

-

{DESCRIPTION}

+

{L_DESCRIPTION}:{DESCRIPTION}

@@ -32,6 +32,9 @@ {L_LOCATION}: {LOCATION}
+ + {L_URL}: {URL}
+

- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/grey/print.tpl b/templates/grey/print.tpl index dfc773b..a2d6a70 100644 --- a/templates/grey/print.tpl +++ b/templates/grey/print.tpl @@ -5,15 +5,16 @@ - +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
+ {L_VIEW_CALENDARS}
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/grey/search.tpl b/templates/grey/search.tpl index dfb83e3..87f60c8 100644 --- a/templates/grey/search.tpl +++ b/templates/grey/search.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
@@ -30,7 +30,7 @@

{L_QUERY}: {FORMATTED_SEARCH}

- {DAYOFMONTH}
+ {L_STARTING_ON} {DAYOFMONTH}
diff --git a/templates/grey/year.tpl b/templates/grey/year.tpl index eb89065..73db6c0 100644 --- a/templates/grey/year.tpl +++ b/templates/grey/year.tpl @@ -25,12 +25,12 @@ diff --git a/templates/red/day.tpl b/templates/red/day.tpl index ae7598c..d0bcef2 100644 --- a/templates/red/day.tpl +++ b/templates/red/day.tpl @@ -13,10 +13,10 @@
- - - - - - + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/red/month.tpl b/templates/red/month.tpl index 8466d7a..6b64f1a 100644 --- a/templates/red/month.tpl +++ b/templates/red/month.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/red/print.tpl b/templates/red/print.tpl index dfc773b..a2d6a70 100644 --- a/templates/red/print.tpl +++ b/templates/red/print.tpl @@ -5,15 +5,16 @@
- + diff --git a/templates/tan/month.tpl b/templates/tan/month.tpl index 8466d7a..6b64f1a 100644 --- a/templates/tan/month.tpl +++ b/templates/tan/month.tpl @@ -10,10 +10,10 @@

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
+ {L_VIEW_CALENDARS}
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/red/search.tpl b/templates/red/search.tpl index dfb83e3..87f60c8 100644 --- a/templates/red/search.tpl +++ b/templates/red/search.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
@@ -30,7 +30,7 @@

{L_QUERY}: {FORMATTED_SEARCH}

- {DAYOFMONTH}
+ {L_STARTING_ON} {DAYOFMONTH}
diff --git a/templates/red/year.tpl b/templates/red/year.tpl index eb89065..73db6c0 100644 --- a/templates/red/year.tpl +++ b/templates/red/year.tpl @@ -25,12 +25,12 @@ diff --git a/templates/tan/day.tpl b/templates/tan/day.tpl index ae7598c..d0bcef2 100644 --- a/templates/tan/day.tpl +++ b/templates/tan/day.tpl @@ -13,10 +13,10 @@
- - - - - - + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/tan/event.tpl b/templates/tan/event.tpl index 43c2db2..b0a9a7f 100644 --- a/templates/tan/event.tpl +++ b/templates/tan/event.tpl @@ -15,9 +15,9 @@
-

{EVENT_TEXT} - ({EVENT_TIMES})

+

{L_SUMMARY}:{EVENT_TEXT} - ({EVENT_TIMES})

-

{DESCRIPTION}

+

{L_DESCRIPTION}:{DESCRIPTION}

@@ -32,6 +32,9 @@ {L_LOCATION}: {LOCATION}
+ + {L_URL}: {URL}
+

- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/tan/print.tpl b/templates/tan/print.tpl index bee669a..a2d6a70 100644 --- a/templates/tan/print.tpl +++ b/templates/tan/print.tpl @@ -6,15 +6,15 @@ + {L_VIEW_CALENDARS}

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
- Foo{L_VIEW_CALENDARS}
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
diff --git a/templates/tan/search.tpl b/templates/tan/search.tpl index dfb83e3..87f60c8 100644 --- a/templates/tan/search.tpl +++ b/templates/tan/search.tpl @@ -10,10 +10,10 @@
- - - - + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
@@ -30,7 +30,7 @@

{L_QUERY}: {FORMATTED_SEARCH}

- {DAYOFMONTH}
+ {L_STARTING_ON} {DAYOFMONTH}
diff --git a/templates/tan/year.tpl b/templates/tan/year.tpl index eb89065..73db6c0 100644 --- a/templates/tan/year.tpl +++ b/templates/tan/year.tpl @@ -25,12 +25,12 @@ -- cgit v1.2.3
- - - - - - + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}