From e22c36c50313c357755a10c0c2cd87a7c0c7e345 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Tue, 4 Aug 2020 10:02:56 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02847=20Add=20tooltip=20to=20user=20menu?=
 =?UTF-8?q?=20picture=20and=20rework=20these=20dictionary=20entries?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dictionaries/en.dictionary.itop.ui.php                 |  2 +-
 .../ui/layouts/en.dictionary.itop.navigation-menu.php  |  4 +++-
 .../UI/Layout/NavigationMenu/NavigationMenu.php        |  5 +++--
 templates/layouts/navigation-menu/layout.html.twig     | 10 ++++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 65e173a98..05746117c 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -387,7 +387,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Incidents assigned to me',
 	'UI:AllOrganizations' => ' All Organizations ',
 	'UI:YourSearch' => 'Your Search',
-	'UI:LoggedAsMessage' => 'Hi %1$s!',
+	'UI:LoggedAsMessage' => 'Logged in as %1$s',
 	'UI:LoggedAsMessage+Admin' => 'Logged in as %1$s (Administrator)',
 	'UI:Button:Logoff' => 'Log off',
 	'UI:Button:GlobalSearch' => 'Search',
diff --git a/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php
index cc218588c..b2894f989 100644
--- a/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php
@@ -24,5 +24,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Tooltip' => 'Type your keywords to filter menus',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Hotkey' => 'Alt + M',
-	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => 'User picture'
+	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s\!',
+	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture'
+
 ));
\ No newline at end of file
diff --git a/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php b/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php
index f37a67490..f803f7943 100644
--- a/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php
+++ b/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php
@@ -217,11 +217,12 @@ class NavigationMenu extends UIBlock
 			'sOrganization' => UserRights::GetContactOrganizationFriendlyname(),
 			'sFirstname' => UserRights::GetContactFirstname(),
 			'sPictureUrl' => UserRights::GetContactPicture(),
+			'sWelcomeMessage' => Dict::Format('UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text', UserRights::GetContactFirstname())
 		];
 
 		// Logon message
-		$sLogonMessageDictCode = (UserRights::IsAdministrator()) ? 'UI:LoggedAsMessage' : 'UI:LoggedAsMessage';
-		$aData['sLogonMessage'] = Dict::Format($sLogonMessageDictCode, UserRights::GetContactFirstname());
+		$sLogonMessageDictCode = (UserRights::IsAdministrator()) ? 'UI:LoggedAsMessage+Admin' : 'UI:LoggedAsMessage';
+		$aData['sLogonMessage'] = Dict::Format($sLogonMessageDictCode, UserRights::GetContactObject()->Get('friendlyname'));
 
 		$this->aUserData = $aData;
 
diff --git a/templates/layouts/navigation-menu/layout.html.twig b/templates/layouts/navigation-menu/layout.html.twig
index 10b2d76de..6580b36d9 100644
--- a/templates/layouts/navigation-menu/layout.html.twig
+++ b/templates/layouts/navigation-menu/layout.html.twig
@@ -28,11 +28,17 @@
 			{% endif %}
 			<div class="ibo-navigation-menu--user-info">
 				<div class="ibo-navigation-menu--user-picture">
-					<img class="ibo-navigation-menu--user-picture--image" src="{{ oNavigationMenu.UserData.sPictureUrl }}" alt="{{ 'UI:Layout:NavigationMenu:UserInfo:Picture:AltText'|dict_s }}" />
+					<img class="ibo-navigation-menu--user-picture--image" 
+						 src="{{ oNavigationMenu.UserData.sPictureUrl }}" 
+						 alt="{{ 'UI:Layout:NavigationMenu:UserInfo:Picture:AltText'|dict_format(oNavigationMenu.UserData.sFirstname) }}" 
+						 data-tooltip-content="{{ oNavigationMenu.UserData.sLogonMessage }}"
+						 data-tooltip-placement="right"
+						 data-tooltip-distance-offset="20"
+					/>
 				</div>
 				<div class="ibo-navigation-menu--user-welcome-message">
 					<div class="ibo-navigation-menu--user-welcome-message--text">
-						{{ oNavigationMenu.UserData.sLogonMessage }}
+						{{ oNavigationMenu.UserData.sWelcomeMessage }}
 						<span class="ibo-navigation-menu--user-welcome-message--toggler">
 							<i class="fas fa-caret-down"></i>
 						</span>