diff --git a/css/backoffice/layout/extension/_extension-details.scss b/css/backoffice/layout/extension/_extension-details.scss index be2c61a54..b8d65461e 100644 --- a/css/backoffice/layout/extension/_extension-details.scss +++ b/css/backoffice/layout/extension/_extension-details.scss @@ -1,5 +1,8 @@ $ibo-extension-details--information--metadata--padding : $ibo-spacing-200 !default; $ibo-extension-details--information--metadata--delimiter : "-" !default; +$ibo-extension-details--information--metadata--color : $ibo-color-grey-700 !default; +$ibo-extension-details--actions--button--padding-y : 3px !default; +$ibo-extension-details--actions--button--padding-x : $ibo-button--padding-x !default; .ibo-extension-details { display: inline-flex; @@ -26,7 +29,7 @@ $ibo-extension-details--information--metadata--delimiter : "-" !default; .ibo-extension-details--information--metadata { @extend %ibo-font-ral-med-100; - color: $ibo-color-grey-700; + color: $ibo-extension-details--information--metadata--color; } .ibo-extension-details--information--description { @@ -44,6 +47,5 @@ $ibo-extension-details--information--metadata--delimiter : "-" !default; } .ibo-extension-details--actions > button { - position: relative; - top: -3px; + padding: $ibo-extension-details--actions--button--padding-y $ibo-extension-details--actions--button--padding-x; } \ No newline at end of file diff --git a/dictionaries/ui/layouts/extensions-details/en.dictionary.itop.extensions-details.php b/dictionaries/ui/layouts/extensions-details/en.dictionary.itop.extensions-details.php new file mode 100644 index 000000000..141286900 --- /dev/null +++ b/dictionaries/ui/layouts/extensions-details/en.dictionary.itop.extensions-details.php @@ -0,0 +1,17 @@ + 'installed', + 'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed', + 'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed', + 'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled', + 'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled', + 'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk', +]); diff --git a/dictionaries/ui/layouts/extensions-details/fr.dictionary.itop.extensions-details.php b/dictionaries/ui/layouts/extensions-details/fr.dictionary.itop.extensions-details.php new file mode 100644 index 000000000..b195c4860 --- /dev/null +++ b/dictionaries/ui/layouts/extensions-details/fr.dictionary.itop.extensions-details.php @@ -0,0 +1,17 @@ + 'installé', + 'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'va être installé', + 'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'pas installé', + 'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'va être désinstallé', + 'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'non désinstallable', + 'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'supprimé du disque', +]); diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index e987207b7..c233ae61d 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -271,7 +271,7 @@ return array( 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardLayout' => $baseDir . '/sources/Application/UI/Base/Layout/Dashboard/DashboardLayout.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => $baseDir . '/sources/Application/UI/Base/Layout/Dashboard/DashboardRow.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Extension\\ExtensionDetails' => $baseDir . '/sources/Application/UI/Base/Layout/Extension/ExtensionDetails.php', - 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Extension\\ExtensionDetailsFactory' => $baseDir . '/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Extension\\ExtensionDetailsUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => $baseDir . '/sources/Application/UI/Base/Layout/MultiColumn/Column/Column.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\ColumnUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => $baseDir . '/sources/Application/UI/Base/Layout/MultiColumn/MultiColumn.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index c37a8373b..3b70ab061 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -652,7 +652,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardLayout' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Dashboard/DashboardLayout.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Dashboard/DashboardRow.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Extension\\ExtensionDetails' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Extension/ExtensionDetails.php', - 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Extension\\ExtensionDetailsFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Extension\\ExtensionDetailsUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/MultiColumn/Column/Column.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\ColumnUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/MultiColumn/MultiColumn.php', diff --git a/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsFactory.php b/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php similarity index 72% rename from sources/Application/UI/Base/Layout/Extension/ExtensionDetailsFactory.php rename to sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php index 7e99bf7a8..67b9f0083 100644 --- a/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsFactory.php +++ b/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php @@ -7,7 +7,7 @@ use Combodo\iTop\Application\UI\Base\Component\Badge\BadgeUIBlockFactory; use Dict; use utils; -class ExtensionDetailsFactory extends AbstractUIBlockFactory +class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory { /** @inheritDoc */ public const TWIG_TAG_NAME = 'UIExtensionDetails'; @@ -20,10 +20,10 @@ class ExtensionDetailsFactory extends AbstractUIBlockFactory $bUninstallable = $aExtraFlags['uninstallable'] ?? true; $bMissingFromDisk = $aExtraFlags['missing'] ?? false; self::AddExtraBadges($aBadges, $bUninstallable, $bMissingFromDisk); - $oBadgeInstalled = BadgeUIBlockFactory::MakeGreen('installed'); + $oBadgeInstalled = BadgeUIBlockFactory::MakeGreen(Dict::S('UI:Layout:ExtensionsDetails:BadgeInstalled')); $oBadgeInstalled->AddCSSClass('checked'); $aBadges[] = $oBadgeInstalled; - $oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeRed('to be uninstalled'); + $oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeRed(Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeUninstalled')); $oBadgeToBeUninstalled->AddCSSClass('unchecked'); $aBadges[] = $oBadgeToBeUninstalled; @@ -41,10 +41,10 @@ class ExtensionDetailsFactory extends AbstractUIBlockFactory $aBadges = []; $bUninstallable = $aExtraFlags['uninstallable'] ?? true; self::AddExtraBadges($aBadges, $bUninstallable, false); - $oBadgeInstalled = BadgeUIBlockFactory::MakeGrey('not installed'); + $oBadgeInstalled = BadgeUIBlockFactory::MakeGrey(Dict::S('UI:Layout:ExtensionsDetails:BadgeNotInstalled')); $oBadgeInstalled->AddCSSClass('unchecked'); $aBadges[] = $oBadgeInstalled; - $oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeCyan('to be installed'); + $oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeCyan(Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeInstalled')); $oBadgeToBeUninstalled->AddCSSClass('checked'); $aBadges[] = $oBadgeToBeUninstalled; @@ -54,10 +54,10 @@ class ExtensionDetailsFactory extends AbstractUIBlockFactory private static function AddExtraBadges(array &$aBadges, bool $bUninstallable, bool $bMissingFromDisk) { if (!$bUninstallable) { - $aBadges[] = BadgeUIBlockFactory::MakeOrange('cannot be uninstalled'); + $aBadges[] = BadgeUIBlockFactory::MakeOrange(Dict::S('UI:Layout:ExtensionsDetails:BadgeNotUninstallable')); } if ($bMissingFromDisk) { - $aBadges[] = BadgeUIBlockFactory::MakeRed('missing from disk'); + $aBadges[] = BadgeUIBlockFactory::MakeRed(Dict::S('UI:Layout:ExtensionsDetails:BadgeMissingFromDisk')); } } } diff --git a/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php b/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php index 4e9a6d8ab..54fdc2f35 100644 --- a/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php +++ b/tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php @@ -44,7 +44,7 @@ use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItemFactory; use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\Extension\ExtensionDetails; -use Combodo\iTop\Application\UI\Base\Layout\Extension\ExtensionDetailsFactory; +use Combodo\iTop\Application\UI\Base\Layout\Extension\ExtensionDetailsUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\Object\ObjectFactory; use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory; use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; @@ -75,7 +75,7 @@ $oMainTitle = new Html('