--- index.php	2001/10/04 14:59:34	1.18
+++ index.php	2001/10/05 15:10:52	1.19
@@ -61,35 +61,41 @@
 		} else if ($section == "knjiznica") {
 			$section_name = "Knjižnica";
 			$inc = "pgKnjiznica2";
+			$mnu = "";
 		} else if ($section == "linkovi") {
 			$section_name = "Linkovi";
 			$inc = "pgLinkovi";
-		} else if ($section == "pretrazivanje") {
-			$section_name = "Pretraživanje";
-			$inc = "pgPretrazivanje";
 		} else if ($section == "vademecum") {
 			$section_name = "PLIVA Vademecum";
 			$inc = "pgKnjiznica-vademecum";
+			$mnu = "";
 			$fname = "vademecum.tpl";
 		} else if ($section == "lijekovi") {
 			$section_name = "Lista lijekova";
 			$inc = "pgKnjiznica-lijekovi";
+			$mnu = "";
 			$fname = "lijekovi.tpl";
 		} else if ($section == "harrison") {
 			$section_name = "Harrison's Online";
-			$inc = "";
+			$inc = $mnu = "";
 			$fname = "harrisons.tpl";
 		} else if ($section == "qa") {
 			$section_name = "Pitanja i odgovori";
 			$inc = "pgQA";
+			$mnu = "";
+		} else if ($section == "kalendar") {
+			$section_name = "Kalendar događanja";
+			$inc = "pgKalendar";
 		} else if ($section == "zanimljivo") {
 			$section_name = "Zanimljivosti";
+			$mnu = "";
 			$inc = "pgZanimljivosti";
 		} else if ($section == "lozinka") {
 			$section_name = "Promjena lozinke";
 			$inc = "pgLozinka";
 		} else if ($section == "arhiva") {
 			$section_name = "Arhiva";
+			if ($acat == "z") $mnu = "";
 			$inc = "pgArhiva";
 		}
 	} else {
@@ -103,8 +109,7 @@
 			$inc = "pgSearch";
 		} else if ($section == "onama") {
 			$section_name = "O nama";
-			$mnu = "";
-			$inc = "";
+			$mnu = $inc = "";
 		} else if ($section == "bolesti") {
 			$section_name = "Bolesti";
 			$mnu = "menuBolesti.php";
@@ -147,6 +152,9 @@
 			$section_name = "Arhiva";
 			$mnu = "";
 			$inc = "pgArhiva";
+		} else if ($section == "semafor") {
+			$section_name = "Alergijski semafor";
+			$mnu = $inc = "";
 		}
 	}
 	$push_menu = true;
@@ -161,11 +169,11 @@
 			if ($v["name"] == $section_menu) $section_menu_name = $v["caption"];
 		}
 		$tpl->assign("MENU", $menu);
-		if ($section_menu && !$keep_template)
-			$fname = eregi_replace("(".$tpl->tpl_file_ext.")$", "-$section_menu\\1", $fname);
-		$inc2 = $inc.($section_menu?"-$section_menu":"");
-		if ($inc2 && file_exists("inc/$inc2.php")) $inc = $inc2;
 	}
+	if ($section_menu && !$keep_template)
+		$fname = eregi_replace("(".$tpl->tpl_file_ext.")$", "-$section_menu\\1", $fname);
+	$inc2 = $inc.($section_menu?"-$section_menu":"");
+	if ($inc2 && file_exists("inc/$inc2.php")) $inc = $inc2;
 	$inc .= ".php";
 	if ($section_name) array_push($PATH, MyUpper($section_name));
 	if ($section_menu_name && $push_menu) array_push($PATH, MyUpper($section_menu_name));