Skip to content

Move form components into their own directory #18482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snipe merged 1 commit into from
Jan 24, 2026
Merged

Move form components into their own directory #18482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions resources/views/account/profile.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<div class="box-body">

<fieldset name="display-preferences">
<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.legends.display') }}
</x-form-legend>
</x-form.legend>

<!-- Language -->
<div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">
Expand Down Expand Up @@ -110,9 +110,9 @@
@can('self.profile')

<fieldset name="user-preferences">
<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.legends.your_details') }}
</x-form-legend>
</x-form.legend>
<!-- First Name -->
<div class="form-group {{ $errors->has('first_name') ? ' has-error' : '' }}">
<label for="first_name" class="col-md-3 control-label">{{ trans('general.first_name') }}
Expand Down
0 resources/views/blade/form-label.blade.php → resources/views/blade/form/label.blade.php
View file
Open in desktop
File renamed without changes.
0 ...es/views/blade/form-legend-help.blade.php → ...es/views/blade/form/legend-help.blade.php
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions resources/views/blade/form-legend.blade.php → resources/views/blade/form/legend.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</h4>

@if ($help_text)
<x-form-legend-help :icon="$icon">
<x-form.legend-help :icon="$icon">
{!! $help_text !!}
</x-form-legend-help>
</x-form.legend-help>
@endif
</legend>
6 changes: 3 additions & 3 deletions resources/views/blade/form-row.blade.php → resources/views/blade/form/row.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<!-- form label -->
@if (isset($label))
<x-form-label :for="$name" class="{{ $label_class ?? 'col-md-3' }}">{{ $label }}</x-form-label>
<x-form.label :for="$name" class="{{ $label_class ?? 'col-md-3' }}">{{ $label }}</x-form.label>
@endif


Expand Down Expand Up @@ -46,9 +46,9 @@
@if ($info_tooltip_text)
<!-- Info Tooltip -->
<div class="col-md-1 text-left" style="padding-left:0; margin-top: 5px;">
<x-form-tooltip>
<x-form.tooltip>
{{ $info_tooltip_text }}
</x-form-tooltip>
</x-form.tooltip>
</div>
@endif

Expand Down
0 resources/views/blade/form-tooltip.blade.php → resources/views/blade/form/tooltip.blade.php
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions resources/views/categories/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@section('inputFields')

<!-- Name -->
<x-form-row
<x-form.row
:label="trans('general.name')"
:$item
name="name"
Expand Down Expand Up @@ -85,9 +85,9 @@
@endif

<fieldset name="color-preferences">
<x-form-legend help_text="{{ trans('general.tag_color_help') }}">
<x-form.legend help_text="{{ trans('general.tag_color_help') }}">
{{ trans('general.tag_color') }}
</x-form-legend>
</x-form.legend>
<!-- color -->
<div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
<label for="tag_color" class="col-md-3 control-label">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/companies/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
</div>

<fieldset name="color-preferences">
<x-form-legend help_text="{{ trans('general.tag_color_help') }}">
<x-form.legend help_text="{{ trans('general.tag_color_help') }}">
{{ trans('general.tag_color') }}
</x-form-legend>
</x-form.legend>
<!-- color -->
<div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
<label for="tag_color" class="col-md-3 control-label">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/departments/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
</div>

<fieldset name="color-preferences">
<x-form-legend help_text="{{ trans('general.tag_color_help') }}">
<x-form.legend help_text="{{ trans('general.tag_color_help') }}">
{{ trans('general.tag_color') }}
</x-form-legend>
</x-form.legend>
<!-- color -->
<div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
<label for="tag_color" class="col-md-3 control-label">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/groups/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@


<fieldset>
<x-form-legend icon="warning" help_text="{{ (isset($all_users_count) && ($all_users_count < config('app.max_unpaginated_records'))) ? trans('general.add_users_to_group_help') : trans('admin/settings/general.too_many_users_to_show', ['count'=> $all_users_count, 'max' => config('app.max_unpaginated_records')]) }}">
<x-form.legend icon="warning" help_text="{{ (isset($all_users_count) && ($all_users_count < config('app.max_unpaginated_records'))) ? trans('general.add_users_to_group_help') : trans('admin/settings/general.too_many_users_to_show', ['count'=> $all_users_count, 'max' => config('app.max_unpaginated_records')]) }}">
{{ trans('general.add_users_to_group') }}
</x-form-legend>
</x-form.legend>

<!-- this is a temp fix for the select2 not working inside modals -->

Expand Down
8 changes: 4 additions & 4 deletions resources/views/hardware/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} {{ $i }}</

<fieldset name="optional-details">

<x-form-legend>
<x-form.legend>
<a id="optional_info">
<x-icon type="caret-right" class="fa-fw" id="optional_info_icon" />
{{ trans('admin/hardware/form.optional_infos') }}
</a>
</x-form-legend>
</x-form.legend>

<div id="optional_details" class="col-md-12" style="display:none">
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
Expand Down Expand Up @@ -172,12 +172,12 @@ class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} {{ $i }}</

<div class="col-md-12 col-sm-12">
<fieldset name="order-info">
<x-form-legend>
<x-form.legend>
<a id="order_info">
<x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
{{ trans('admin/hardware/form.order_details') }}
</a>
</x-form-legend>
</x-form.legend>

<div id='order_details' class="col-md-12" style="display:none">
@include ('partials.forms.edit.order_number')
Expand Down
4 changes: 2 additions & 2 deletions resources/views/locations/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
</div>

<fieldset name="color-preferences">
<x-form-legend help_text="{{ trans('general.tag_color_help') }}">
<x-form.legend help_text="{{ trans('general.tag_color_help') }}">
{{ trans('general.tag_color') }}
</x-form-legend>
</x-form.legend>
<!-- color -->
<div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
<label for="tag_color" class="col-md-3 control-label">
Expand Down
18 changes: 9 additions & 9 deletions resources/views/manufacturers/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<x-box>

<!-- Name -->
<x-form-row
<x-form.row
:label="trans('admin/manufacturers/table.name')"
:$item
name="name"
/>

<!-- URL -->
<x-form-row
<x-form.row
:label="trans('general.url')"
:$item
name="url"
Expand All @@ -33,7 +33,7 @@
/>

<!-- Support URL -->
<x-form-row
<x-form.row
:label="trans('admin/manufacturers/table.support_url')"
:$item
name="support_url"
Expand All @@ -44,7 +44,7 @@
/>

<!-- Warranty Lookup URL -->
<x-form-row
<x-form.row
:label="trans('admin/manufacturers/table.warranty_lookup_url')"
:$item
name="warranty_lookup_url"
Expand All @@ -56,7 +56,7 @@
/>

<!-- Support Phone -->
<x-form-row
<x-form.row
:label="trans('admin/manufacturers/table.support_phone')"
:$item
name="support_phone"
Expand All @@ -69,7 +69,7 @@


<!-- Support Email -->
<x-form-row
<x-form.row
:label="trans('admin/manufacturers/table.support_email')"
:$item
name="support_email"
Expand All @@ -85,7 +85,7 @@


<!-- Notes -->
<x-form-row
<x-form.row
:label="trans('general.notes')"
:$item
name="notes"
Expand All @@ -94,9 +94,9 @@
/>

<fieldset name="color-preferences">
<x-form-legend help_text="{{ trans('general.tag_color_help') }}">
<x-form.legend help_text="{{ trans('general.tag_color_help') }}">
{{ trans('general.tag_color') }}
</x-form-legend>
</x-form.legend>
<!-- color -->
<div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
<label for="tag_color" class="col-md-3 control-label">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/models/bulk-edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ class="js-fieldset-field"
<div class="col-md-9">
<div class="form-inline" style="display: flex; align-items: center; gap: 8px;">
<input type="checkbox" name="require_serial" value="1" id="require_serial" aria-label="require_serial" />
<x-form-tooltip>
<x-form.tooltip>
{{ trans('admin/hardware/general.require_serial_help') }}
</x-form-tooltip>
</x-form.tooltip>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/models/custom_fields_form.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<div class="col-md-12 col-sm-12">

<fieldset name="custom-fields">
<x-form-legend
<x-form.legend
help_text="{!! trans('admin/custom_fields/general.general_help_text') !!}">

{{ trans('admin/custom_fields/general.custom_fields') }}
</x-form-legend>
</x-form.legend>

@foreach($model->fieldset->fields as $field)
@if (!isset($show_custom_fields_type) || ($field->displayFieldInCurrentForm($show_custom_fields_type)))
Expand Down
4 changes: 2 additions & 2 deletions resources/views/models/custom_fields_form_bulk_edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

@if ($anyModelHasCustomFields > 0)
<fieldset name="custom-fields"">
<x-form-legend>
<x-form.legend>
{{ trans('admin/custom_fields/general.custom_fields') }}
</x-form-legend>
</x-form.legend>
@endif

@foreach($models as $model)
Expand Down
4 changes: 2 additions & 2 deletions resources/views/partials/forms/edit/minimum_quantity.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
{{ (isset($item) && (Helper::checkIfRequired($item, 'min_amt')) ? ' required' : '') }}/>
</div>
<div class="col-md-7" style="margin-left: -15px;">
<x-form-tooltip>
<x-form.tooltip>
{{ trans('general.min_amt_help') }}
</x-form-tooltip>
</x-form.tooltip>
</div>
<div class="col-md-12">
{!! $errors->first('min_amt', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
Expand Down
12 changes: 6 additions & 6 deletions resources/views/settings/alerts.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@


<fieldset name="remote-login">
<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.legends.general') }}
</x-form-legend>
</x-form.legend>

<!-- Menu Alerts Enabled -->
<div class="form-group{{ $errors->has('show_alerts_in_menu') ? ' error' : '' }}">
Expand All @@ -69,9 +69,9 @@
</fieldset>

<fieldset name="alert-addresses">
<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.legends.email') }}
</x-form-legend>
</x-form.legend>

<!-- Alert Email -->
<div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
Expand Down Expand Up @@ -132,9 +132,9 @@

<fieldset name="remote-login">

<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.legends.intervals') }}
</x-form-legend>
</x-form.legend>

<!-- Inventory alert threshold -->
<div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
Expand Down
16 changes: 8 additions & 8 deletions resources/views/settings/branding.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ class="form-horizontal"
</div>

<fieldset name="color-preferences">
<x-form-legend help_text="{!! trans('admin/settings/general.color_settings_help') !!}">
<x-form.legend help_text="{!! trans('admin/settings/general.color_settings_help') !!}">
{{ trans('admin/settings/general.color_preferences') }}
</x-form-legend>
</x-form.legend>

<!-- Header color -->
<div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
Expand Down Expand Up @@ -129,9 +129,9 @@ class="form-horizontal"
</fieldset>

<fieldset name="logo-preferences">
<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.legends.logos') }}
</x-form-legend>
</x-form.legend>

@php
$optionTypes = trans('admin/settings/general.logo_option_types');
Expand Down Expand Up @@ -286,9 +286,9 @@ class="form-control"
<!-- colors and skins -->

<fieldset name="css-preferences">
<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.custom_css') }}
</x-form-legend>
</x-form.legend>
<!-- Custom css -->
<div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">

Expand Down Expand Up @@ -324,9 +324,9 @@ class="form-control"
<!-- colors and skins -->

<fieldset name="footer-preferences">
<x-form-legend>
<x-form.legend>
{{ trans('admin/settings/general.legends.footer') }}
</x-form-legend>
</x-form.legend>

<!-- Support Footer -->
<div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
Expand Down
Loading
Loading