nav: Give item renderer a chance to set the CSS class of the outer li…

… element refs #5543
Icinga · Oct 26, 2015 · 8341415 · 8341415
1 parent 4593c78
commit 8341415
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/library/Icinga/Web/Navigation/Renderer/NavigationRenderer.php b/library/Icinga/Web/Navigation/Renderer/NavigationRenderer.php
@@ -352,8 +352,9 @@ public function render()
         foreach ($this as $item) {
             /** @var NavigationItem $item */
             if ($item->shouldRender()) {
+                $content = $item->render();
                 $this->content[] = $this->beginItemMarkup($item);
-                $this->content[] = $item->render();
+                $this->content[] = $content;
                 $this->content[] = $this->endItemMarkup();
             }
         }

diff --git a/library/Icinga/Web/Navigation/Renderer/RecursiveNavigationRenderer.php b/library/Icinga/Web/Navigation/Renderer/RecursiveNavigationRenderer.php
@@ -162,14 +162,15 @@ public function render()
         foreach ($this as $item) {
             /** @var NavigationItem $item */
             if ($item->shouldRender()) {
-                $this->content[] = $this->getInnerIterator()->beginItemMarkup($item);
-
                 if ($this->getUseStandardItemRenderer()) {
                     $renderer = new NavigationItemRenderer();
-                    $this->content[] = $renderer->render($item);
+                    $content = $renderer->render($item);
                 } else {
-                    $this->content[] = $item->render();
+                    $content = $item->render();
                 }
+                $this->content[] = $this->getInnerIterator()->beginItemMarkup($item);
+
+                $this->content[] = $content;
 
                 if (! $item->hasChildren()) {
                     $this->content[] = $this->getInnerIterator()->endItemMarkup();