A free open source IT asset/license management system
Inherit stacked (or not stacked) from the modal shell
snipeb48c73ca48d7
diff --git a/resources/views/blade/form/row.blade.php b/resources/views/blade/form/row.blade.phpindex 5319909de4..dd7e332340 100644--- a/resources/views/blade/form/row.blade.php+++ b/resources/views/blade/form/row.blade.php@@ -26,7 +26,17 @@'required' => null,])+{{-- Inherit `stacked` from an ancestor <x-modals stacked> so callers don't+ repeat the flag on every row inside a vertical modal. @aware+ unconditionally overwrites $stacked, so we snapshot the row's explicit+ value first and OR the two after aware runs. Row-explicit stacked=true+ still wins if the modal is horizontal. --}}@php+ $callerStacked = $stacked;+@endphp+@aware(['stacked' => false])+@php+ $stacked = $callerStacked || $stacked;$errors_class = $errors->has($name) ? ' has-error' : '';$input_id = $id ?? $name;@endphpdiff --git a/resources/views/blade/modals/adjust-quantity.blade.php b/resources/views/blade/modals/adjust-quantity.blade.phpindex c6237d3252..837eda2176 100644--- a/resources/views/blade/modals/adjust-quantity.blade.php+++ b/resources/views/blade/modals/adjust-quantity.blade.php@@ -25,7 +25,6 @@log entry with no qty change so users can record a physicalcount against the current DB value. --}}<x-form.row- stackedid="adjustQuantityAmount"name="amount"type="number"@@ -40,7 +39,6 @@losses rather than purchases, so purchase metadata doesn't apply. --}}<div id="adjustQuantityAcquisitionFields"><x-form.row- stackedid="adjustQuantityOrder"name="order_number":label="trans('general.order_number')"@@ -51,7 +49,7 @@horizontal-form scaffold (col-md-3 label + col-md-7 input),which fights the stacked form-group layout used across thismodal. snipeit.js auto-initializes any .js-data-ajax select. --}}- <x-form.row stacked name="supplier_id" :label="trans('general.supplier')">+ <x-form.row name="supplier_id" :label="trans('general.supplier')"><x-slot:input><selectclass="js-data-ajax form-control"@@ -74,7 +72,7 @@because most adjust events happen the day they are recorded.Snipeit.js resets to today on every modal open so a stale datecan't bleed across sessions. --}}- <x-form.row stacked name="purchase_date" id="adjustQuantityPurchaseDate" type="datepicker" :end_date="'0d'" :default="now()->toDateString()">+ <x-form.row name="purchase_date" id="adjustQuantityPurchaseDate" type="datepicker" :end_date="'0d'" :default="now()->toDateString()"><x-slot:labelHtml><labelfor="adjustQuantityPurchaseDate"@@ -93,7 +91,7 @@historical currency handling is squishy already). Placeholder hintsat the system default without stamping it. --}}<div class="row" id="adjustQuantityCostRow">- <x-form.row stacked class="col-md-8" style="padding-right: 5px;" name="unit_cost" :label="trans('general.unit_cost')">+ <x-form.row class="col-md-8" style="padding-right: 5px;" name="unit_cost" :label="trans('general.unit_cost')"><x-slot:input><inputtype="number"@@ -106,7 +104,7 @@></x-slot:input></x-form.row>- <x-form.row stacked class="col-md-4" style="padding-left: 5px;" name="currency" :label="trans('general.currency')">+ <x-form.row class="col-md-4" style="padding-left: 5px;" name="currency" :label="trans('general.currency')"><x-slot:input><inputtype="text"@@ -130,7 +128,6 @@</x-form.help><x-form.row- stackedid="adjustQuantityNote"name="note"type="textarea"@@ -141,7 +138,7 @@{{-- Inlined instead of x-input.file-upload because that component wrapsits markup in x-form.row's horizontal scaffold. --}}- <x-form.row stacked name="file" :label="trans('general.file_upload')">+ <x-form.row name="file" :label="trans('general.file_upload')"><x-slot:input><div><label class="btn btn-sm btn-theme" for="adjustQuantityFile">diff --git a/resources/views/blade/modals/maintenance-complete.blade.php b/resources/views/blade/modals/maintenance-complete.blade.phpindex f060ccf3f6..0b602d0702 100644--- a/resources/views/blade/modals/maintenance-complete.blade.php+++ b/resources/views/blade/modals/maintenance-complete.blade.php@@ -14,7 +14,6 @@><p>{{ trans('admin/maintenances/message.complete.confirm') }}</p><x-form.row- stackedname="note"id="completionNote"type="textarea"diff --git a/resources/views/blade/modals/request-item.blade.php b/resources/views/blade/modals/request-item.blade.phpindex ad7d03cfb5..c109797bab 100644--- a/resources/views/blade/modals/request-item.blade.php+++ b/resources/views/blade/modals/request-item.blade.php@@ -28,7 +28,6 @@posted so the server-side path staysuniform across every requestable type. --}}<x-form.row- stackedid="requestItemQuantityRow"name="request-quantity"type="number"@@ -46,7 +45,6 @@the controller. --}}<div class="row"><x-form.row- stackedclass="col-md-6"id="requestItemStartDate"name="start_date"@@ -54,7 +52,6 @@:label="trans('general.start_date')"/><x-form.row- stackedclass="col-md-6"id="requestItemEndDate"name="end_date"@@ -70,7 +67,6 @@admin queue + in the "new request"notification. --}}<x-form.row- stackedid="requestItemNotes"name="notes"type="textarea"