Skip to content

A free open source IT asset/license management system

Removed unused form_class props

snipe467293b8da98
diff --git a/resources/views/blade/modals/add-note.blade.php b/resources/views/blade/modals/add-note.blade.php
index 433657da3c..528648e20c 100644
--- a/resources/views/blade/modals/add-note.blade.php
+++ b/resources/views/blade/modals/add-note.blade.php
@@ -3,6 +3,7 @@
{{-- See snipeit_modals.js for what powers this --}}
<x-modals
id="createNoteModal"
+ stacked
:title="trans('general.add_note')"
:action="route('notes.store')"
form_attrs='accept-charset="UTF-8"'
diff --git a/resources/views/blade/modals/adjust-quantity.blade.php b/resources/views/blade/modals/adjust-quantity.blade.php
index 85e0b8d798..c6237d3252 100644
--- a/resources/views/blade/modals/adjust-quantity.blade.php
+++ b/resources/views/blade/modals/adjust-quantity.blade.php
@@ -3,6 +3,7 @@
handler. --}}
<x-modals
id="adjustQuantityModal"
+ stacked
form_attrs='id="adjustQuantityForm" enctype="multipart/form-data"'
>
<x-slot:header>
diff --git a/resources/views/blade/modals/category.blade.php b/resources/views/blade/modals/category.blade.php
index 766bfd651d..24790f8003 100644
--- a/resources/views/blade/modals/category.blade.php
+++ b/resources/views/blade/modals/category.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/categories/general.create')"
:action="route('api.categories.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('general.name')" id="modal-name" required />
diff --git a/resources/views/blade/modals/company.blade.php b/resources/views/blade/modals/company.blade.php
index b9c930048f..4a679f46ed 100644
--- a/resources/views/blade/modals/company.blade.php
+++ b/resources/views/blade/modals/company.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/companies/table.create')"
:action="route('api.companies.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('general.name')" id="modal-name" required />
diff --git a/resources/views/blade/modals/confirm-action.blade.php b/resources/views/blade/modals/confirm-action.blade.php
index c63948da36..7c484dea13 100644
--- a/resources/views/blade/modals/confirm-action.blade.php
+++ b/resources/views/blade/modals/confirm-action.blade.php
@@ -13,7 +13,7 @@
:action="$route"
:submit_label="$buttonLabel ?? trans('general.confirm')"
:submit_class="$buttonClass"
- :form_class="$modalClass ? 'form-horizontal '.$modalClass : 'form-horizontal'"
+ :form_class="$modalClass"
>
<div class="row">
<div class="col-md-12">
diff --git a/resources/views/blade/modals/index.blade.php b/resources/views/blade/modals/index.blade.php
index 287eb70ab1..9b9f3fbc9c 100644
--- a/resources/views/blade/modals/index.blade.php
+++ b/resources/views/blade/modals/index.blade.php
@@ -1,3 +1,9 @@
+{{-- stacked: default false, giving BS3 form-horizontal (label-left,
+ input-right grid) which matches every regular edit/create form in
+ the app. Pass stacked to opt into a vertical form (labels above
+ inputs), typically paired with x-form.row's stacked prop on each
+ row. form_class layers additional classes on top of the layout
+ default, if a caller needs one. --}}
@props([
'id' => null,
'title' => null,
@@ -8,6 +14,7 @@
'labelledby' => null,
'form_attrs' => '',
'form_class' => null,
+ 'stacked' => false,
])
@php
@@ -15,6 +22,7 @@
$labelledById = $labelledby ?? ($id ? $id.'Label' : null);
$onsubmit = $submitToSelect2 ? ' onsubmit="return false"' : '';
$saveButtonAttrs = $submitToSelect2 ? ' type="button" id="modal-save"' : ' type="submit"';
+ $formClass = trim(($stacked ? '' : 'form-horizontal').' '.($form_class ?? ''));
@endphp
@if ($id)
@@ -44,7 +52,7 @@
@if ($submitToSelect2)
<div class="modal-body">
<x-alert type="danger" id="modal_error_msg" style="display:none"></x-alert>
- <form action="{{ $action }}" method="POST" @if ($form_class) class="{{ $form_class }}" @endif{!! $onsubmit !!} {!! $form_attrs !!}>
+ <form action="{{ $action }}" method="POST" @if ($formClass) class="{{ $formClass }}" @endif{!! $onsubmit !!} {!! $form_attrs !!}>
@csrf
{{ $slot }}
</form>
@@ -58,7 +66,7 @@
@endisset
</div>
@else
- <form action="{{ $action }}" method="POST" @if ($form_class) class="{{ $form_class }}" @endif{!! $onsubmit !!} {!! $form_attrs !!}>
+ <form action="{{ $action }}" method="POST" @if ($formClass) class="{{ $formClass }}" @endif{!! $onsubmit !!} {!! $form_attrs !!}>
@csrf
<div class="modal-body">
{{ $slot }}
diff --git a/resources/views/blade/modals/kit-accessory.blade.php b/resources/views/blade/modals/kit-accessory.blade.php
index 64126ca906..a6f37af79b 100644
--- a/resources/views/blade/modals/kit-accessory.blade.php
+++ b/resources/views/blade/modals/kit-accessory.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/kits/general.append_accessory')"
:action="route('api.kits.accessories.store', $kitId)"
submitToSelect2
- form_class="form-horizontal"
>
<x-input.accessory-select
name="accessory"
diff --git a/resources/views/blade/modals/kit-consumable.blade.php b/resources/views/blade/modals/kit-consumable.blade.php
index b4b5667c6d..9fb92f4133 100644
--- a/resources/views/blade/modals/kit-consumable.blade.php
+++ b/resources/views/blade/modals/kit-consumable.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/kits/general.append_consumable')"
:action="route('api.kits.consumables.store', $kitId)"
submitToSelect2
- form_class="form-horizontal"
>
<x-input.consumable-select
name="consumable"
diff --git a/resources/views/blade/modals/kit-license.blade.php b/resources/views/blade/modals/kit-license.blade.php
index a39e92d870..4d2b545502 100644
--- a/resources/views/blade/modals/kit-license.blade.php
+++ b/resources/views/blade/modals/kit-license.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/kits/general.append_license')"
:action="route('api.kits.licenses.store', $kitId)"
submitToSelect2
- form_class="form-horizontal"
>
<x-input.license-select
name="license"
diff --git a/resources/views/blade/modals/kit-model.blade.php b/resources/views/blade/modals/kit-model.blade.php
index ac96bd680e..a92775b847 100644
--- a/resources/views/blade/modals/kit-model.blade.php
+++ b/resources/views/blade/modals/kit-model.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/kits/general.append_model')"
:action="route('api.kits.models.store', $kitId)"
submitToSelect2
- form_class="form-horizontal"
>
<x-input.model-select
name="model"
diff --git a/resources/views/blade/modals/location.blade.php b/resources/views/blade/modals/location.blade.php
index e979f30c4a..54a4f7f35e 100644
--- a/resources/views/blade/modals/location.blade.php
+++ b/resources/views/blade/modals/location.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/locations/table.create')"
:action="route('api.locations.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('general.name')" id="modal-name" required />
diff --git a/resources/views/blade/modals/maintenance-complete.blade.php b/resources/views/blade/modals/maintenance-complete.blade.php
index f9c30b2228..3c637794b8 100644
--- a/resources/views/blade/modals/maintenance-complete.blade.php
+++ b/resources/views/blade/modals/maintenance-complete.blade.php
@@ -6,6 +6,7 @@
as a delegated `.complete-maintenance` handler. --}}
<x-modals
id="completeMaintenanceModal"
+ stacked
:title="trans('admin/maintenances/form.mark_complete')"
:submit_label="trans('admin/maintenances/form.mark_complete')"
submit_class="btn-success"
diff --git a/resources/views/blade/modals/maintenance-type.blade.php b/resources/views/blade/modals/maintenance-type.blade.php
index 82f96245a8..9d20378992 100644
--- a/resources/views/blade/modals/maintenance-type.blade.php
+++ b/resources/views/blade/modals/maintenance-type.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/maintenance_types/general.create')"
:action="route('api.maintenance-types.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('general.name')" id="modal-name" required />
</x-modals>
diff --git a/resources/views/blade/modals/manufacturer.blade.php b/resources/views/blade/modals/manufacturer.blade.php
index fa638b44a4..b5a370f366 100644
--- a/resources/views/blade/modals/manufacturer.blade.php
+++ b/resources/views/blade/modals/manufacturer.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/manufacturers/table.create')"
:action="route('api.manufacturers.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('admin/manufacturers/table.name')" id="modal-name" required />
</x-modals>
diff --git a/resources/views/blade/modals/model.blade.php b/resources/views/blade/modals/model.blade.php
index dcc88dd65d..eabb6d0db3 100644
--- a/resources/views/blade/modals/model.blade.php
+++ b/resources/views/blade/modals/model.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/models/table.create')"
:action="route('api.models.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('general.name')" id="modal-name" required />
diff --git a/resources/views/blade/modals/request-item.blade.php b/resources/views/blade/modals/request-item.blade.php
index 3bb3ca1ccf..04da23858f 100644
--- a/resources/views/blade/modals/request-item.blade.php
+++ b/resources/views/blade/modals/request-item.blade.php
@@ -3,6 +3,7 @@
moving parts stay familiar. --}}
<x-modals
id="requestItemModal"
+ stacked
:submit_label="trans('button.request')"
form_attrs='id="requestItemForm" accept-charset="utf-8"'
>
diff --git a/resources/views/blade/modals/statuslabel.blade.php b/resources/views/blade/modals/statuslabel.blade.php
index d3473c1d19..c8ac691c20 100644
--- a/resources/views/blade/modals/statuslabel.blade.php
+++ b/resources/views/blade/modals/statuslabel.blade.php
@@ -4,7 +4,6 @@
:title="trans('admin/statuslabels/table.create')"
:action="route('api.statuslabels.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('admin/statuslabels/table.name')" id="modal-name" required />
diff --git a/resources/views/blade/modals/supplier.blade.php b/resources/views/blade/modals/supplier.blade.php
index 0fbb959c50..62c9d7f3b5 100644
--- a/resources/views/blade/modals/supplier.blade.php
+++ b/resources/views/blade/modals/supplier.blade.php
@@ -3,7 +3,6 @@
:title="trans('admin/suppliers/table.create')"
:action="route('api.suppliers.store')"
submitToSelect2
- form_class="form-horizontal"
>
<x-form.row name="name" :label="trans('admin/suppliers/table.name')" id="modal-name" required />
<x-form.row name="contact" :label="trans('admin/suppliers/table.contact')" id="modal-contact" />
diff --git a/resources/views/blade/modals/upload-file.blade.php b/resources/views/blade/modals/upload-file.blade.php
index f96ae707fd..7a4a7c99c0 100644
--- a/resources/views/blade/modals/upload-file.blade.php
+++ b/resources/views/blade/modals/upload-file.blade.php
@@ -2,6 +2,7 @@
<x-modals
id="uploadFileModal"
+ stacked
:title="trans('general.file_upload')"
:action="route('ui.files.store', ['object_type' => str_plural($itemType), 'id' => $itemId])"
:submit_label="trans('button.upload')"
diff --git a/resources/views/blade/modals/user.blade.php b/resources/views/blade/modals/user.blade.php
index 569b4b66f1..c29e32ac04 100644
--- a/resources/views/blade/modals/user.blade.php
+++ b/resources/views/blade/modals/user.blade.php
@@ -5,7 +5,6 @@
:title="trans('admin/users/table.createuser')"
:action="route('api.users.store')"
submitToSelect2
- form_class="form-horizontal"
>
@if ($user->companies->isNotEmpty())
<input type="hidden" name="company_id" value="{{ $user->companies->first()->id }}">