Skip to content

Commit 36e3a0a

Browse files
committed
N°8955 Remove fixed width, add dynamic display for force uninstall menu item
1 parent eca98bf commit 36e3a0a

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

css/backoffice/layout/extension/_extension-details.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ $ibo-extension-details--actions--button--padding-x: $ibo-button--padding-x !defa
99
flex-direction: row;
1010
justify-content: space-between;
1111
align-items: center;
12-
13-
width: 450px;
12+
width: 100%;
1413
}
1514

1615
.ibo-extension-details--information {
@@ -48,4 +47,8 @@ $ibo-extension-details--actions--button--padding-x: $ibo-button--padding-x !defa
4847

4948
.ibo-extension-details--actions > button {
5049
padding: $ibo-extension-details--actions--button--padding-y $ibo-extension-details--actions--button--padding-x;
50+
}
51+
52+
.ibo-extension-details--actions:has(.toggler-install:not(:disabled)) .ibo-popover-menu--section a[data-resource-id="force_uninstall"] {
53+
display: none;
5154
}

sources/Application/UI/Base/Layout/Extension/ExtensionDetails.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ protected function InitializeToggler()
173173
{
174174
$this->oToggler = new Toggler();
175175
$this->oToggler->SetName('ExtensionToggler');
176+
$this->oToggler->AddCSSClass('toggler-install');
176177
}
177178

178179
protected function InitializePopoverMenu()
@@ -204,7 +205,6 @@ public function AllowForceUninstall()
204205
'force_uninstall',
205206
'Force uninstall',
206207
<<<JS
207-
this.style.display = 'none';
208208
this.closest('.ibo-extension-details').querySelector('input[type=checkbox]').disabled = false
209209
JS,
210210
);

tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
4646
use Combodo\iTop\Application\UI\Base\Layout\Extension\ExtensionDetails;
4747
use Combodo\iTop\Application\UI\Base\Layout\Extension\ExtensionDetailsUIBlockFactory;
48+
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\Column;
49+
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumn;
4850
use Combodo\iTop\Application\UI\Base\Layout\Object\ObjectFactory;
4951
use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory;
5052
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
@@ -625,11 +627,18 @@
625627

626628
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Extensions details layout', 3));
627629

630+
$oMultiCol = new MultiColumn();
631+
$oColumnLeft = new Column();
632+
$oColumnRight = new Column();
633+
$oMultiCol->AddColumn($oColumnLeft);
634+
$oMultiCol->AddColumn($oColumnRight);
635+
$oPage->AddUiBlock($oMultiCol);
636+
628637
$oExtensionDetailInstalledFromFactory = ExtensionDetailsUIBlockFactory::MakeInstalled('itop-sample', 'My extension v2', 'This is for test only', ['v1.1.1', 'Designer', '12/12/2012'], ['uninstallable' => false,'missing' => true]);
629-
$oPage->AddUiBlock($oExtensionDetailInstalledFromFactory);
638+
$oColumnLeft->AddSubBlock($oExtensionDetailInstalledFromFactory);
630639

631640
$oExtensionDetailInstalledWithLongTitle = ExtensionDetailsUIBlockFactory::MakeNotInstalled('itop-sample', 'My extension with a very long title', 'This is for test only', ['v1.1.1', 'Designer', '12/12/2012'], ['uninstallable' => false]);
632-
$oPage->AddUiBlock($oExtensionDetailInstalledWithLongTitle);
641+
$oColumnRight->AddSubBlock($oExtensionDetailInstalledWithLongTitle);
633642
$oPage->add('<hr id="page_bottom"/>');
634643

635644
$oPage->output();

0 commit comments

Comments
 (0)