ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18064 from grokability/new-fieldsets

Browse Source 
Use new fieldset component
This commit is contained in:
snipe
2025-10-17 16:58:17 +01:00
committed by GitHub
parent a472dede2b e1b6488f8e
commit b1ef3f51cb
26 changed files with 215 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/build/app.css
+5
View File
@@ -1517,6 +1517,11 @@ input[name="columnsSearch"] {
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
margin-top: 5px;
}
public/css/build/app.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/css/build/overrides.css
+5
View File
@@ -1141,6 +1141,11 @@ input[name="columnsSearch"] {
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
margin-top: 5px;
}
public/css/build/overrides.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/css/dist/all.css
Vendored
+10
View File
@@ -22853,6 +22853,11 @@ input[name="columnsSearch"] {
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
margin-top: 5px;
}
@@ -24490,6 +24495,11 @@ input[name="columnsSearch"] {
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
margin-top: 5px;
}
public/mix-manifest.json
+3 -3
View File
@@ -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",
@@ -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",
resources/assets/less/overrides.less
+6
View File
@@ -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;
}
resources/lang/en-US/admin/custom_fields/general.php
+1
View File
@@ -67,4 +67,5 @@ return [
'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>.',
];
resources/lang/en-US/admin/settings/general.php
+2 -1
View File
@@ -18,7 +18,7 @@ return [
'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.',
@@ -489,6 +489,7 @@ return [
'server' => 'Server Settings',
'scoping' => 'Scoping',
'security' => 'Security Preferences',
'passwords' => 'Password Security Preferences',
],
resources/views/auth/login.blade.php
-1
View File
@@ -55,7 +55,6 @@
<fieldset name="login" aria-label="login">
<legend></legend>
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<label for="username">
resources/views/components/checkin.blade.php
+1 -1
View File
@@ -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">
resources/views/hardware/bulk.blade.php
+1 -1
View File
@@ -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>
resources/views/hardware/edit.blade.php
+4 -4
View File
@@ -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')])
@@ -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')
resources/views/licenses/edit.blade.php
+1 -1
View File
@@ -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>
resources/views/maintenances/edit.blade.php
+1 -1
View File
@@ -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!=''))
resources/views/models/custom_fields_form.blade.php
+5 -3
View File
@@ -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)))
resources/views/models/custom_fields_form_bulk_edit.blade.php
+3 -3
View File
@@ -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)
resources/views/partials/forms/edit/uploadLogo.blade.php
+1 -1
View File
@@ -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>
resources/views/settings/alerts.blade.php
+67 -53
View File
@@ -41,10 +41,10 @@
<div class="col-md-12">
<fieldset name="remote-login" class="bottom-padded">
<legend class="highlight">
<fieldset name="remote-login"">
<x-form-legend>
{{ trans('admin/settings/general.legends.general') }}
</legend>
</x-form-legend>
<!-- Menu Alerts Enabled -->
<div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
@@ -68,34 +68,43 @@
</fieldset>
<fieldset name="remote-login" class="bottom-padded">
<legend class="highlight">
<fieldset name="alert-addresses"">
<x-form-legend>
{{ trans('admin/settings/general.legends.email') }}
</legend>
</x-form-legend>
<!-- Alert Email -->
<div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label>
</div>
<div class="col-md-7">
<div class="col-md-8 input-group">
<input type="text" name="alert_email" value="{{ old('alert_email', $setting->alert_email) }}" class="form-control" placeholder="admin@yourcompany.com,it@yourcompany.com" maxlength="191">
{!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
<span class="input-group-addon">
<x-icon type="email" />
</span>
</div>
<div class="col-md-8 col-md-offset-3">
<p class="help-block">{{ trans('admin/settings/general.alert_email_help') }}</p>
{!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
</div>
</div>
<!-- Admin CC Email -->
<div class="form-group {{ $errors->has('admin_cc_email') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label>
</div>
<div class="col-md-7">
<div class="col-md-8 input-group">
<input type="email" name="admin_cc_email" value="{{ old('admin_cc_email', $setting->admin_cc_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191">
{!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
<span class="input-group-addon">
<x-icon type="email" />
</span>
</div>
<div class="col-md-8 col-md-offset-3">
<p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p>
{!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
</div>
</div>
<div class="form-group">
@@ -122,53 +131,55 @@
</div>
</fieldset>
<fieldset name="remote-login" class="bottom-padded">
<legend class="highlight">
<fieldset name="remote-login"">
<x-form-legend>
{{ trans('admin/settings/general.legends.intervals') }}
</legend>
</x-form-legend>
<!-- Alert interval -->
<div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
<div class="col-md-3">
<label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
</div>
<div class="col-md-9">
<input class="form-control" placeholder="30" maxlength="3" style="width: 70px;" name="alert_interval" type="number" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval">
{!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>
<!-- Alert threshold -->
<!-- Inventory alert threshold -->
<div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
</div>
<div class="col-md-8">
<input class="form-control" placeholder="5" maxlength="3" style="width: 70px;" name="alert_threshold" type="number" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold">
<input class="form-control" placeholder="5" maxlength="3" style="width: 100px;" name="alert_threshold" type="number" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold">
{!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>
<!-- Audit interval -->
<div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
<div class="col-md-3">
<label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
<!-- Inventory alert interval -->
<div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
<div class="col-md-3 text-right">
<label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
</div>
<div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-3 col-xl-3">
<input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="number" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}">
<span class="input-group-addon">{{ trans('general.months') }}</span>
</div>
<div class="col-md-8 col-md-offset-3">
{!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p>
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
<input class="form-control" placeholder="30" maxlength="3" name="alert_interval" type="number" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval">
<span class="input-group-addon">{{ trans('general.days') }}</span>
{!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>
<!-- Alert threshold -->
<!-- Due for checkin days -->
<div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
<div class="col-md-3 text-right">
<label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
</div>
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
<input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="number" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}">
<span class="input-group-addon">{{ trans('general.days') }}</span>
</div>
<div class="col-md-8 col-md-offset-3">
{!! $errors->first('due_checkin_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.due_checkin_days_help') }}</p>
</div>
</div>
<!-- Alert warning threshold -->
<div class="form-group {{ $errors->has('audit_warning_days') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label>
</div>
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
@@ -181,20 +192,23 @@
</div>
</div>
<!-- Due for checkin days -->
<div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
<div class="col-md-3">
<label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
<!-- Audit interval -->
<div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
<div class="col-md-3 text-right">
<label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
</div>
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
<input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="number" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}">
<span class="input-group-addon">{{ trans('general.days') }}</span>
<div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-3 col-xl-3">
<input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="number" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}">
<span class="input-group-addon">{{ trans('general.months') }}</span>
</div>
<div class="col-md-8 col-md-offset-3">
{!! $errors->first('due_checkin_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.due_checkin_days_help') }}</p>
{!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">
{{ trans('admin/settings/general.audit_interval_help') }}
</p>
</div>
</div>
</fieldset>
</div>
resources/views/settings/branding.blade.php
+20 -20
View File
@@ -51,15 +51,15 @@
<div class="col-md-12">
<fieldset name="logo-preferences" class="bottom-padded">
<legend class="highlight">
<fieldset name="logo-preferences"">
<x-form-legend>
{{ trans('admin/settings/general.legends.logos') }}
</legend>
</x-form-legend>
<!-- Site name -->
<div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="site_name">{{ trans('admin/settings/general.site_name') }}</label>
</div>
<div class="col-md-7 required">
@@ -81,7 +81,7 @@
<!-- Branding -->
<div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="brand">{{ trans('admin/settings/general.web_brand') }}</label>
</div>
<div class="col-md-9">
@@ -176,7 +176,7 @@
<!-- Load gravatar -->
<div class="form-group {{ $errors->has('load_remote') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.load_remote') }}</strong>
</div>
<div class="col-md-9">
@@ -196,7 +196,7 @@
<!-- Include logo in print assets -->
<div class="form-group">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.logo_print_assets') }}</strong>
</div>
<div class="col-md-9">
@@ -211,7 +211,7 @@
<!-- show urls in emails-->
<div class="form-group">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.show_url_in_emails') }}</strong>
</div>
<div class="col-md-9">
@@ -225,14 +225,14 @@
</fieldset>
<!-- colors and skins -->
<fieldset name="color-preferences" class="bottom-padded">
<legend class="highlight">
<fieldset name="color-preferences"">
<x-form-legend>
{{ trans('admin/settings/general.legends.colors') }}
</legend>
</x-form-legend>
<!-- Header color -->
<div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="header_color">{{ trans('admin/settings/general.header_color') }}</label>
</div>
<div class="col-md-5 col-xs-5 col-sm-3 col-md-4 col-lg-3 col-xl-3">
@@ -248,7 +248,7 @@
<!-- Skin -->
<div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="skin">{{ trans('general.skin') }}</label>
</div>
<div class="col-md-9">
@@ -259,7 +259,7 @@
<!-- Custom css -->
<div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="custom_css">{{ trans('admin/settings/general.custom_css') }}</label>
</div>
<div class="col-md-9">
@@ -302,14 +302,14 @@
<!-- colors and skins -->
<fieldset name="footer-preferences" class="bottom-padded">
<legend class="highlight">
<fieldset name="footer-preferences"">
<x-form-legend>
{{ trans('admin/settings/general.legends.footer') }}
</legend>
</x-form-legend>
<!-- Support Footer -->
<div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="support_footer">{{ trans('admin/settings/general.support_footer') }}</label>
</div>
<div class="col-md-9">
@@ -343,7 +343,7 @@
<!-- Version Footer -->
<div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="version_footer">{{ trans('admin/settings/general.version_footer') }}</label>
</div>
<div class="col-md-9">
@@ -376,7 +376,7 @@
<!-- Additional footer -->
<div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="footer_text">{{ trans('admin/settings/general.footer_text') }}</label>
</div>
<div class="col-md-9">
resources/views/settings/general.blade.php
+41 -40
View File
@@ -34,10 +34,10 @@
<div class="col-md-12">
<fieldset class="bottom-padded">
<legend class="highlight">
<fieldset">
<x-form-legend>
{{ trans('admin/settings/general.legends.scoping') }}
</legend>
</x-form-legend>
<!-- Full Multiple Companies Support -->
<div class="form-group {{ $errors->has('full_multiple_companies_support') ? 'error' : '' }}">
<div class="col-md-8 col-md-offset-3">
@@ -63,14 +63,13 @@
</fieldset>
<fieldset class="bottom-padded">
<legend class="highlight">
<fieldset">
<x-form-legend>
{{ trans('admin/settings/general.legends.formats') }}
</legend>
</x-form-legend>
<!-- Email domain -->
<div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="email_domain">{{ trans('general.email_domain') }}</label>
</div>
<div class="col-md-8">
@@ -83,7 +82,7 @@
<!-- Email format -->
<div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
</div>
<div class="col-md-8">
@@ -99,7 +98,7 @@
<!-- Username format -->
<div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="username_format">{{ trans('admin/settings/general.username_formats.username_format') }}</label>
</div>
<div class="col-md-8">
@@ -115,10 +114,10 @@
</fieldset>
<fieldset class="bottom-padded">
<legend class="highlight">
<fieldset">
<x-form-legend>
{{ trans('admin/settings/general.legends.profiles') }}
</legend>
</x-form-legend>
<!-- user profile edit checkbox -->
<div class="form-group">
<div class="col-md-8 col-md-offset-3">
@@ -131,10 +130,10 @@
</div>
</fieldset>
<fieldset class="bottom-padded">
<legend class="highlight">
<fieldset>
<x-form-legend>
{{ trans('admin/settings/general.legends.eula') }}
</legend>
</x-form-legend>
<!-- Require signature for acceptance -->
<div class="form-group {{ $errors->has('require_accept_signature') ? 'error' : '' }}">
@@ -151,7 +150,7 @@
<!-- Default EULA -->
<div class="form-group {{ $errors->has('default_eula_text') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="default_eula_text">{{ trans('admin/settings/general.default_eula_text') }}</label>
</div>
<div class="col-md-8">
@@ -168,12 +167,14 @@
</fieldset>
<fieldset class="bottom-padded">
<legend class="highlight">{{ trans('admin/settings/general.legends.misc_display') }}</legend>
<fieldset>
<x-form-legend>
{{ trans('admin/settings/general.legends.misc_display') }}
</x-form-legend>
<!-- Thumb Size -->
<div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="thumbnail_max_h">{{ trans('admin/settings/general.thumbnail_max_h') }}</label>
</div>
<div class="col-md-8">
@@ -185,7 +186,7 @@
<!-- Model List prefs -->
<div class="form-group {{ $errors->has('show_in_model_list') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.show_in_model_list') }}</strong>
</div>
<div class="col-md-8">
@@ -247,14 +248,14 @@
</fieldset>
<fieldset class="bottom-padded">
<legend class="highlight">
<fieldset">
<x-form-legend>
{{ trans('general.email') }}
</legend>
</x-form-legend>
<!-- Mail test -->
<div class="form-group">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="login_note">{{trans('admin/settings/general.test_mail')}}</label>
</div>
<div class="col-md-8" id="mailtestrow">
@@ -291,10 +292,10 @@
</fieldset>
<fieldset name="checkin-preferences" class="bottom-padded">
<legend class="highlight">
<fieldset name="checkin-preferences"">
<x-form-legend>
{{ trans('admin/settings/general.legends.checkin') }}
</legend>
</x-form-legend>
<!-- Require Notes on checkin/checkout checkbox -->
<div class="form-group">
@@ -312,14 +313,14 @@
<fieldset name="dashboard" class="bottom-padded">
<legend class="highlight">
<fieldset name="dashboard">
<x-form-legend>
{{ trans('admin/settings/general.legends.dashboard') }}
</legend>
</x-form-legend>
<!-- login text -->
<div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="login_note">{{ trans('admin/settings/general.login_note') }}</label>
</div>
<div class="col-md-8">
@@ -338,7 +339,7 @@
<!-- dash chart -->
<div class="form-group {{ $errors->has('dash_chart_type') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="show_in_model_list">{{ trans('general.pie_chart_type') }}</label>
</div>
<div class="col-md-8">
@@ -353,7 +354,7 @@
<!-- dashboard text -->
<div class="form-group {{ $errors->has('dashboard_message') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="dashboard_message">{{ trans('admin/settings/general.dashboard_message') }}</label>
</div>
<div class="col-md-8">
@@ -374,14 +375,14 @@
</fieldset>
<fieldset class="bottom-padded">
<legend class="highlight">
<fieldset>
<x-form-legend>
{{ trans('admin/settings/general.legends.misc') }}
</legend>
</x-form-legend>
<!-- Privacy Policy Footer-->
<div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="privacy_policy_link">{{ trans('admin/settings/general.privacy_policy_link') }}</label>
</div>
<div class="col-md-8">
@@ -405,7 +406,7 @@
<!-- Depreciation method -->
<div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="depreciation_method">{{ trans('admin/depreciations/general.depreciation_method') }}</label>
</div>
<div class="col-md-8">
@@ -437,7 +438,7 @@
<!-- Manager View -->
<div class="form-group {{ $errors->has('manager_view_enabled') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.manager_view') }}</strong>
</div>
<div class="col-md-8">
resources/views/settings/labels.blade.php
+6 -6
View File
@@ -421,14 +421,14 @@
<div class="col-md-3 text-right">
<label for="labels_width" class="control-label">{{ trans('admin/settings/general.label_dimensions') }}</label>
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group">
<input class="form-control" aria-label="labels_width" name="labels_width" type="text" value="{{ old('labels_width', $setting->labels_width) }}" id="labels_width">
<div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
</div>
{!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group">
<input class="form-control" aria-label="labels_height" name="labels_height" type="text" value="{{ old('labels_height', $setting->labels_height) }}">
<div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
@@ -441,13 +441,13 @@
<div class="col-md-3 text-right">
<label for="labels_display_sgutter">{{ trans('admin/settings/general.label_gutters') }}</label>
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group">
<input class="form-control" aria-label="labels_display_sgutter" name="labels_display_sgutter" type="text" value="{{ old('labels_display_sgutter', $setting->labels_display_sgutter) }}" id="labels_display_sgutter">
<div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
</div>
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group">
<input class="form-control" aria-label="labels_display_bgutter" name="labels_display_bgutter" type="text" value="{{ old('labels_display_bgutter', $setting->labels_display_bgutter) }}">
<div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
@@ -463,7 +463,7 @@
<div class="col-md-3 text-right">
<label for="labels_pmargin_top">{{ trans('admin/settings/general.page_padding') }}</label>
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group" style="margin-bottom: 15px;">
<input class="form-control" aria-label="labels_pmargin_top" name="labels_pmargin_top" type="text" value="{{ old('labels_pmargin_top', $setting->labels_pmargin_top) }}" id="labels_pmargin_top">
<div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div>
@@ -490,7 +490,7 @@
<div class="col-md-3 text-right">
<label for="labels_pagewidth" class="control-label">{{ trans('admin/settings/general.page_dimensions') }}</label>
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<div class="input-group">
<input class="form-control" aria-label="labels_pagewidth" name="labels_pagewidth" type="text" value="{{ old('labels_pagewidth', $setting->labels_pagewidth) }}" id="labels_pagewidth">
<div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
resources/views/settings/ldap.blade.php
+5 -7
View File
@@ -82,7 +82,6 @@
<fieldset>
<x-form-legend>
{{ trans('admin/settings/general.legends.server') }}
</legend>
</x-form-legend>
<!-- Enable LDAP -->
<div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
@@ -902,7 +901,7 @@
<div class="col-md-4">
<input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="{{trans('admin/settings/general.ldap_password_placeholder')}}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test') }}</a>
</div>
@@ -946,11 +945,10 @@
<fieldset>
<legend class="callout callout-legend">
<h4>
{{ trans('admin/settings/general.legends.misc') }}
</h4>
</legend>
<x-form-legend>
{{ trans('admin/settings/general.legends.misc') }}
</x-form-legend>
<!-- LDAP Forgotten password -->
<div class="form-group {{ $errors->has('custom_forgot_pass_url') ? 'error' : '' }}">
<div class="col-md-3 text-right">
resources/views/settings/saml.blade.php
+6 -6
View File
@@ -46,7 +46,7 @@
<!-- Enable SAML -->
<div class="form-group{{ $errors->has('saml_integration') ? ' error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.saml_integration') }}</strong>
</div>
<div class="col-md-9">
@@ -108,7 +108,7 @@
<!-- SAML IdP Metadata -->
<div class="form-group {{ $errors->has('saml_idp_metadata') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="saml_idp_metadata">{{ trans('admin/settings/general.saml_idp_metadata') }}</label>
</div>
<div class="col-md-9">
@@ -131,7 +131,7 @@
<!-- SAML Attribute Mapping Username -->
<div class="form-group {{ $errors->has('saml_attr_mapping_username') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="saml_attr_mapping_username">{{ trans('admin/settings/general.saml_attr_mapping_username') }}</label>
</div>
<div class="col-md-9">
@@ -143,7 +143,7 @@
<!-- SAML Force Login -->
<div class="form-group">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.saml_forcelogin_label') }}</strong>
</div>
<div class="col-md-9">
@@ -159,7 +159,7 @@
<!-- SAML Single Log Out -->
<div class="form-group">
<div class="col-md-3">
<div class="col-md-3 text-right">
<strong>{{ trans('admin/settings/general.saml_slo_label') }}</strong>
</div>
<div class="col-md-9">
@@ -174,7 +174,7 @@
<!-- SAML Custom Options -->
<div class="form-group {{ $errors->has('saml_custom_settings') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="saml_custom_settings">{{ trans('admin/settings/general.saml_custom_settings') }}</label>
</div>
<div class="col-md-9">
resources/views/settings/security.blade.php
+16 -12
View File
@@ -37,14 +37,14 @@
<div class="col-md-12">
<fieldset name="password-preferences" class="bottom-padded">
<legend class="highlight">
<fieldset name="password-preferences">
<x-form-legend>
{{ trans('admin/settings/general.legends.security') }}
</legend>
</x-form-legend>
<!-- Two Factor -->
<div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="two_factor_enabled">{{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
</div>
<div class="col-md-9">
@@ -67,9 +67,13 @@
</div>
</div>
<x-form-legend>
{{ trans('admin/settings/general.legends.passwords') }}
</x-form-legend>
<!-- Min characters -->
<div class="form-group {{ $errors->has('pwd_secure_min') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right text-right">
<label for="pwd_secure_min">{{ trans('admin/settings/general.pwd_secure_min') }}</label>
</div>
<div class="col-md-9">
@@ -85,7 +89,7 @@
<!-- Common Passwords -->
<div class="form-group {{ $errors->has('pwd_secure_complexity.*') ? 'error' : '' }}">
<div class="col-md-3">
<div class="col-md-3 text-right">
<label for="pwd_secure_complexity">{{ trans('admin/settings/general.pwd_secure_complexity') }}</label>
</div>
<div class="col-md-9">
@@ -124,10 +128,10 @@
</div>
</fieldset>
<fieldset name="remote-login" class="bottom-padded">
<legend class="highlight">
<fieldset name="remote-login">
<x-form-legend>
{{ trans('admin/settings/general.login_remote_user_text') }}
</legend>
</x-form-legend>
<!-- Remote User Authentication -->
<div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
@@ -147,7 +151,7 @@
{{ trans('admin/settings/general.login_remote_user_enabled_help') }}
</p>
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<!-- Use custom remote user header name -->
<label for="login_remote_user_header_name">{{ trans('admin/settings/general.login_remote_user_header_name_text') }}</label>
</div>
@@ -158,7 +162,7 @@
{{ trans('admin/settings/general.login_remote_user_header_name_help') }}
</p>
</div>
<div class="col-md-3">
<div class="col-md-3 text-right">
<!-- Custom logout url to redirect to authentication provider -->
<label for="login_remote_user_custom_logout_url">{{ trans('admin/settings/general.login_remote_user_custom_logout_url_text') }}</label>
</div>
@@ -170,7 +174,7 @@
</p>
</div>
@if ($setting->login_remote_user_enabled == '1')
<div class="col-md-3">
<div class="col-md-3 text-right">
<!-- Disable other logins mechanism -->
<label class="form-control">
<input type="checkbox" name="login_common_disabled" value="1" @checked(old('login_common_disabled', $setting->login_common_disabled)) aria-label="login_common_disabled"/>
resources/views/users/edit.blade.php
+3 -3
View File
@@ -322,12 +322,12 @@
<fieldset name="optional-details">
<legend class="highlight">
<x-form-legend>
<a id="optional_user_info">
<x-icon type="caret-right" id="optional_user_info_icon" />
{{ trans('admin/hardware/form.optional_infos') }}
</a>
</legend>
</x-form-legend>
<div id="optional_user_details" class="col-md-12" style="display:none">
@@ -537,7 +537,7 @@
<!-- Zip -->
<div class="form-group{{ $errors->has('zip') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="zip">{{ trans('general.zip') }}</label>
<div class="col-md-3">
<div class="col-md-3 text-right">
<input class="form-control" type="text" name="zip" id="zip" value="{{ old('zip', $user->zip) }}" maxlength="10" />
{!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>