From 557fe532a369df55a598040b1f1f07fc87bcc1dc Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sun, 14 Sep 2003 21:01:34 +0000 Subject: Removed many many tables from month view, switched to DIVS. Fixed openevent, added link class. --- config.inc.php | 2 +- day.php | 6 ++- functions/date_functions.php | 8 ++-- month.php | 100 ++++++++++++++----------------------------- week.php | 6 ++- 5 files changed, 46 insertions(+), 76 deletions(-) diff --git a/config.inc.php b/config.inc.php index 37b9c4f..a3e9409 100644 --- a/config.inc.php +++ b/config.inc.php @@ -10,7 +10,7 @@ $default_view = 'day'; // Default view for calendars = 'day', 'week', 'mont $minical_view = 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current' $default_cal = 'all_calenders_combined971'; // Exact filename of calendar without .ics. Or set to 'all_calenders_combined971' to open all calenders combined into one. $language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto' -$week_start_day = 'Saturday'; // Day of the week your week starts on +$week_start_day = 'Sunday'; // Day of the week your week starts on $day_start = '0800'; // Start time for day grid $gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred $num_years = '3'; // Number of years to display in 'Jump to' diff --git a/day.php b/day.php index 8b16898..e7b6954 100644 --- a/day.php +++ b/day.php @@ -118,7 +118,8 @@ if (isset($master_array[($getdate)])) { 0, "", '', - ""); + "", + "psf"); echo "\n\n"; } echo ''."\n"; @@ -271,7 +272,8 @@ if (isset($master_array[($getdate)])) { "", 0, "", - ""); + "", + "psf"); echo ''."\n"; echo ''."\n"; echo ''."\n"; diff --git a/functions/date_functions.php b/functions/date_functions.php index cc13518..a15ddcb 100644 --- a/functions/date_functions.php +++ b/functions/date_functions.php @@ -160,7 +160,7 @@ function chooseOffset($time) { return $offset; } -function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic) { +function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic, $class) { $event_text = stripslashes(urldecode($arr["event_text"])); # for iCal pseudo tag comptability if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$reg)) { @@ -192,8 +192,8 @@ function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic) { } if ($event_text != "") { if ($lines) $event_text = word_wrap($event_text, $wrap, $lines); - $dsc =urlencode(addslashes($arr["description"])); - echo "[:space:]]+)", $ev, $res))) || ($dsc)) { echo "javascript:w=window.open('"; echo "includes/event.php?event="; @@ -207,7 +207,7 @@ function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic) { } else { echo $res[1]; } - echo "\">$clic$event_text"; + echo '">'.$clic.$event_text.''.$fclic; } } diff --git a/month.php b/month.php index bb592b4..b9c85ef 100644 --- a/month.php +++ b/month.php @@ -92,10 +92,7 @@ $num_of_events = 0; - - - - +
$day
"; + echo ''; $start_day = strtotime("+1 day", $start_day); } ?> - - - - - - - - - -
'.$day.'
- - - - - $day"; - $bgclass="class=\"monthoff\""; + $day = ''.$day.''; + $bgclass = 'class="monthoff"'; } else { if ($today_today == $daylink) { - $bgclass="class=\"monthon\""; + $bgclass = 'class="monthon"'; } else { - $bgclass="class=\"monthreg\""; + $bgclass = 'class="monthreg"'; } } - if ($i == 0) echo "\n"; - if (isset($master_array[("$daylink")]) && ($check_month == $this_month)) { - echo "\n"; + echo ''; } else { - echo "\n"; + echo ''; } $sunday = strtotime("+1 day", $sunday); $i++; if ($i == 7) { - echo "\n"; + echo ''; $i = 0; $checkagain = date ("m", $sunday); if ($checkagain != $this_month) $whole_month = FALSE; @@ -215,7 +180,7 @@ $num_of_events = 0;
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + if ($i == 0) echo ''; + echo '\n"; } } } - echo "
\n"; - echo "$day\n"; - echo "
'; + if (isset($master_array[("$daylink")])) { + echo ''; + echo '
'; if ($master_array[("$daylink")]) { foreach ($master_array[("$daylink")] as $event_times) { foreach ($event_times as $val) { $num_of_events++; - echo "
\n"; - echo ""; - echo "\n"; if (!isset($val["event_start"])) { - echo '\n"; - echo "
'; openevent("$calendar_name", "", "", $val, $month_event_lines, 12, - "", - ""); + "
", + "
", + "psf"); } else { $event_start = @$val["event_start"]; $event_end = @$val["event_end"]; $event_start = date($timeFormat, @strtotime ("$event_start")); - $start2 = date($timeFormat_small,@strtotime("$event_start")); + $start2 = date($timeFormat_small,@strtotime("$event_start")); $event_end = date($timeFormat, @strtotime ("$event_end")); - echo "		"; @openevent("$calendar_name", "$event_start", "$event_end", $val, $month_event_lines, 12, - " $start2 ", - ""); + "
 $start2 ", + "
", + "ps3"); } - echo "
\n"; - echo "
\n"; - echo "		\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - echo "$day\n"; - echo "
\n"; - echo "		'; + echo ''.$day.''; + echo '
- +
@@ -273,7 +238,8 @@ $num_of_events = 0; 0, 65, " ", - ""); + "", + "psf"); //echo " $event_text\n"; echo "\n"; echo "\n"; diff --git a/week.php b/week.php index d155235..e255889 100644 --- a/week.php +++ b/week.php @@ -189,7 +189,8 @@ for ($i=0;$i<7;$i++) { $allday_week_lines, 12, '', - ""); + "", + "psf"); echo "\n"; } echo "
\n"; @@ -323,7 +324,8 @@ for ($i=0;$i<7;$i++) { $week_events_lines, 25, "", - ""); + "", + "psf"); echo "\n"; echo "\n"; echo "\n"; -- cgit v1.2.3