--- inc/pgOvulacija.php	2001/09/25 15:38:04	1.1
+++ inc/pgOvulacija.php	2001/10/16 13:07:03	1.4
@@ -1,7 +1,7 @@
 <?php
 	$foo = getdate();
 	$tpl->assign("year", $foo["year"]);
-	$tpl->assign("ME", $PHP_SELF.HTMLSpecialChars("?section=$section&section_menu=$section_menu"));
+	$tpl->assign("ME", HTMLSpecialChars("?section=$section&section_menu=$section_menu"));
 	$godine = array();
 	for ($i = $foo["year"] - 1; $i <= $foo["year"] + 1; $i++) array_push($godine, $i);
 	$tpl->assign("godine", $godine);
@@ -61,13 +61,21 @@
 			array_push($kal, $tmp);
 		}
 		$tp = new Smarty();
+		$tp->assign("section", $section);
+		$tp->assign("section_menu", $section_menu);
+		$tp->assign("section_menu2", $section_menu2);
+		$tp->assign("dan", $dan);
+		$tp->assign("mjesec", $mjesec);
+		$tp->assign("godina", $godina);
+		$tp->assign("trajanje", $trajanje);
 		$tp->assign("ime", $ime);
+		$tp->assign("ime2", urlencode($ime));
 		$tp->assign("kal", $kal);
 		$table = $tp->fetch("kalendar".($print?"-print":"").".tpl");
 		$tpl->assign("CONTENT", $table);
 		if (!$print) {
 			include_once("print.php");
-			$tpl->assign("PRINT", GetPrint(array("dan", "mjesec", "godina", "trajanje")));
+			$tpl->assign("PRINT", GetPrint(array("dan", "mjesec", "godina", "trajanje", "ime"), false));
 		} else $main_template = "wrapper.tpl";
 	}
 	if (!$ns4) {
@@ -75,6 +83,6 @@
 		if (!$godina) $godina = $foo["year"];
 		$before = $godina - $foo["year"] + 1;
 		$after = $foo["year"] - $godina + 1;
-		$onload .= "DS = new DateSelector(document.forms[1], $date, $before, $after);";
+		$onload .= "DS = new DateSelector(document.forms[".($kalendar?2:1)."], $date, $before, $after);";
 	}
 ?>