Fix user menu CSS classes

refs #5543
Icinga · Sep 28, 2015 · 98f1e90 · 98f1e90
1 parent ed6da19
commit 98f1e90
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
@@ -309,6 +309,7 @@ public function getMenu()
                             'priority'  => 920
                         )
                     ),
+                    'cssClass'  => 'user-nav-item',
                     'label'     => $this->user->getUsername(),
                     'url'       => 'account',
                     'priority'  => 900,
@@ -317,13 +318,14 @@ public function getMenu()
                     ),
                 ),
                 'logout' => array(
+                    'cssClass'  => 'user-nav-item',
                     'label'     => t('Logout'),
-                    'url'       => 'authentication/logout',
                     'priority'  => 990,
                     'renderer'  => array(
                         'LogoutNavigationItemRenderer',
                         'target' => '_self'
-                    )
+                    ),
+                    'url'       => 'authentication/logout'
                 )
             );
 

diff --git a/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php
@@ -9,6 +9,6 @@ class LogoutNavigationItemRenderer extends NavigationItemRenderer
 {
     public function render(NavigationItem $item = null)
     {
-        return '<div class="user-nav-item">' . parent::render($item) . '</div>';
+        return parent::render($item);
     }
 }
diff --git a/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php
@@ -17,6 +17,6 @@ public function getAvatar()
 
     public function render(NavigationItem $item = null)
     {
-        return '<div class="user-nav-item clearfix">' . $this->getAvatar() . parent::render($item) . '</div>';
+        return '<div class="clearfix">' . $this->getAvatar() . parent::render($item) . '</div>';
     }
 }