diff --git a/dictionaries/ui/components/field/cs.dictionary.itop.field.php b/dictionaries/ui/components/field/cs.dictionary.itop.field.php index 9e17850a22..a9773c1445 100644 --- a/dictionaries/ui/components/field/cs.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/cs.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('CS CZ', 'Czech', 'Čeština', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Neznámé hodnoty', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/da.dictionary.itop.field.php b/dictionaries/ui/components/field/da.dictionary.itop.field.php index 7d007854e4..65dcc07b94 100644 --- a/dictionaries/ui/components/field/da.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/da.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('DA DA', 'Danish', 'Dansk', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Unknown values~~', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/de.dictionary.itop.field.php b/dictionaries/ui/components/field/de.dictionary.itop.field.php index cd6602fd42..de07b9ba5b 100644 --- a/dictionaries/ui/components/field/de.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/de.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('DE DE', 'German', 'Deutsch', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Unbekannte Werte', + 'UI:Component:Field:GroupedActions:Tooltip' => 'Weitere Aktionen', ]); diff --git a/dictionaries/ui/components/field/en.dictionary.itop.field.php b/dictionaries/ui/components/field/en.dictionary.itop.field.php index ca6c19db09..6cd5e58fbe 100644 --- a/dictionaries/ui/components/field/en.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/en.dictionary.itop.field.php @@ -21,4 +21,5 @@ // Global search Dict::Add('EN US', 'English', 'English', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Unknown values', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions', ]); diff --git a/dictionaries/ui/components/field/en_gb.dictionary.itop.field.php b/dictionaries/ui/components/field/en_gb.dictionary.itop.field.php index dba2faa929..80f6c71915 100644 --- a/dictionaries/ui/components/field/en_gb.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/en_gb.dictionary.itop.field.php @@ -8,4 +8,5 @@ // Global search Dict::Add('EN GB', 'British English', 'British English', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Unknown values', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions', ]); diff --git a/dictionaries/ui/components/field/es_cr.dictionary.itop.field.php b/dictionaries/ui/components/field/es_cr.dictionary.itop.field.php index 0137741c15..cd27f446e8 100644 --- a/dictionaries/ui/components/field/es_cr.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/es_cr.dictionary.itop.field.php @@ -10,4 +10,5 @@ */ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Valores desconocidos', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/fr.dictionary.itop.field.php b/dictionaries/ui/components/field/fr.dictionary.itop.field.php index ca72f4fa0c..47d4691bca 100644 --- a/dictionaries/ui/components/field/fr.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/fr.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('FR FR', 'French', 'Français', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Valeurs inconnues', + 'UI:Component:Field:GroupedActions:Tooltip' => 'Plus d\'actions', ]); diff --git a/dictionaries/ui/components/field/hu.dictionary.itop.field.php b/dictionaries/ui/components/field/hu.dictionary.itop.field.php index a55a0618d1..9492e4b300 100644 --- a/dictionaries/ui/components/field/hu.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/hu.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('HU HU', 'Hungarian', 'Magyar', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Ismeretlen értékek', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/it.dictionary.itop.field.php b/dictionaries/ui/components/field/it.dictionary.itop.field.php index da6160b72c..e610357550 100644 --- a/dictionaries/ui/components/field/it.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/it.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('IT IT', 'Italian', 'Italiano', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Valori sconosciuti', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/ja.dictionary.itop.field.php b/dictionaries/ui/components/field/ja.dictionary.itop.field.php index 4770049bb6..7cef1542bd 100644 --- a/dictionaries/ui/components/field/ja.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/ja.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('JA JP', 'Japanese', '日本語', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Unknown values~~', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/nl.dictionary.itop.field.php b/dictionaries/ui/components/field/nl.dictionary.itop.field.php index 2814ef8a65..aa4c310292 100644 --- a/dictionaries/ui/components/field/nl.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/nl.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('NL NL', 'Dutch', 'Nederlands', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Onbekende waardes', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/pl.dictionary.itop.field.php b/dictionaries/ui/components/field/pl.dictionary.itop.field.php index b1c72557ac..558184579f 100644 --- a/dictionaries/ui/components/field/pl.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/pl.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('PL PL', 'Polish', 'Polski', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Nieznane wartości', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/pt_br.dictionary.itop.field.php b/dictionaries/ui/components/field/pt_br.dictionary.itop.field.php index 614c22a783..0c8ebcea99 100644 --- a/dictionaries/ui/components/field/pt_br.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/pt_br.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Valores desconhecidos', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/ru.dictionary.itop.field.php b/dictionaries/ui/components/field/ru.dictionary.itop.field.php index 8ffcb4c181..ff3c404889 100755 --- a/dictionaries/ui/components/field/ru.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/ru.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('RU RU', 'Russian', 'Русский', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Неизвестные значения', + 'UI:Component:Field:GroupedActions:Tooltip' => 'Больше действий', ]); diff --git a/dictionaries/ui/components/field/sk.dictionary.itop.field.php b/dictionaries/ui/components/field/sk.dictionary.itop.field.php index da42fde3eb..068d4f6760 100644 --- a/dictionaries/ui/components/field/sk.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/sk.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Unknown values~~', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/tr.dictionary.itop.field.php b/dictionaries/ui/components/field/tr.dictionary.itop.field.php index 3feaf31458..2442fcb986 100644 --- a/dictionaries/ui/components/field/tr.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/tr.dictionary.itop.field.php @@ -12,4 +12,5 @@ */ Dict::Add('TR TR', 'Turkish', 'Türkçe', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => 'Unknown values~~', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/dictionaries/ui/components/field/zh_cn.dictionary.itop.field.php b/dictionaries/ui/components/field/zh_cn.dictionary.itop.field.php index 3174cda940..a80278f952 100644 --- a/dictionaries/ui/components/field/zh_cn.dictionary.itop.field.php +++ b/dictionaries/ui/components/field/zh_cn.dictionary.itop.field.php @@ -20,4 +20,5 @@ // Global search Dict::Add('ZH CN', 'Chinese', '简体中文', [ 'UI:Component:Field:BulkModify:UnknownValues:Tooltip' => '未知值', + 'UI:Component:Field:GroupedActions:Tooltip' => 'More actions~~', ]); diff --git a/sources/Application/UI/Base/Component/Field/FieldUIBlockFactory.php b/sources/Application/UI/Base/Component/Field/FieldUIBlockFactory.php index 060663b50d..657847d332 100644 --- a/sources/Application/UI/Base/Component/Field/FieldUIBlockFactory.php +++ b/sources/Application/UI/Base/Component/Field/FieldUIBlockFactory.php @@ -13,6 +13,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuFactory; use Combodo\iTop\Application\UI\Base\UIBlock; +use Dict; use utils; /** @@ -76,14 +77,13 @@ class FieldUIBlockFactory extends AbstractUIBlockFactory $aActions = []; // Create buttons for a few actions or a grouped-actions button for more actions than configured if (count($aParams['actions']) > $iMaxActions) { - $oGroupedActionsButton = ButtonUIBlockFactory::MakeIconAction('fas fa-ellipsis-v', 'More actions', 'grouped-actions'); + $oGroupedActionsButton = ButtonUIBlockFactory::MakeIconAction('fas fa-ellipsis-v', Dict::S('UI:Component:Field:GroupedActions:Tooltip'), 'grouped-actions'); $oGroupedActionsButton->AddCSSClass('ibo-field--action'); $aGroupedActions = []; foreach ($aParams['actions'] as $oAction) { $aGroupedActions[] = $oAction->GetMenuItem(); } - //TODO: Make a dict entry for the grouped actions menu label $oGroupedActionsPopoverMenu = PopoverMenuFactory::MakeMenuForActions($oField->GetId().'--grouped-actions-menu', $aGroupedActions); $oGroupedActionsPopoverMenu->AddCSSClass('ibo-field--grouped-actions-popover'); $oGroupedActionsPopoverMenu->SetTogglerFromBlock($oGroupedActionsButton); diff --git a/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php b/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php index 938bea51b8..e182b3ec74 100644 --- a/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php +++ b/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php @@ -16,6 +16,7 @@ use Combodo\iTop\Application\UI\Base\Component\Input\RichText\RichText; use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use Combodo\iTop\Application\UI\Base\UIBlock; use DBObject; +use Dict; use MetaModel; use utils; @@ -281,7 +282,7 @@ class CaseLogEntryForm extends UIContentBlock */ protected function InitExtraActionButtonBar(): void { - $this->oExtraActionButtonBar = new ButtonBar(); + $this->oExtraActionButtonBar = new ButtonBar([], Dict::S('UI:Component:Field:GroupedActions:Tooltip')); } /**