Skip to content

Use new fieldset component #18064

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
Oct 17, 2025
Merged

Use new fieldset component #18064

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
5 changes: 5 additions & 0 deletions public/css/build/app.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/build/app.css.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions public/css/build/overrides.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/build/overrides.css.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions public/css/dist/all.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"/js/dist/all.js": "/js/dist/all.js?id=76d88f0f91b852f7eecbce357ab5858b",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=42f97cd5b9ee7521b04a448e7fc16ac9",
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=3e8b8221c159b829a0edd562eb717563",
"/css/build/overrides.css": "/css/build/overrides.css?id=03eb857d917f847b2e217f5da4fdccd9",
"/css/build/app.css": "/css/build/app.css?id=41485c02f3c1c2e7407a99aefcec351c",
"/css/build/overrides.css": "/css/build/overrides.css?id=90ab037d5e54c03ee5894399bab1a776",
"/css/build/app.css": "/css/build/app.css?id=d9fc713cecd32af72efd1e924a35da5a",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=3d8a3d2035ea28aaad4a703c2646f515",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=3979929a3423ff35b96b1fc84299fdf3",
Expand All @@ -19,7 +19,7 @@
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=b2cd9f59d7e8587939ce27b2d3363d82",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=7277edd636cf46aa7786a4449ce0ead7",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=cbd06cc1d58197ccc81d4376bbaf0d28",
"/css/dist/all.css": "/css/dist/all.css?id=4a00fb8a56de5ca4588584132099f17d",
"/css/dist/all.css": "/css/dist/all.css?id=c76b90bf82e812fe159cc4b4be143aa5",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
Expand Down
6 changes: 6 additions & 0 deletions resources/assets/less/overrides.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,6 +1281,12 @@ input[name="columnsSearch"] {
margin-bottom: 0px;
}

.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}

p.callout-subtext {
margin-top: 5px;
}
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en-US/admin/custom_fields/general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@
'checkbox' => 'Checkbox',
'radio' => 'Radio Buttons',
],
'general_help_text' => 'Custom fields store additional information not covered by the default asset fields. <a href="https://snipe-it.readme.io/docs/custom-fields#/"><i class="fa fa-external-link"></i></a>.',
];
3 changes: 2 additions & 1 deletion resources/lang/en-US/admin/settings/general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
'alert_email' => 'Send alerts to',
'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
'alerts_enabled' => 'Email Alerts Enabled',
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_interval' => 'Expiring Alerts Threshold',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'allow_user_skin' => 'Allow User Skin',
'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
Expand Down Expand Up @@ -489,6 +489,7 @@
'server' => 'Server Settings',
'scoping' => 'Scoping',
'security' => 'Security Preferences',
'passwords' => 'Password Security Preferences',
],


Expand Down
1 change: 0 additions & 1 deletion resources/views/auth/login.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@


<fieldset name="login" aria-label="login">
<legend></legend>

<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<label for="username">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/checkin.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<!-- Qty -->
<div class="form-group {{ $errors->has('checkin_qty') ? 'error' : '' }}">
<label for="checkin_qty" class="col-md-2 control-label">{{ trans('general.qty') }}</label>
<div class="col-md-3">
<div class="col-md-3 text-right">
<input type="text" class="form-control" name="checkin_qty" aria-label="checkin_qty" value="{{ old('assigned_qty', $component_assets->assigned_qty) }}">
</div>
<div class="col-md-9 col-md-offset-2">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/hardware/bulk.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<label for="warranty_months" class="col-md-3 control-label">
{{ trans('admin/hardware/form.warranty') }}
</label>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group">
<input class="col-md-3 form-control" maxlength="4" type="text" name="warranty_months" id="warranty_months" value="{{ old('warranty_months') }}" />
<span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span>
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 @@ -103,12 +103,12 @@

<fieldset name="optional-details">

<legend class="highlight">
<x-form-legend>
<a id="optional_info">
<x-icon type="caret-right" id="optional_info_icon" />
{{ trans('admin/hardware/form.optional_infos') }}
</a>
</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 @@ -137,12 +137,12 @@

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

<div id='order_details' class="col-md-12" style="display:none">
@include ('partials.forms.edit.order_number')
Expand Down
2 changes: 1 addition & 1 deletion resources/views/licenses/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<!-- Purchase Order -->
<div class="form-group {{ $errors->has('purchase_order') ? ' has-error' : '' }}">
<label for="purchase_order" class="col-md-3 control-label">{{ trans('admin/licenses/form.purchase_order') }}</label>
<div class="col-md-3">
<div class="col-md-3 text-right">
<input class="form-control" type="text" name="purchase_order" id="purchase_order" value="{{ old('purchase_order', $item->purchase_order) }}" maxlength="191" />
{!! $errors->first('purchase_order', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/maintenances/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<!-- Asset Maintenance Cost -->
<div class="form-group {{ $errors->has('cost') ? ' has-error' : '' }}">
<label for="cost" class="col-md-3 control-label">{{ trans('admin/maintenances/form.cost') }}</label>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group">
<span class="input-group-addon">
@if (($item->asset) && ($item->asset->location) && ($item->asset->location->currency!=''))
Expand Down
8 changes: 5 additions & 3 deletions resources/views/models/custom_fields_form.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
@if (($model) && ($model->fieldset) && $model->fieldset->displayAnyFieldsInForm($show_custom_fields_type ?? ''))
<div class="col-md-12 col-sm-12">

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

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

@foreach($model->fieldset->fields as $field)
@if (!isset($show_custom_fields_type) || ($field->displayFieldInCurrentForm($show_custom_fields_type)))
Expand Down
6 changes: 3 additions & 3 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 @@ -13,10 +13,10 @@
@endforeach

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

@foreach($models as $model)
Expand Down
2 changes: 1 addition & 1 deletion resources/views/partials/forms/edit/uploadLogo.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- {{ $logoVariable }}logo image upload -->

<div class="form-group">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label {!! $errors->has($logoVariable) ? 'class="alert-msg"' : '' !!} for="{{ $logoVariable }}">
{{ trans($logoLabel) }}
</label>
Expand Down
Loading
Loading