From 9dff864b80f6f70e337e175730377003da1505b3 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 28 Sep 2015 14:48:54 +0200 Subject: [PATCH] Prepare markup for new user menu refs #5543 --- library/Icinga/Application/Web.php | 13 ++++++----- .../Renderer/LogoutNavigationItemRenderer.php | 14 ++++++++++++ .../Renderer/UserNavigationItemRenderer.php | 22 +++++++++++++++++++ public/css/icinga/main.less | 5 +++++ 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php create mode 100644 library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index 538afb029f..b3c50552d7 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -297,9 +297,6 @@ public function getMenu() ) ), 'user' => array( - 'label' => $this->user->getUsername(), - 'icon' => 'user', - 'priority' => 900, 'children' => array( 'preferences' => array( 'label' => t('Preferences'), @@ -316,11 +313,17 @@ public function getMenu() 'url' => 'authentication/logout', 'priority' => 990, 'renderer' => array( - 'NavigationItemRenderer', + 'LogoutNavigationItemRenderer', 'target' => '_self' ) ) - ) + ), + 'label' => $this->user->getUsername(), + 'url' => 'account', + 'priority' => 900, + 'renderer' => array( + 'UserNavigationItemRenderer' + ), ) ); diff --git a/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php new file mode 100644 index 0000000000..3f92d929e1 --- /dev/null +++ b/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php @@ -0,0 +1,14 @@ +' . parent::render($item) . ''; + } +} diff --git a/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php new file mode 100644 index 0000000000..36cfd07090 --- /dev/null +++ b/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php @@ -0,0 +1,22 @@ +'; + } + + public function render(NavigationItem $item = null) + { + return '
' . $this->getAvatar() . parent::render($item) . '
'; + } +} diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less index 5cf9e4f0ba..67323c1b36 100644 --- a/public/css/icinga/main.less +++ b/public/css/icinga/main.less @@ -143,3 +143,8 @@ a.button { .bg-color-critical(); } } + +.user-avatar { + height: 16px; + width: 16px; +}