diff --git a/calendar/day.php b/calendar/day.php index 3e13cbc4fa..e74502f467 100644 --- a/calendar/day.php +++ b/calendar/day.php @@ -14,8 +14,9 @@ /* $Id$ */ - if ($friendly) + if ($friendly) { $phpgw_flags["noheader"] = True; + } $phpgw_flags["currentapp"] = "calendar"; include("../header.inc.php"); @@ -63,6 +64,10 @@ /* Pre-Load the repeated events for quckier access */ $repeated_events = read_repeated_events(); + if ($friendly) { + echo ""; + } + ?>
diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php index 0f40b2a196..f4d809b486 100755 --- a/calendar/inc/functions.inc.php +++ b/calendar/inc/functions.inc.php @@ -352,13 +352,13 @@ . "\">" . "\"""; + echo "[ " . "link("day.php","month=".date("m",$date) + ."&day=".date("d",$date)."&year=".date("Y",$date)) + . "\">" . date("d", $date) . " ]
\n"; + } else { + echo "[ " . date("d", $date) . " ]
\n"; + } - echo "[ " . "link("day.php", - "month=".date("m",$date) - ."&day=".date("d",$date) - ."&year=".date("Y",$date)) - . "\">" . date("d", $date) - . " ]
\n"; echo ""; // This is only a temporey fix diff --git a/calendar/index.php b/calendar/index.php index 6b4034c5cf..53d7434746 100755 --- a/calendar/index.php +++ b/calendar/index.php @@ -14,7 +14,7 @@ /* $Id$ */ - if (! $friendly) { + if ($friendly) { $phpgw_flags["noheader"] = True; } @@ -49,11 +49,10 @@ $prevmonth = date("m",$prev); $prevdate = date("Ymd"); - if (! $friendly) { - $phpgw->common->header(); - } else + if ($friendly) { echo ""; - $view = "month"; + $view = "month"; + } ?> @@ -170,6 +169,5 @@ . "status = '" . lang_calendar("Generate printer-friendly version"). "'"; echo "link($PHP_SELF,$param)."\">"; echo "[". lang_calendar("Printer Friendly") . "]"; + include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); } - include($phpgw_info["server"]["api_dir"] . "/footer.inc.php"); -?>