From 014ccb1db7b5f5ff0b652e650ee67d1a931e40f9 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 30 Jun 2003 22:37:52 +0000 Subject: Multiple Calendar support. --- includes/calendar_nav.php | 22 ++-- includes/event.php | 17 ++- includes/sidebar.php | 21 ++-- includes/todo.php | 270 +++++++++++++++++++++++----------------------- 4 files changed, 179 insertions(+), 151 deletions(-) (limited to 'includes') diff --git a/includes/calendar_nav.php b/includes/calendar_nav.php index f7bf389..01afb56 100644 --- a/includes/calendar_nav.php +++ b/includes/calendar_nav.php @@ -1,6 +1,10 @@ 24) { $cal_displayname2 = substr("$cal_displayname2", 0, 21); $cal_displayname2 = $cal_displayname2 . "..."; @@ -8,7 +12,11 @@ $next_day = date("Ymd", strtotime("+1 day", $unix_time)); $prev_day = date("Ymd", strtotime("-1 day", $unix_time)); - + + // Get the real date to display as "go to today", not the date displayed in the calendar + $really_unix_time = strtotime(date('Ymd')); + $really_today_today = date ('Ymd', $really_unix_time); + $fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15'); ?>
@@ -192,13 +200,13 @@ $goday_lang
\n"; - echo "$goweek_lang
\n"; - echo "$gomonth_lang
\n"; - echo "$goyear_lang
\n"; + echo "$goday_lang
\n"; + echo "$goweek_lang
\n"; + echo "$gomonth_lang
\n"; + echo "$goyear_lang
\n"; echo "$goprint_lang
\n"; if ($allow_preferences != 'no') echo "$preferences_lang
\n"; - echo "$subscribe_lang | $download_lang\n"; + if ($cal != 'all_calenders_combined971') echo "$subscribe_lang | $download_lang\n"; ?> diff --git a/includes/event.php b/includes/event.php index 8cc84fb..bb7c2a8 100644 --- a/includes/event.php +++ b/includes/event.php @@ -81,14 +81,27 @@ $calendar_name2 = str_replace('\\', '', $calendar_name2); - <?php echo $calendar_name2; ?> + <?php + if ($calendar_name == 'all_calenders_combined971') { + echo "$all_cal_comb_lang"; + } else { + echo "$calendar_name2"; + }?> ">
- + diff --git a/includes/sidebar.php b/includes/sidebar.php index 5b69789..f68cfcb 100644 --- a/includes/sidebar.php +++ b/includes/sidebar.php @@ -1,11 +1,18 @@ 24) { $cal_displayname2 = substr("$cal_displayname2", 0, 21); $cal_displayname2 = $cal_displayname2 . "..."; } - + $search_box = ''; ?> @@ -33,13 +40,13 @@ diff --git a/includes/todo.php b/includes/todo.php index 3c39515..ec84a02 100644 --- a/includes/todo.php +++ b/includes/todo.php @@ -1,135 +1,135 @@ -= 1 && $priority <= 4) { - $priority = $priority_high_lang; - } else if ($priority == 5) { - $priority = $priority_medium_lang; - } else if ($priority >= 6 && $priority <= 9) { - $priority = $priority_low_lang; - } else { - $priority = $priority_none_lang; - } -} else { - $priority = $priority_none_lang; -} - -?> - - - - - <?php echo $calendar_name; ?> - "> - -
-
+ +
$goday_lang
\n"; - echo "$goweek_lang
\n"; - echo "$gomonth_lang
\n"; - echo "$goyear_lang
\n"; + echo "$goday_lang
\n"; + echo "$goweek_lang
\n"; + echo "$gomonth_lang
\n"; + echo "$goyear_lang
\n"; echo "$goprint_lang
\n"; if ($allow_preferences != 'no') echo "$preferences_lang
\n"; - echo "$subscribe_lang | $download_lang\n"; + if ($cal != 'all_calenders_combined971') echo "$subscribe_lang | $download_lang\n"; ?>
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[:space:]]+[[:alnum:]/]",'\0',$vtodo_text).'

'; ?>
- [:space:]]+[[:alnum:]/]", '\0', $description); ?>
-
-
- - += 1 && $priority <= 4) { + $priority = $priority_high_lang; + } else if ($priority == 5) { + $priority = $priority_medium_lang; + } else if ($priority >= 6 && $priority <= 9) { + $priority = $priority_low_lang; + } else { + $priority = $priority_none_lang; + } +} else { + $priority = $priority_none_lang; +} + +?> + + + + + <?php echo $calendar_name; ?> + "> + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[:space:]]+[[:alnum:]/]",'\0',$vtodo_text).'

'; ?>
+ [:space:]]+[[:alnum:]/]", '\0', $description); ?>
+
+
+ + -- cgit v1.2.3