diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index eb3da7ffa..cdb49a46e 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -3216,7 +3216,8 @@ EOF
// - Fullscreen toggler for large fields
$sFullscreenTogglerTooltip = Dict::S('UI:ToggleFullScreen');
$sFullscreenTogglerHTML = (false === in_array($oAttDef->GetEditClass(), static::GetAttEditClassesToRenderAsLargeField())) ? '' : <<
HTML;
diff --git a/dictionaries/ui/layouts/cs.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/cs.dictionary.itop.tab-container.php
index ee95c7c54..7ff6fc8d9 100644
--- a/dictionaries/ui/layouts/cs.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/cs.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('CS CZ', 'Czech', 'Čeština', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/da.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/da.dictionary.itop.tab-container.php
index e38dc49a4..46748fe5d 100644
--- a/dictionaries/ui/layouts/da.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/da.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('DA DA', 'Danish', 'Dansk', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/de.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/de.dictionary.itop.tab-container.php
index dfda84fa5..75152a3d8 100644
--- a/dictionaries/ui/layouts/de.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/de.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('DE DE', 'German', 'Deutsch', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/en.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/en.dictionary.itop.tab-container.php
index d44e906ae..afbebe918 100644
--- a/dictionaries/ui/layouts/en.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/en.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('EN US', 'English', 'English', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab',
]);
diff --git a/dictionaries/ui/layouts/es_cr.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/es_cr.dictionary.itop.tab-container.php
index 78326e7f4..967537cf9 100644
--- a/dictionaries/ui/layouts/es_cr.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/es_cr.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/fr.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/fr.dictionary.itop.tab-container.php
index 4101d49d5..4ec3edc85 100644
--- a/dictionaries/ui/layouts/fr.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/fr.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('FR FR', 'French', 'Français', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Autres onglets',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Impossible d\'ajouter le bloc %1$s à %2$s (seul les blocs de type Tab sont autorisés) : Veuillez contacter votre administrateur',
'UIBlock:TabContainer:RemoteTabLoad' => 'Cliquez pour charger cet onglet',
]);
diff --git a/dictionaries/ui/layouts/hu.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/hu.dictionary.itop.tab-container.php
index fe63d81bd..fbfd7e662 100644
--- a/dictionaries/ui/layouts/hu.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/hu.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('HU HU', 'Hungarian', 'Magyar', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/it.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/it.dictionary.itop.tab-container.php
index e5baee6f0..d936e7bdf 100644
--- a/dictionaries/ui/layouts/it.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/it.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('IT IT', 'Italian', 'Italiano', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/ja.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/ja.dictionary.itop.tab-container.php
index 583cec8d4..60ea3731d 100644
--- a/dictionaries/ui/layouts/ja.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/ja.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('JA JP', 'Japanese', '日本語', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/nl.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/nl.dictionary.itop.tab-container.php
index f582baa2c..145037382 100644
--- a/dictionaries/ui/layouts/nl.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/nl.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/pt_br.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/pt_br.dictionary.itop.tab-container.php
index 29a5eb4e5..a589b3930 100644
--- a/dictionaries/ui/layouts/pt_br.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/pt_br.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/ru.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/ru.dictionary.itop.tab-container.php
index 8989ab64d..45b5c10d4 100644
--- a/dictionaries/ui/layouts/ru.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/ru.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('RU RU', 'Russian', 'Русский', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/sk.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/sk.dictionary.itop.tab-container.php
index a303e174a..8a55d90c6 100644
--- a/dictionaries/ui/layouts/sk.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/sk.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/tr.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/tr.dictionary.itop.tab-container.php
index 1f5e8c329..c550aafdc 100644
--- a/dictionaries/ui/layouts/tr.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/tr.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('TR TR', 'Turkish', 'Türkçe', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/dictionaries/ui/layouts/zh_cn.dictionary.itop.tab-container.php b/dictionaries/ui/layouts/zh_cn.dictionary.itop.tab-container.php
index 065733c75..8eb7999fe 100644
--- a/dictionaries/ui/layouts/zh_cn.dictionary.itop.tab-container.php
+++ b/dictionaries/ui/layouts/zh_cn.dictionary.itop.tab-container.php
@@ -5,6 +5,7 @@
*/
Dict::Add('ZH CN', 'Chinese', '简体中文', [
+ 'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => 'Other tabs~~',
'UIBlock:Error:AddBlockNotTabForbidden' => 'Cannot add block %1$s to %2$s (only Tab blocks are allowed)~~',
'UIBlock:TabContainer:RemoteTabLoad' => 'Click to load this tab~~',
]);
diff --git a/templates/base/components/button/buttonjs.html.twig b/templates/base/components/button/buttonjs.html.twig
index 2db9496d0..5c9f72034 100644
--- a/templates/base/components/button/buttonjs.html.twig
+++ b/templates/base/components/button/buttonjs.html.twig
@@ -1,5 +1,6 @@
+{% set sAriaLabel = oUIBlock.GetLabel() is not empty ? oUIBlock.GetLabel() : (oUIBlock.GetTooltip() is not empty ? oUIBlock.GetTooltip() : '') %}