diff --git a/dictionaries/ui/layouts/cs.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/cs.dictionary.itop.navigation-menu.php
index b39bd24b9..7dbc45511 100644
--- a/dictionaries/ui/layouts/cs.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/cs.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/da.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/da.dictionary.itop.navigation-menu.php
index 3c7da7846..c1027f280 100644
--- a/dictionaries/ui/layouts/da.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/da.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/de.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/de.dictionary.itop.navigation-menu.php
index e89bb2583..f4d3e952c 100644
--- a/dictionaries/ui/layouts/de.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/de.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php
index b7ea3e837..dd5913dbb 100644
--- a/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/en.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'Seems like there is no matching menu',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!',
diff --git a/dictionaries/ui/layouts/es_cr.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/es_cr.dictionary.itop.navigation-menu.php
index d450e36a8..069e8268c 100644
--- a/dictionaries/ui/layouts/es_cr.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/es_cr.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/fr.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/fr.dictionary.itop.navigation-menu.php
index 04f76b89d..a06721f5a 100644
--- a/dictionaries/ui/layouts/fr.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/fr.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Déplier / Replier (Filtré sur %1$s)~~',
'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filtrer...',
'UI:Layout:NavigationMenu:MenuFilter:Input:Tooltip' => 'Saisir des mots-clés pour filtrer les menus',
- 'UI:Layout:NavigationMenu:MenuFilter:Input:Hotkey' => 'Alt + M',
'UI:Layout:NavigationMenu:MenuFilter:Input:Hint' => 'Les correspondances dans chaque groupe de menu seront affichées',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'Aucun menu ne semble correspondre',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Bonjour %1$s !',
diff --git a/dictionaries/ui/layouts/hu.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/hu.dictionary.itop.navigation-menu.php
index 5ac0a4cf4..cd743aec8 100644
--- a/dictionaries/ui/layouts/hu.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/hu.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/it.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/it.dictionary.itop.navigation-menu.php
index bb2f621e3..7dc1b1934 100644
--- a/dictionaries/ui/layouts/it.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/it.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/ja.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/ja.dictionary.itop.navigation-menu.php
index ed045bb9d..cee2979cc 100644
--- a/dictionaries/ui/layouts/ja.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/ja.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/nl.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/nl.dictionary.itop.navigation-menu.php
index 435a123f0..6f2bd946c 100644
--- a/dictionaries/ui/layouts/nl.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/nl.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/pt_br.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/pt_br.dictionary.itop.navigation-menu.php
index 4369363ab..a02949a70 100644
--- a/dictionaries/ui/layouts/pt_br.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/pt_br.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/ru.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/ru.dictionary.itop.navigation-menu.php
index b83b33217..5888bb8ec 100644
--- a/dictionaries/ui/layouts/ru.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/ru.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/sk.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/sk.dictionary.itop.navigation-menu.php
index e91cbf6f3..8a5365629 100644
--- a/dictionaries/ui/layouts/sk.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/sk.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/tr.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/tr.dictionary.itop.navigation-menu.php
index a5b521f44..363b7fdcb 100644
--- a/dictionaries/ui/layouts/tr.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/tr.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/dictionaries/ui/layouts/zh_cn.dictionary.itop.navigation-menu.php b/dictionaries/ui/layouts/zh_cn.dictionary.itop.navigation-menu.php
index 428a09116..5625e3daa 100644
--- a/dictionaries/ui/layouts/zh_cn.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/zh_cn.dictionary.itop.navigation-menu.php
@@ -24,7 +24,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
'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:MenuFilter:Input:Hint' => 'Matches from all menu groups will be displayed~~',
'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
diff --git a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
index 4610339e4..26d203106 100644
--- a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
+++ b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
@@ -437,7 +437,7 @@ JS;
// Logon message
$sLogonMessageDictCode = (UserRights::IsAdministrator()) ? 'UI:LoggedAsMessage+Admin' : 'UI:LoggedAsMessage';
-
+
$aData['sLogonMessage'] = Dict::Format($sLogonMessageDictCode, UserRights::GetContactFriendlyname());
$this->aUserData = $aData;
@@ -445,9 +445,20 @@ JS;
return $this;
}
+ /**
+ * @return string
+ * @throws \CoreException
+ * @throws \CoreUnexpectedValue
+ * @throws \MySQLException
+ */
+ public function GetMenuFilterHotkeyLabel(): string
+ {
+ return utils::GetKeyboardShortcutPref('ibo-open-navigation-menu-filter')['key_for_display'];
+ }
+
public static function GetShortcutKeys(): array
{
- return [['id' => 'ibo-open-menu-filter', 'label' => 'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter', 'key'=> 'alt+m', 'event' => 'filter_shortcut']];
+ return [['id' => 'ibo-open-navigation-menu-filter', 'label' => 'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter', 'key' => 'alt+m', 'event' => 'filter_shortcut']];
}
public static function GetShortcutTriggeredElementSelector(): string
diff --git a/templates/base/layouts/navigation-menu/layout.html.twig b/templates/base/layouts/navigation-menu/layout.html.twig
index cdf237c2d..ae0be3820 100644
--- a/templates/base/layouts/navigation-menu/layout.html.twig
+++ b/templates/base/layouts/navigation-menu/layout.html.twig
@@ -87,27 +87,28 @@
-
-
-
-
+
+