From 96bb2c68107d9d9b44dc180a2caa0db2b7f228d6 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 20 Jul 2026 11:14:38 +0100 Subject: [PATCH] Fixed page column width --- app/Livewire/CheckoutTargetPanel.php | 14 +------ .../views/accessories/checkout.blade.php | 4 +- .../blade/side-panel/removed-assets.blade.php | 42 ------------------- resources/views/components/checkout.blade.php | 4 +- .../views/consumables/checkout.blade.php | 4 +- .../views/hardware/bulk-checkout.blade.php | 3 +- resources/views/hardware/checkout.blade.php | 4 +- resources/views/kits/checkout.blade.php | 4 +- resources/views/licenses/checkout.blade.php | 4 +- .../livewire/checkout-target-panel.blade.php | 2 +- 10 files changed, 21 insertions(+), 64 deletions(-) diff --git a/app/Livewire/CheckoutTargetPanel.php b/app/Livewire/CheckoutTargetPanel.php index c5737d6402..c3fffa5ca1 100644 --- a/app/Livewire/CheckoutTargetPanel.php +++ b/app/Livewire/CheckoutTargetPanel.php @@ -51,22 +51,11 @@ class CheckoutTargetPanel extends Component #[Locked] public string $defaultTargetType = 'user'; - /** - * Grid class applied to the component's root element. Defaults to - * `col-md-5` which matches the single-target checkout pages that host - * this panel directly next to a col-md-7 form. Pages that stack this - * panel with another box inside their own col-md-5 wrapper pass - * `col-md-12` so the component fills its parent instead of collapsing - * to a nested 5/12 width. - */ - #[Locked] - public string $rootClass = 'col-md-5'; - public ?string $targetType = null; public ?int $targetId = null; - public function mount(string $type, string $defaultTargetType = 'user', string $rootClass = 'col-md-5'): void + public function mount(string $type, string $defaultTargetType = 'user'): void { if (! in_array($type, self::TYPES, true)) { throw new \InvalidArgumentException("Unknown checkout-target-panel type: {$type}"); @@ -78,7 +67,6 @@ class CheckoutTargetPanel extends Component $this->type = $type; $this->defaultTargetType = $defaultTargetType; - $this->rootClass = $rootClass; } /** diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php index 6009af293f..f62174e820 100755 --- a/resources/views/accessories/checkout.blade.php +++ b/resources/views/accessories/checkout.blade.php @@ -112,7 +112,9 @@ - + + + diff --git a/resources/views/blade/side-panel/removed-assets.blade.php b/resources/views/blade/side-panel/removed-assets.blade.php index 5f952a6874..3b500d4adb 100644 --- a/resources/views/blade/side-panel/removed-assets.blade.php +++ b/resources/views/blade/side-panel/removed-assets.blade.php @@ -2,12 +2,6 @@ 'items', 'message', 'title' => trans('general.notification_warning'), - // On bulk-checkout the checkout-target-panel Livewire component takes - // over the right column once the user picks a target, so this warning - // is only useful in the "picking assets, no target yet" phase — pass - // hideOnTargetSelected=true and the small script at the bottom will - // hide the box the moment a target select gets a value. - 'hideOnTargetSelected' => false, ]) {{-- Warning side-panel used by bulk checkin/checkout to explain which assets @@ -57,40 +51,4 @@ - - @if ($hideOnTargetSelected) - - @endif @endif diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php index e1c31e7166..c665c931f1 100644 --- a/resources/views/components/checkout.blade.php +++ b/resources/views/components/checkout.blade.php @@ -80,7 +80,9 @@ - + + + diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php index 15a320fa26..3f7f5b80f2 100644 --- a/resources/views/consumables/checkout.blade.php +++ b/resources/views/consumables/checkout.blade.php @@ -109,7 +109,9 @@ - + + + diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php index d7a7dedbdb..cd00b128d8 100644 --- a/resources/views/hardware/bulk-checkout.blade.php +++ b/resources/views/hardware/bulk-checkout.blade.php @@ -115,9 +115,8 @@ - + diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 8417c453f3..054097c629 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -182,7 +182,9 @@ - + + + @stop diff --git a/resources/views/kits/checkout.blade.php b/resources/views/kits/checkout.blade.php index 07604a255c..d27a94eb90 100644 --- a/resources/views/kits/checkout.blade.php +++ b/resources/views/kits/checkout.blade.php @@ -61,7 +61,9 @@ - + + + @stop diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php index 7be8ec5d52..2507c792e3 100755 --- a/resources/views/licenses/checkout.blade.php +++ b/resources/views/licenses/checkout.blade.php @@ -124,7 +124,9 @@ - + + + @stop diff --git a/resources/views/livewire/checkout-target-panel.blade.php b/resources/views/livewire/checkout-target-panel.blade.php index 6bc49efda0..550d93f916 100644 --- a/resources/views/livewire/checkout-target-panel.blade.php +++ b/resources/views/livewire/checkout-target-panel.blade.php @@ -1,4 +1,4 @@ -