Nicer formatting on smaller screens

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-04-29 10:11:00 +01:00
parent a519ebe19b
commit c3531e9eba
3 changed files with 278 additions and 248 deletions

View file

@ -465,6 +465,9 @@ return [
'logos' => 'Logos & Display', 'logos' => 'Logos & Display',
'colors' => 'Colors & Skins', 'colors' => 'Colors & Skins',
'footer' => 'Footer Preferences', 'footer' => 'Footer Preferences',
'security' => 'Security Preferences',
'general' => 'General',
'intervals' => 'Intervals & Thresholds',
], ],

View file

@ -38,18 +38,13 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="col-md-12">
<div class="col-md-11 col-md-offset-1">
<!-- Alerts Enabled --> <fieldset name="remote-login" class="bottom-padded">
<div class="form-group {{ $errors->has('alerts_enabled') ? 'error' : '' }}"> <legend class="highlight">
<div class="col-md-9 col-md-offset-3"> {{ trans('admin/settings/general.legends.general') }}
<label class="form-control"> </legend>
<input type="checkbox" name="alerts_enabled" value="1" @checked(old('alerts_enabled', $setting->alerts_enabled))>
{{ trans('admin/settings/general.alerts_enabled') }}
</label>
</div>
</div>
<!-- Menu Alerts Enabled --> <!-- Menu Alerts Enabled -->
<div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
@ -61,7 +56,22 @@
</div> </div>
</div> </div>
<!-- Alerts Enabled -->
<div class="form-group {{ $errors->has('alerts_enabled') ? 'error' : '' }}">
<div class="col-md-9 col-md-offset-3">
<label class="form-control">
<input type="checkbox" name="alerts_enabled" value="1" @checked(old('alerts_enabled', $setting->alerts_enabled))>
{{ trans('admin/settings/general.alerts_enabled') }}
</label>
</div>
</div>
</fieldset>
<fieldset name="remote-login" class="bottom-padded">
<legend class="highlight">
{{ trans('admin/settings/general.legends.email') }}
</legend>
<!-- Alert Email --> <!-- Alert Email -->
<div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
@ -69,7 +79,7 @@
<label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label> <label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<input type="text" name="alert_email" value="{{ old('alert_email', $setting->alert_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191"> <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>') !!} {!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
<p class="help-block">{{ trans('admin/settings/general.alert_email_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.alert_email_help') }}</p>
@ -83,14 +93,20 @@
<label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label> <label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<input type="text" name="admin_cc_email" value="{{ old('admin_cc_email', $setting->admin_cc_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191"> <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>') !!} {!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
<p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p>
</div> </div>
</div> </div>
</fieldset>
<fieldset name="remote-login" class="bottom-padded">
<legend class="highlight">
{{ trans('admin/settings/general.legends.intervals') }}
</legend>
<!-- Alert interval --> <!-- Alert interval -->
<div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
@ -98,7 +114,7 @@
<label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label> <label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<input class="form-control" placeholder="30" maxlength="3" style="width: 60px;" name="alert_interval" type="text" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval"> <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>') !!} {!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -108,23 +124,23 @@
<div class="col-md-3"> <div class="col-md-3">
<label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label> <label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-8">
<input class="form-control" placeholder="5" maxlength="3" style="width: 60px;" name="alert_threshold" type="text" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold"> <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">
{!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
<!-- Alert interval --> <!-- Audit interval -->
<div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
<label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label> <label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
</div> </div>
<div class="input-group col-md-3"> <div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-2 col-xl-2">
<input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="text" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}"> <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> <span class="input-group-addon">{{ trans('general.months') }}</span>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-8 col-md-offset-3">
{!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $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> <p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p>
</div> </div>
@ -135,11 +151,11 @@
<div class="col-md-3"> <div class="col-md-3">
<label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label> <label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label>
</div> </div>
<div class="input-group col-md-3"> <div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-2 col-xl-2">
<input class="form-control" placeholder="14" maxlength="3" name="audit_warning_days" type="text" id="audit_warning_days" value="{{ old('audit_warning_days', $setting->audit_warning_days) }}"> <input class="form-control" placeholder="14" maxlength="3" name="audit_warning_days" type="number" id="audit_warning_days" value="{{ old('audit_warning_days', $setting->audit_warning_days) }}">
<span class="input-group-addon">{{ trans('general.days') }}</span> <span class="input-group-addon">{{ trans('general.days') }}</span>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-8 col-md-offset-3">
{!! $errors->first('audit_warning_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('audit_warning_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.audit_warning_days_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.audit_warning_days_help') }}</p>
</div> </div>
@ -150,18 +166,20 @@
<div class="col-md-3"> <div class="col-md-3">
<label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label> <label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
</div> </div>
<div class="input-group col-md-3"> <div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-2 col-xl-2">
<input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="text" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}"> <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> <span class="input-group-addon">{{ trans('general.days') }}</span>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-8 col-md-offset-3">
{!! $errors->first('due_checkin_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $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> <p class="help-block">{{ trans('admin/settings/general.due_checkin_days_help') }}</p>
</div> </div>
</div> </div>
</fieldset>
</div> </div>
</div> <!--/.box-body--> </div> <!--/.box-body-->
<div class="box-footer"> <div class="box-footer">
<div class="text-left col-md-6"> <div class="text-left col-md-6">

View file

@ -22,7 +22,7 @@
{{ csrf_field() }} {{ csrf_field() }}
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2"> <div class="col-sm-9 col-sm-offset-1 col-md-9 col-md-offset-2">
<div class="panel box box-default"> <div class="panel box box-default">
@ -35,8 +35,12 @@
<div class="box-body"> <div class="box-body">
<div class="col-md-11 col-md-offset-1"> <div class="col-md-12">
<fieldset name="password-preferences" class="bottom-padded">
<legend class="highlight">
{{ trans('admin/settings/general.legends.security') }}
</legend>
<!-- Two Factor --> <!-- Two Factor -->
<div class="form-group {{ $errors->has('brand') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
@ -62,14 +66,11 @@
<label for="pwd_secure_min">{{ trans('admin/settings/general.pwd_secure_min') }}</label> <label for="pwd_secure_min">{{ trans('admin/settings/general.pwd_secure_min') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<input class="form-control" style="width: 50px;" name="pwd_secure_min" type="text" value="{{ old('pwd_secure_min', $setting->pwd_secure_min) }}" id="pwd_secure_min"> <input class="form-control" style="width: 60px;" name="pwd_secure_min" type="number" value="{{ old('pwd_secure_min', $setting->pwd_secure_min) }}" id="pwd_secure_min" maxlength="2" min="8">
{!! $errors->first('pwd_secure_min', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('pwd_secure_min', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.pwd_secure_min_help') }} {{ trans('admin/settings/general.pwd_secure_min_help') }}
</p> </p>
</div> </div>
</div> </div>
@ -82,7 +83,6 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<label class="form-control"> <label class="form-control">
<span class="sr-only">{{ trans('admin/settings/general.pwd_secure_uncommon') }}</span>
<input type="checkbox" name="pwd_secure_uncommon" value="1" @checked(old('pwd_secure_uncommon', $setting->pwd_secure_uncommon)) aria-label="pwd_secure_uncommon"/> <input type="checkbox" name="pwd_secure_uncommon" value="1" @checked(old('pwd_secure_uncommon', $setting->pwd_secure_uncommon)) aria-label="pwd_secure_uncommon"/>
{{ trans('admin/settings/general.pwd_secure_uncommon') }} {{ trans('admin/settings/general.pwd_secure_uncommon') }}
</label> </label>
@ -115,14 +115,16 @@
</p> </p>
</div> </div>
</div> </div>
<!-- /.form-group --> </fieldset>
<hr>
<fieldset name="remote-login" class="bottom-padded">
<legend class="highlight">
{{ trans('admin/settings/general.login_remote_user_text') }}
</legend>
<!-- Remote User Authentication --> <!-- Remote User Authentication -->
<div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
<div class="col-md-3">
<strong>{{ trans('admin/settings/general.login_remote_user_text') }}</strong> <div class="col-md-9 col-md-offset-3">
</div>
<div class="col-md-9">
<!-- Enable Remote User Login --> <!-- Enable Remote User Login -->
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
@ -137,40 +139,47 @@
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.login_remote_user_enabled_help') }} {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
</p> </p>
</div>
<div class="col-md-3">
<!-- Use custom remote user header name --> <!-- Use custom remote user header name -->
<label for="login_remote_user_header_name">{{ trans('admin/settings/general.login_remote_user_header_name_text') }}</label> <label for="login_remote_user_header_name">{{ trans('admin/settings/general.login_remote_user_header_name_text') }}</label>
</div>
<div class="col-md-9">
<input class="form-control" name="login_remote_user_header_name" type="text" value="{{ old('login_remote_user_header_name', $setting->login_remote_user_header_name) }}" id="login_remote_user_header_name"> <input class="form-control" name="login_remote_user_header_name" type="text" value="{{ old('login_remote_user_header_name', $setting->login_remote_user_header_name) }}" id="login_remote_user_header_name">
{!! $errors->first('login_remote_user_header_name', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('login_remote_user_header_name', '<span class="alert-msg">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.login_remote_user_header_name_help') }} {{ trans('admin/settings/general.login_remote_user_header_name_help') }}
</p> </p>
</div>
<div class="col-md-3">
<!-- Custom logout url to redirect to authentication provider --> <!-- 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> <label for="login_remote_user_custom_logout_url">{{ trans('admin/settings/general.login_remote_user_custom_logout_url_text') }}</label>
</div>
<div class="col-md-9">
<input class="form-control" aria-label="login_remote_user_custom_logout_url" name="login_remote_user_custom_logout_url" type="url" value="{{ old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url) }}" id="login_remote_user_custom_logout_url"> <input class="form-control" aria-label="login_remote_user_custom_logout_url" name="login_remote_user_custom_logout_url" type="url" value="{{ old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url) }}" id="login_remote_user_custom_logout_url">
{!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }} {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
</p> </p>
</div>
@if ($setting->login_remote_user_enabled == '1') @if ($setting->login_remote_user_enabled == '1')
<div class="col-md-3">
<!-- Disable other logins mechanism --> <!-- Disable other logins mechanism -->
<label class="form-control"> <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"/> <input type="checkbox" name="login_common_disabled" value="1" @checked(old('login_common_disabled', $setting->login_common_disabled)) aria-label="login_common_disabled"/>
{{ trans('admin/settings/general.login_common_disabled_text') }} {{ trans('admin/settings/general.login_common_disabled_text') }}
</label> </label>
</div>
<div class="col-md-9">
{!! $errors->first('login_common_disabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('login_common_disabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block"> <p class="help-block">
{{ trans('admin/settings/general.login_common_disabled_help') }} {{ trans('admin/settings/general.login_common_disabled_help') }}
</p> </p>
@endif @endif
</div>
@endif @endif
</fieldset>
</div>
</div>