diff --git a/application/layouts/layout.phtml b/application/layouts/layout.phtml
index 05e63faa..4287dc71 100755
--- a/application/layouts/layout.phtml
+++ b/application/layouts/layout.phtml
@@ -3,11 +3,12 @@
headTitle() ?>
-
-
-
+
+
+
-
+
+
headScript() ?>
headLink() ?>
headStyle() ?>
@@ -17,7 +18,8 @@
- render('header.phtml') ?>
+ render('header.phtml') ?>
+
layout()->content ?>
render('footer.phtml') ?>
@@ -32,5 +34,6 @@
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
- 
+
+
\ No newline at end of file
diff --git a/htdocs/js/navi.js b/htdocs/js/navi.js
index a8519ed6..a276f38b 100755
--- a/htdocs/js/navi.js
+++ b/htdocs/js/navi.js
@@ -15,8 +15,8 @@ function extractPageName(hrefString)
{
if (arr[i].parentNode.tagName != "DIV")
{
- arr[i].className = "current";
- arr[i].parentNode.className = "current";
+ arr[i].className = "active";
+ arr[i].parentNode.className = "active";
}
}
}
@@ -26,6 +26,6 @@ function extractPageName(hrefString)
{
hrefString = document.location.href ? document.location.href : document.location;
- if (document.getElementById("divNavi")!=null)
- setActiveMenu(document.getElementById("divNavi").getElementsByTagName("a"), extractPageName(hrefString));
+ if (document.getElementById("mainmenu")!=null)
+ setActiveMenu(document.getElementById("mainmenu").getElementsByTagName("a"), extractPageName(hrefString));
}
\ No newline at end of file