From ce366dcff1289fbd3246536dd8cd2215faaa4dd1 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sun, 29 Sep 2002 01:17:08 +0000 Subject: Stage one of redesign. --- day.php | 125 ++++++---------- functions/list_icals.php | 2 +- functions/list_months.php | 27 ++++ ical_parser.php | 3 - images/download_arrow.gif | Bin 0 -> 343 bytes images/grey_small.gif | Bin 0 -> 136 bytes images/left_arrows.gif | Bin 0 -> 98 bytes images/right_arrows.gif | Bin 0 -> 98 bytes images/small_icalicon.gif | Bin 0 -> 369 bytes images/smallicon.gif | Bin 0 -> 371 bytes images/time_bg.gif | Bin 0 -> 964 bytes sidebar.php | 369 ++++++++++++++++++++++++++++++++++++++++++++++ styles/default.css | 26 +++- 13 files changed, 468 insertions(+), 84 deletions(-) create mode 100644 functions/list_months.php create mode 100644 images/download_arrow.gif create mode 100644 images/grey_small.gif create mode 100644 images/left_arrows.gif create mode 100644 images/right_arrows.gif create mode 100644 images/small_icalicon.gif create mode 100644 images/smallicon.gif create mode 100644 images/time_bg.gif create mode 100644 sidebar.php diff --git a/day.php b/day.php index 8f0539b..7e1fd17 100644 --- a/day.php +++ b/day.php @@ -9,7 +9,7 @@ include("./ical_parser.php"); // echo "using sessions"; //} -$starttime = "0700"; +$starttime = "0500"; $weekstart = 1; // dpr 20020926: moved variable gridLength to config.inc.php //$gridLength = 30; @@ -18,6 +18,29 @@ $today_today = date ("Ymd"); $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); $display_date = strftime($dateFormat_day, $unix_time); + +// For the side months +ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); +$this_day = $day_array2[3]; +$this_month = $day_array2[2]; +$this_year = $day_array2[1]; + +$date = strtotime($getdate); +$month1 = date("m", DateAdd ("m", "-1", $date)); +$month2 = date("m", $date); +$month3 = date("m", DateAdd ("m", "+1", $date)); +$year1 = date("Y", DateAdd ("m", "-1", $date)); +$year2 = date("Y", $date); +$year3 = date("Y", DateAdd ("m", "+1", $date)); +$first_sunday1 = sundayOfWeek($year1, $month1, "1"); +$first_sunday2 = sundayOfWeek($year2, $month2, "1"); +$first_sunday3 = sundayOfWeek($year3, $month3, "1"); +$display_month1 = strftime ($dateFormat_month, strtotime("-1 month", $date)); +$display_month2 = strftime ($dateFormat_month, $date); +$display_month3 = strftime ($dateFormat_month, strtotime("+1 month", $date)); +$parse_month = date ("Ym", $date); +$thisday2 = strftime($dateFormat_week_list, $date); + $nbrGridCols = 1; if ($master_array[($getdate)]) { foreach($master_array[($getdate)] as $ovlKey => $ovlValue) { @@ -41,87 +64,30 @@ if ($master_array[($getdate)]) {
- - - - - - - +
$today_lang"; ?>$day_lang | $week_lang | $month_lang"; ?>
- - -
- - - -
- - +
+
- +
- +
- - - - - - - - -
- - - - - - -
$last_day_lang"; ?>$next_day_lang"; ?>
-
$subscribe_lang | $download_lang"; ?>
-

- - 0) { - echo "\n"; - echo "\n"; - echo "\n"; - } - ?> - +
\n"; - echo "\n"; - foreach($master_array[($getdate)]["-1"] as $all_day) { - $event_text2 = addslashes($all_day["event_text"]); - $event_text2 = str_replace("\"", """, $event_text2); - if ($i > 0) { - echo "\n"; - echo "\n"; - echo "\n"; - } - echo "\n"; - echo "\n"; - echo "\n"; - $i++; - } - echo "
" . $all_day["event_text"] . "
\n"; - echo "
- - + + \"\""; + echo ""; } ?> \n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; } else { + echo "\n"; - echo "\n"; + echo "\n"; } if (sizeof($event_length) == 0) { - echo "\n"; + echo "\n"; } else { $emptyWidth = $nbrGridCols; for ($i=0;$i\n"; + echo " - + + +
\"\"
$key$key
  \n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "
$event_start - $event_end$event_start
\n"; @@ -222,12 +189,12 @@ if ($master_array[($getdate)]) {
-
+
$powered_by_lang PHP iCalendar $version_lang"; ?>
-
-$powered_by_lang PHP iCalendar $version_lang"; ?> diff --git a/functions/list_icals.php b/functions/list_icals.php index c585780..d4d41ba 100644 --- a/functions/list_icals.php +++ b/functions/list_icals.php @@ -6,7 +6,7 @@ if (isset($getdate)) { } else { $query=""; } -print "
\n\n"; #print "\n"; // open file diff --git a/functions/list_months.php b/functions/list_months.php new file mode 100644 index 0000000..c532984 --- /dev/null +++ b/functions/list_months.php @@ -0,0 +1,27 @@ +\n +print "\n
"; +?> \ No newline at end of file diff --git a/ical_parser.php b/ical_parser.php index 1f7e159..a640905 100644 --- a/ical_parser.php +++ b/ical_parser.php @@ -12,9 +12,6 @@ include("./functions/date_functions.php"); include("./functions/draw_functions.php"); include("./functions/overlapping_events.php"); - - -//$day_array = array ("0700", "0730", "0800", "0830", "0900", "0930", "1000", "1030", "1100", "1130", "1200", "1230", "1300", "1330", "1400", "1430", "1500", "1530", "1600", "1630", "1700", "1730", "1800", "1830", "1900", "1930", "2000", "2030", "2100", "2130", "2200", "2230", "2300", "2330"); $fillTime = $day_start; $day_array = array (); while ($fillTime != "2400") { diff --git a/images/download_arrow.gif b/images/download_arrow.gif new file mode 100644 index 0000000..6108f32 Binary files /dev/null and b/images/download_arrow.gif differ diff --git a/images/grey_small.gif b/images/grey_small.gif new file mode 100644 index 0000000..4f2cc9e Binary files /dev/null and b/images/grey_small.gif differ diff --git a/images/left_arrows.gif b/images/left_arrows.gif new file mode 100644 index 0000000..03b918c Binary files /dev/null and b/images/left_arrows.gif differ diff --git a/images/right_arrows.gif b/images/right_arrows.gif new file mode 100644 index 0000000..092c34d Binary files /dev/null and b/images/right_arrows.gif differ diff --git a/images/small_icalicon.gif b/images/small_icalicon.gif new file mode 100644 index 0000000..cf5b6de Binary files /dev/null and b/images/small_icalicon.gif differ diff --git a/images/smallicon.gif b/images/smallicon.gif new file mode 100644 index 0000000..ab0c9c2 Binary files /dev/null and b/images/smallicon.gif differ diff --git a/images/time_bg.gif b/images/time_bg.gif new file mode 100644 index 0000000..8f1a3ee Binary files /dev/null and b/images/time_bg.gif differ diff --git a/sidebar.php b/sidebar.php new file mode 100644 index 0000000..fc44ac6 --- /dev/null +++ b/sidebar.php @@ -0,0 +1,369 @@ + + + + +
+ + + + + + + + + + + + +
\"right\""; ?>\"right\""; ?>
+ + + + + + + + + + + + + + + + + + + + + + + +
\"\""; ?>$subscribe_lang"; ?>
\"\""; ?>$download_lang"; ?>
+
+
+
+ + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+
+
+
+ 0) { ?> + + + + +
+ + + + + + + + + + + + +
+ + + + + + '); + if ($event_text != "") { + $event_text2 = addslashes($val["event_text"]); + $event_text2 = str_replace("\"", """, $event_text2); + $description = addslashes($val["description"]); + $description = str_replace("\"", """, $description); + $event_start = $val["event_start"]; + $event_end = $val["event_end"]; + $event_start = date ($timeFormat, strtotime ("$event_start")); + $event_end = date ($timeFormat, strtotime ("$event_end")); + if (strlen($event_text) > 21) { + $event_text = substr("$event_text", 0, 18); + $event_text = $event_text . "..."; + } + echo "\n"; + echo ""; + echo "\n"; + echo "\n"; + $num_of_events++; + } + } + } + ?> +
\n"; + if (!$event_start = $val["event_start"]) { + echo "$event_text\n"; + } else { + echo "• $event_text\n"; + } + echo "
+
+
+
+ + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + $day"; + if ($i == 0) echo "\n"; + if (($master_array[("$daylink")]) && ($check_month == $month1)) { + echo "\n"; + } else { + echo "\n"; + } + $sunday = ($sunday + (24.5 * 60 * 60)); + $i++; + if ($i == 7) { + echo "\n"; + $i = 0; + $checkagain = date ("m", $sunday); + if ($checkagain != $month1) $whole_month = FALSE; + } + } while ($whole_month == TRUE); + ?> +
SuMoTuWeThFrSa
+
\n"; + echo "$day\n"; + echo "\n"; + echo "$day\n"; + echo "
+
+
+
+ + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + $day"; + if ($daylink == $getdate) $day= "$day"; + if ($i == 0) echo "\n"; + if (($master_array[("$daylink")]) && ($check_month == $month2)) { + echo "\n"; + } else { + echo "\n"; + } + $sunday = ($sunday + (24.5 * 60 * 60)); + $i++; + if ($i == 7) { + echo "\n"; + $i = 0; + $checkagain = date ("m", $sunday); + if ($checkagain != $month2) $whole_month = FALSE; + } + } while ($whole_month == TRUE); + ?> +
SuMoTuWeThFrSa
+
\n"; + echo "$day\n"; + echo "\n"; + echo "$day\n"; + echo "
+
+
+
+ + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + $day"; + if ($i == 0) echo "\n"; + if (($master_array[("$daylink")]) && ($check_month == $month3)) { + echo "\n"; + } else { + echo "\n"; + } + $sunday = ($sunday + (24.5 * 60 * 60)); + $i++; + if ($i == 7) { + echo "\n"; + $i = 0; + $checkagain = date ("m", $sunday); + if ($checkagain != $month3) $whole_month = FALSE; + } + } while ($whole_month == TRUE); + ?> +
SuMoTuWeThFrSa
+
\n"; + echo "$day\n"; + echo "\n"; + echo "$day\n"; + echo "
+
+
diff --git a/styles/default.css b/styles/default.css index 7250393..814c725 100644 --- a/styles/default.css +++ b/styles/default.css @@ -2,8 +2,11 @@ .eventborder { background-color: #0065DB; border: 1px #0033CC solid; } .eventbg { background-color: #68AAEF; } +.eventbg2 { background-color: #68AAEF; border-right: 1px solid #FFFFFF; } .eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } .calborder { background-color: #FFFFFF; border: 1px #A1A5A9 solid; } +.dayborder { border-top: 1px dashed #A1A5A9; } +.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; } a.psf { text-decoration: none; @@ -25,6 +28,26 @@ a.psf:hover { background-color: transparent; } +a.ps2 { + text-decoration: underline; + } +a.ps2:link { + color: #06f; + background-color: transparent; + } +a.ps2:visited { + color: #06f; + background-color: transparent; + } +a.ps2:active { + color: #36c; + background-color: transparent; + } +a.ps2:hover { + color: #009; + background-color: transparent; + } + body { background-color: #E5E5E5; @@ -35,10 +58,11 @@ background-color: #E5E5E5; .V9 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; } .G10 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #06f; } .G10B { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: black; } +.G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #666; } .V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; } .H20 { font-family: Helvetica, sans-serif; font-size: 20px; } -.query_style { font-size : 12px; font-family : geneva, arial, sans-serif; width: 135px; } +.query_style { font-size : 11px; font-family : verdana, geneva, arial, sans-serif; width: 146px; margin-bottom:0; } .add_style { font-size : 12px; font-family : verdana, geneva, arial, sans-serif; width: 160px; } -- cgit v1.2.3