fix: 🐛locale default language selection
This commit is contained in:
parent
b97bc8edf7
commit
83e153058c
|
@ -64,6 +64,7 @@ class SettingsController extends Controller
|
||||||
'type' => $optionInputData[$key]['type'] ?? 'string',
|
'type' => $optionInputData[$key]['type'] ?? 'string',
|
||||||
'description' => $optionInputData[$key]['description'] ?? '',
|
'description' => $optionInputData[$key]['description'] ?? '',
|
||||||
'options' => $optionInputData[$key]['options'] ?? [],
|
'options' => $optionInputData[$key]['options'] ?? [],
|
||||||
|
'identifier' => $optionInputData[$key]['identifier'] ?? 'option'
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,7 +97,7 @@ class SettingsController extends Controller
|
||||||
{
|
{
|
||||||
$category = request()->get('category');
|
$category = request()->get('category');
|
||||||
|
|
||||||
$this->checkPermission("settings.".strtolower($category).".write");
|
$this->checkPermission("settings." . strtolower($category) . ".write");
|
||||||
|
|
||||||
$settings_class = request()->get('settings_class');
|
$settings_class = request()->get('settings_class');
|
||||||
|
|
||||||
|
@ -125,7 +126,7 @@ class SettingsController extends Controller
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($rp->name == 'available') {
|
if ($rp->name == 'available') {
|
||||||
$settingsClass->$key = implode(",",$request->$key);
|
$settingsClass->$key = implode(",", $request->$key);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ class LocaleSettings extends Settings
|
||||||
'type' => 'select',
|
'type' => 'select',
|
||||||
'description' => 'The default locale to use.',
|
'description' => 'The default locale to use.',
|
||||||
'options' => config('app.available_locales'),
|
'options' => config('app.available_locales'),
|
||||||
|
'identifier' => 'display'
|
||||||
],
|
],
|
||||||
'dynamic' => [
|
'dynamic' => [
|
||||||
'label' => 'Dynamic Locale',
|
'label' => 'Dynamic Locale',
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<ol class="breadcrumb float-sm-right">
|
<ol class="breadcrumb float-sm-right">
|
||||||
<li class="breadcrumb-item"><a href="">{{ __('Dashboard') }}</a></li>
|
<li class="breadcrumb-item"><a href="">{{ __('Dashboard') }}</a></li>
|
||||||
<li class="breadcrumb-item"><a class="text-muted"
|
<li class="breadcrumb-item"><a class="text-muted"
|
||||||
href="{{ route('admin.settings.index') }}">{{ __('Settings') }}</a>
|
href="{{ route('admin.settings.index') }}">{{ __('Settings') }}</a>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
</div>
|
</div>
|
||||||
|
@ -48,24 +48,21 @@
|
||||||
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="tablist"
|
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="tablist"
|
||||||
data-accordion="false">
|
data-accordion="false">
|
||||||
<li class="nav-item border-bottom-0">
|
<li class="nav-item border-bottom-0">
|
||||||
<a href="#icons"
|
<a href="#icons" class="nav-link" data-toggle="pill" role="tab">
|
||||||
class="nav-link" data-toggle="pill"
|
<i class="nav-icon fas fa-image"></i>
|
||||||
role="tab">
|
|
||||||
<i
|
|
||||||
class="nav-icon fas fa-image"></i>
|
|
||||||
<p>
|
<p>
|
||||||
{{ __("Images / Icons") }}
|
{{ __('Images / Icons') }}
|
||||||
</p>
|
</p>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@foreach ($settings as $category => $options)
|
@foreach ($settings as $category => $options)
|
||||||
@if(!str_contains($options['settings_class'],"Extension"))
|
@if (!str_contains($options['settings_class'], 'Extension'))
|
||||||
@canany(["settings.".strtolower($category).".read","settings.".strtolower($category).".write"])
|
@canany(['settings.' . strtolower($category) . '.read', 'settings.' .
|
||||||
|
strtolower($category) . '.write'])
|
||||||
<li class="nav-item border-bottom-0">
|
<li class="nav-item border-bottom-0">
|
||||||
<a href="#{{ $category }}"
|
<a href="#{{ $category }}"
|
||||||
class="nav-link {{ $loop->first ? 'active' : '' }}"
|
class="nav-link {{ $loop->first ? 'active' : '' }}" data-toggle="pill"
|
||||||
data-toggle="pill"
|
role="tab">
|
||||||
role="tab">
|
|
||||||
<i
|
<i
|
||||||
class="nav-icon fas {{ $options['category_icon'] ?? 'fas fa-cog' }}"></i>
|
class="nav-icon fas {{ $options['category_icon'] ?? 'fas fa-cog' }}"></i>
|
||||||
<p>
|
<p>
|
||||||
|
@ -79,35 +76,34 @@
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
<button class="btn btn-outline-secondary" type="button" data-toggle="collapse"
|
<button class="btn btn-outline-secondary" type="button" data-toggle="collapse"
|
||||||
data-target="#collapseExtensions" aria-expanded="false"
|
data-target="#collapseExtensions" aria-expanded="false"
|
||||||
aria-controls="collapseExtensions">
|
aria-controls="collapseExtensions">
|
||||||
{{__("Extension Settings")}}
|
{{ __('Extension Settings') }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
|
||||||
<div class="collapse" id="collapseExtensions">
|
<div class="collapse" id="collapseExtensions">
|
||||||
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="tablist"
|
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="tablist"
|
||||||
data-accordion="false">
|
data-accordion="false">
|
||||||
@foreach ($settings as $category => $options)
|
@foreach ($settings as $category => $options)
|
||||||
@if(str_contains($options['settings_class'],"Extension"))
|
@if (str_contains($options['settings_class'], 'Extension'))
|
||||||
|
@canany(['settings.' . strtolower($category) . '.read', 'settings.' .
|
||||||
@canany(["settings.".strtolower($category).".read","settings.".strtolower($category).".write"])
|
strtolower($category) . '.write'])
|
||||||
<li class="nav-item border-bottom-0">
|
<li class="nav-item border-bottom-0">
|
||||||
<a href="#{{ $category }}"
|
<a href="#{{ $category }}" class="nav-link" data-toggle="pill"
|
||||||
class="nav-link"
|
role="tab">
|
||||||
data-toggle="pill"
|
<i
|
||||||
role="tab">
|
class="nav-icon fas {{ $options['category_icon'] ?? 'fas fa-cog' }}"></i>
|
||||||
<i class="nav-icon fas {{ $options['category_icon'] ?? 'fas fa-cog' }}"></i>
|
<p>
|
||||||
<p>
|
{{ $category }}
|
||||||
{{ $category }}
|
</p>
|
||||||
</p>
|
</a>
|
||||||
</a>
|
</li>
|
||||||
</li>
|
|
||||||
@endcanany
|
@endcanany
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
@ -115,50 +111,44 @@
|
||||||
<!-- Content in $settings -->
|
<!-- Content in $settings -->
|
||||||
<div class="col-10 p-0">
|
<div class="col-10 p-0">
|
||||||
<div class="tab-content ml-3" style="width: 100%;">
|
<div class="tab-content ml-3" style="width: 100%;">
|
||||||
<div container class="tab-pane fade container"
|
<div container class="tab-pane fade container" id="icons" role="tabpanel">
|
||||||
id="icons" role="tabpanel">
|
|
||||||
|
|
||||||
<form method="POST" enctype="multipart/form-data" class="mb-3"
|
<form method="POST" enctype="multipart/form-data" class="mb-3"
|
||||||
action="{{ route('admin.settings.updateIcons') }}">
|
action="{{ route('admin.settings.updateIcons') }}">
|
||||||
@csrf
|
@csrf
|
||||||
@method('POST')
|
@method('POST')
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="card ml-5" style="width: 18rem;">
|
<div class="card ml-5" style="width: 18rem;">
|
||||||
<span class="h3 text-center">{{__("FavIcon")}} </span>
|
<span class="h3 text-center">{{ __('FavIcon') }} </span>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<input type="file" accept="image/x-icon" class="form-control"
|
<input type="file" accept="image/x-icon" class="form-control"
|
||||||
name="favicon"
|
name="favicon" id="favicon">
|
||||||
id="favicon">
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card ml-5" style="width: 18rem;">
|
<div class="card ml-5" style="width: 18rem;">
|
||||||
<span class="h3 text-center">{{__("Icon")}} </span>
|
<span class="h3 text-center">{{ __('Icon') }} </span>
|
||||||
<img
|
<img src="{{ Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
|
||||||
src="{{ Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
|
|
||||||
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
||||||
class="card-img-top" alt="...">
|
class="card-img-top" alt="...">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<input type="file" accept="image/png,image/jpeg,image/jpg"
|
<input type="file" accept="image/png,image/jpeg,image/jpg"
|
||||||
class="form-control"
|
class="form-control" name="icon" id="icon">
|
||||||
name="icon" id="icon">
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card ml-5" style="width: 18rem;">
|
<div class="card ml-5" style="width: 18rem;">
|
||||||
<span class="h3 text-center">{{__("Login-page Logo")}} </span>
|
<span class="h3 text-center">{{ __('Login-page Logo') }} </span>
|
||||||
<img
|
<img src="{{ Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}"
|
||||||
src="{{ Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}"
|
|
||||||
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
||||||
class="card-img-top" alt="...">
|
class="card-img-top" alt="...">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<input type="file" accept="image/png,image/jpeg,image/jpg"
|
<input type="file" accept="image/png,image/jpeg,image/jpg"
|
||||||
class="form-control"
|
class="form-control" name="logo" id="logo">
|
||||||
name="logo" id="logo">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
@ -167,16 +157,16 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
@foreach ($settings as $category => $options)
|
@foreach ($settings as $category => $options)
|
||||||
@canany(["settings.".strtolower($category).".read","settings.".strtolower($category).".write"])
|
@canany(['settings.' . strtolower($category) . '.read', 'settings.' .
|
||||||
<div
|
strtolower($category) . '.write'])
|
||||||
class="tab-pane fade container {{ $loop->first ? 'active show' : '' }}"
|
<div class="tab-pane fade container {{ $loop->first ? 'active show' : '' }}"
|
||||||
id="{{ $category }}" role="tabpanel">
|
id="{{ $category }}" role="tabpanel">
|
||||||
|
|
||||||
<form action="{{ route('admin.settings.update') }}" method="POST">
|
<form action="{{ route('admin.settings.update') }}" method="POST">
|
||||||
@csrf
|
@csrf
|
||||||
@method('POST')
|
@method('POST')
|
||||||
<input type="hidden" name="settings_class"
|
<input type="hidden" name="settings_class"
|
||||||
value="{{ $options['settings_class'] }}">
|
value="{{ $options['settings_class'] }}">
|
||||||
<input type="hidden" name="category" value="{{ $category }}">
|
<input type="hidden" name="category" value="{{ $category }}">
|
||||||
|
|
||||||
@foreach ($options as $key => $value)
|
@foreach ($options as $key => $value)
|
||||||
|
@ -191,11 +181,10 @@
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<div class="custom-control mb-3 d-flex align-items-center">
|
<div class="custom-control mb-3 d-flex align-items-center">
|
||||||
@if ($value['description'])
|
@if ($value['description'])
|
||||||
<i class="fas fa-info-circle mr-4"
|
<i class="fas fa-info-circle mr-4" data-toggle="popover"
|
||||||
data-toggle="popover"
|
data-trigger="hover" data-placement="top"
|
||||||
data-trigger="hover" data-placement="top"
|
data-html="true"
|
||||||
data-html="true"
|
data-content="{{ $value['description'] }}"></i>
|
||||||
data-content="{{ $value['description'] }}"></i>
|
|
||||||
@else
|
@else
|
||||||
<i class="fas fa-info-circle mr-4 invisible"></i>
|
<i class="fas fa-info-circle mr-4 invisible"></i>
|
||||||
@endif
|
@endif
|
||||||
|
@ -204,62 +193,68 @@
|
||||||
@switch($value)
|
@switch($value)
|
||||||
@case($value['type'] == 'string')
|
@case($value['type'] == 'string')
|
||||||
<input type="text" class="form-control"
|
<input type="text" class="form-control"
|
||||||
name="{{ $key }}"
|
name="{{ $key }}"
|
||||||
value="{{ $value['value'] }}">
|
value="{{ $value['value'] }}">
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@case($value['type'] == 'boolean')
|
@case($value['type'] == 'boolean')
|
||||||
<input type="checkbox" name="{{ $key }}"
|
<input type="checkbox" name="{{ $key }}"
|
||||||
value="{{ $value['value'] }}"
|
value="{{ $value['value'] }}"
|
||||||
{{ $value['value'] ? 'checked' : '' }}>
|
{{ $value['value'] ? 'checked' : '' }}>
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@case($value['type'] == 'number')
|
@case($value['type'] == 'number')
|
||||||
<input type="number" class="form-control"
|
<input type="number" class="form-control"
|
||||||
name="{{ $key }}"
|
name="{{ $key }}"
|
||||||
value="{{ $value['value'] }}">
|
value="{{ $value['value'] }}">
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@case($value['type'] == 'select')
|
@case($value['type'] == 'select')
|
||||||
<select id="{{ $key }}"
|
<select id="{{ $key }}"
|
||||||
class="custom-select w-100"
|
class="custom-select w-100"
|
||||||
name="{{ $key }}">
|
name="{{ $key }}">
|
||||||
|
@if ($value['identifier'] == 'display')
|
||||||
@foreach ($value['options'] as $option=>$display)
|
{{ error_log($key . 'True, IAM A DISPLAY') }}
|
||||||
<option value="{{ $option }}"
|
@foreach ($value['options'] as $option => $display)
|
||||||
{{ $value['value'] == $option ? 'selected' : '' }}>
|
<option value="{{ $display }}"
|
||||||
{{ __($display) }}
|
{{ $value['value'] == $display ? 'selected' : '' }}>
|
||||||
</option>
|
{{ __($display) }}
|
||||||
@endforeach
|
</option>
|
||||||
|
@endforeach
|
||||||
|
@else
|
||||||
|
@foreach ($value['options'] as $option => $display)
|
||||||
|
<option value="{{ $option }}"
|
||||||
|
{{ $value['value'] == $option ? 'selected' : '' }}>
|
||||||
|
{{ __($display) }}
|
||||||
|
</option>
|
||||||
|
@endforeach
|
||||||
|
@endif
|
||||||
</select>
|
</select>
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@case($value['type'] == 'multiselect')
|
@case($value['type'] == 'multiselect')
|
||||||
<select id="{{ $key }}"
|
<select id="{{ $key }}"
|
||||||
class="custom-select w-100"
|
class="custom-select w-100"
|
||||||
name="{{ $key }}[]"
|
name="{{ $key }}[]" multiple>
|
||||||
multiple>
|
|
||||||
@foreach ($value['options'] as $option)
|
@foreach ($value['options'] as $option)
|
||||||
<option value="{{ $option }}"
|
<option value="{{ $option }}"
|
||||||
{{ strpos($value['value'],$option) !== false ? 'selected' : '' }}>
|
{{ strpos($value['value'], $option) !== false ? 'selected' : '' }}>
|
||||||
{{ __($option) }}
|
{{ __($option) }}
|
||||||
</option>
|
</option>
|
||||||
@endforeach
|
@endforeach
|
||||||
</select>
|
</select>
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@case($value['type'] == 'textarea')
|
@case($value['type'] == 'textarea')
|
||||||
<textarea class="form-control"
|
<textarea class="form-control" name="{{ $key }}" rows="3">{{ $value['value'] }}</textarea>
|
||||||
name="{{ $key }}"
|
@break
|
||||||
rows="3">{{ $value['value'] }}</textarea>
|
|
||||||
@break
|
|
||||||
|
|
||||||
@default
|
@default
|
||||||
@endswitch
|
@endswitch
|
||||||
@error($key)
|
@error($key)
|
||||||
<div class="text-danger ">
|
<div class="text-danger ">
|
||||||
{{ $message }}
|
{{ $message }}
|
||||||
</div>
|
</div>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -268,41 +263,39 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
||||||
<!-- TODO: Display this only on the General tab
|
<!-- TODO: Display this only on the General tab
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-4 d-flex align-items-center">
|
<div class="col-4 d-flex align-items-center">
|
||||||
<label for="recaptcha_preview">{{__("ReCAPTCHA Preview")}}</label>
|
<label for="recaptcha_preview">{{ __('ReCAPTCHA Preview') }}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
|
|
||||||
<div class="w-100">
|
<div class="w-100">
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
{!! htmlScriptTagJsApi() !!}
|
{!! htmlScriptTagJsApi() !!}
|
||||||
{!! htmlFormSnippet() !!}
|
{!! htmlFormSnippet() !!}
|
||||||
@error('g-recaptcha-response')
|
@error('g-recaptcha-response')
|
||||||
<span class="text-danger" role="alert">
|
<span class="text-danger" role="alert">
|
||||||
<small><strong>{{ $message }}</strong></small>
|
<small><strong>{{ $message }}</strong></small>
|
||||||
</span>
|
</span>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 d-flex align-items-center justify-content-end">
|
<div class="col-12 d-flex align-items-center justify-content-end">
|
||||||
<button type="submit"
|
<button type="submit" class="btn btn-primary float-right ">Save
|
||||||
class="btn btn-primary float-right ">Save
|
|
||||||
</button>
|
</button>
|
||||||
<button type="reset"
|
<button type="reset"
|
||||||
class="btn btn-secondary float-right ml-2">Reset
|
class="btn btn-secondary float-right ml-2">Reset
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -331,7 +324,7 @@
|
||||||
$('.nav-item a[href="' + tabPaneHash + '"]').tab('show');
|
$('.nav-item a[href="' + tabPaneHash + '"]').tab('show');
|
||||||
}
|
}
|
||||||
|
|
||||||
$('.nav-pills a').click(function (e) {
|
$('.nav-pills a').click(function(e) {
|
||||||
$(this).tab('show');
|
$(this).tab('show');
|
||||||
const scrollmem = $('body').scrollTop();
|
const scrollmem = $('body').scrollTop();
|
||||||
window.location.hash = this.hash;
|
window.location.hash = this.hash;
|
||||||
|
|
Loading…
Reference in a new issue