diff --git a/library/Fiktiv/View/Helper/AuthLink.php b/library/Fiktiv/View/Helper/AuthLink.php index c1a8fa0..014d878 100644 --- a/library/Fiktiv/View/Helper/AuthLink.php +++ b/library/Fiktiv/View/Helper/AuthLink.php @@ -14,5 +14,4 @@ class Fiktiv_View_Helper_AuthLink extends Zend_View_Helper_Abstract return '' . $this->view->translate('u:login') . ''; } - } \ No newline at end of file diff --git a/library/Fiktiv/View/Helper/RenderMenu.php b/library/Fiktiv/View/Helper/RenderMenu.php index d69eb6e..d989be2 100644 --- a/library/Fiktiv/View/Helper/RenderMenu.php +++ b/library/Fiktiv/View/Helper/RenderMenu.php @@ -4,13 +4,16 @@ class Fiktiv_View_Helper_RenderMenu extends Zend_View_Helper_Abstract { public function renderMenu() { - $active = $this->view->navigation()->menu()->findActive($this->view->navigation()->getContainer()); + $navigation = $this->view->navigation(); + $container = $navigation->getContainer(); + $active = $navigation->menu()->findActive($navigation->getContainer()); if ($active && $active['page']->hasPages()) { - return $this->view->navigation()->menu()->setMaxDepth(0)->setUlClass('b')->renderMenu(); + $class = 'b'; + } else { + $class = 'navigation'; } - return $this->view->navigation()->menu()->setMaxDepth(0)->setUlClass('navigation')->renderMenu(); + return $navigation->menu()->setMaxDepth(0)->setUlClass($class)->renderMenu(); } - } \ No newline at end of file diff --git a/library/Fiktiv/View/Helper/RenderSubMenu.php b/library/Fiktiv/View/Helper/RenderSubMenu.php index f71e86d..dcce002 100644 --- a/library/Fiktiv/View/Helper/RenderSubMenu.php +++ b/library/Fiktiv/View/Helper/RenderSubMenu.php @@ -4,12 +4,14 @@ class Fiktiv_View_Helper_RenderSubMenu extends Zend_View_Helper_Abstract { public function renderSubMenu() { - $active = $this->view->navigation()->menu()->findActive($this->view->navigation()->getContainer()); + $navigation = $this->view->navigation(); + $container = $navigation->getContainer(); + $active = $navigation->menu()->findActive($navigation->getContainer()); if ($active && $active['page']->hasPages()) { - return $this->view->navigation()->menu()->setUlClass('b')->renderSubMenu(); + return $navigation->menu()->setUlClass('b')->renderSubMenu(); } + return ''; } - } \ No newline at end of file diff --git a/library/Fiktiv/View/Helper/Translate.php b/library/Fiktiv/View/Helper/Translate.php index d015e1c..2bd42a1 100644 --- a/library/Fiktiv/View/Helper/Translate.php +++ b/library/Fiktiv/View/Helper/Translate.php @@ -26,5 +26,4 @@ class Fiktiv_View_Helper_Translate extends Zend_View_Helper_Translate return parent::translate($key, $options); } - } \ No newline at end of file