fix roles

This commit is contained in:
Ludovic CANDELLIER
2022-01-30 00:30:21 +01:00
parent b4057c28d0
commit 5799eb36fc
32 changed files with 206 additions and 330 deletions

View File

@@ -1,6 +1,6 @@
<div class="card{{ isset($tabs) ? ($outline ? ' card-outline card-outline-tabs' : ' card-tabs') : ($outline ? ' card-outline' : '') }} card-{{ $color ?? config('boilerplate.theme.card.default_color', 'info') }}{{ ($bgColor ?? null) ? ' bg-'.$bgColor : '' }}{{ $collapsed ? ' collapsed-card' : '' }}{{ !empty($class) ? ' '.$class : '' }}"{!! empty($attributes) ? '' : ' '.$attributes !!}>
<div class="card{{ $tabs ? ($outline ? ' card-outline card-outline-tabs' : ' card-tabs') : ($outline ? ' card-outline' : '') }} card-{{ $color ?? config('boilerplate.theme.card.default_color', 'info') }}{{ ($bgColor ?? null) ? ' bg-'.$bgColor : '' }}{{ $collapsed ? ' collapsed-card' : '' }}{{ !empty($class) ? ' '.$class : '' }}"{!! empty($attributes) ? '' : ' '.$attributes !!}>
@if($title ?? false || $header ?? false || $tools ?? false || $maximize || $reduce || $close)
<div class="card-header{{ isset($tabs) ? ($outline ? ' p-0' : ' p-0 pt-1') : '' }} border-bottom-0">
<div class="card-header{{ $tabs ? ($outline ? ' p-0' : ' p-0 pt-1') : '' }} border-bottom-0">
@if($header ?? false)
{!! $header !!}
@else

View File

@@ -1,6 +1,6 @@
<div class="form-group{{ !empty($class) ? ' '.$class : '' }}">
<div class="icheck-{{ $color ?? 'primary' }}"{!! !empty($attributes) ? ' '.$attributes : '' !!}>
<input type="{{ $type ?? 'checkbox' }}" id="{{ $id }}"{{ $checked ? ' checked' : '' }}{{ $disabled ? ' disabled' : '' }}{!! !empty($name) ? ' name="'.$name.'"' : '' !!}{!! !empty($value) ? ' value="'.$value.'"' : '' !!}>
<input type="{{ $type ?? 'checkbox' }}" id="{{ $id }}"{{ (!empty($name) ? old($name, $checked ?? false) : $checked ?? false) ? ' checked' : '' }}{{ $disabled ? ' disabled' : '' }}{!! !empty($name) ? ' name="'.$name.'"' : '' !!}{!! !empty($value) ? ' value="'.$value.'"' : '' !!} autocomplete="off">
<label for="{{ $id }}" class="font-weight-normal">@lang($label ?? '')</label>
</div>
</div>

View File

@@ -4,9 +4,9 @@
The name attribute has not been set
</code>
@else
<div class="form-group{{ isset($groupClass) ? ' '.$groupClass : '' }}"{{ isset($groupId) ? ' id="'.$groupId.'"' : '' }}>
<div class="form-group{{ isset($groupClass) ? ' '.$groupClass : '' }}"{!! isset($groupId) ? ' id="'.$groupId.'"' : '' !!}>
@isset($label)
{!! Form::label($name, __($label)) !!}
<label>{!! __($label) !!}</label>
@endisset
@if($prepend || $prependText || $append || $appendText)
<div class="input-group">

View File

@@ -1,11 +1,11 @@
@if(empty($name))
<code>&lt;x-boilerplate::select2> The name attribute has not been set</code>
@else
<div class="form-group">
<div class="form-group{{ isset($groupClass) ? ' '.$groupClass : '' }}"{!! isset($groupId) ? ' id="'.$groupId.'"' : '' !!}>
@isset($label)
{{ Form::label($name, __($label)) }}
<label for="{{ $id }}">{!! __($label) !!}</label>
@endisset
<select id="{{ $id }}" name="{{ $name }}" class="form-control{{ $errors->first($name,' is-invalid') }}{{ isset($class) ? ' '.$class : '' }}"{!! !empty($attributes) ? ' '.$attributes : '' !!} style="visibility:hidden;height:1rem">
<select id="{{ $id }}" name="{{ $name }}" class="form-control{{ $errors->first($name,' is-invalid') }}{{ isset($class) ? ' '.$class : '' }}"{!! !empty($attributes) ? ' '.$attributes : '' !!} style="visibility:hidden;height:1rem" autocomplete="off">
@if(!isset($multiple))
<option></option>
@endif
@@ -24,10 +24,11 @@
<div class="error-bubble"><div>{{ $message }}</div></div>
@enderror
</div>
@include('boilerplate::load.select2')
@push('js')
@include('boilerplate::load.async.select2')
@component('boilerplate::minify')
<script>
$(function () {
whenAssetIsLoaded('select2', () => {
let parent = $('#{{ $id }}').parent();
$('#{{ $id }}').select2({
placeholder: '{{ $placeholder ?? '' }}',
allowClear: {{ $allowClear }},
@@ -36,15 +37,17 @@
minimumInputLength: {{ $minimumInputLength ?? 0 }},
minimumResultsForSearch: {{ $minimumResultsForSearch ?? 10 }},
width: '100%',
@isset($ajax)
dropdownAutoWidth: true,
dropdownParent: parent,
@isset($ajax)
ajax: {
delay: 200,
url: '{{ $ajax }}',
method: 'post'
}
@endisset
});
});
@endisset
})
})
</script>
@endpush
@endif
@endcomponent
@endif

View File

@@ -1,13 +1,37 @@
@if(empty($name))
<code>&lt;x-boilerplate::tinymce>The name attribute has not been set</code>
@else
<textarea id="{{ $id }}"{!! !empty($attributes) ? ' '.$attributes : '' !!} style="visibility:hidden">{!! $value ?? $slot ?? '' !!}</textarea>
@if($hasMediaManager)
@include('boilerplate-media-manager::load.tinymce')
@else
@include('boilerplate::load.tinymce')
<div class="form-group{{ isset($groupClass) ? ' '.$groupClass : '' }}"{!! isset($groupId) ? ' id="'.$groupId.'"' : '' !!}>
@isset($label)
<label for="{{ $id }}">{!! __($label) !!}</label>
@endisset
<textarea id="{{ $id }}" name="{{ $name }}"{!! !empty($attributes) ? ' '.$attributes : '' !!} style="visibility:hidden">{!! old($name, $value ?? $slot ?? '') !!}</textarea>
@if($help ?? false)
<small class="form-text text-muted">@lang($help)</small>
@endif
@push('js')
<script>$(function(){$('#{{ $id }}').tinymce({})});</script>
@endpush
@error($name)
<div class="error-bubble"><div>{{ $message }}</div></div>
@enderror
</div>
@include('boilerplate::load.async.tinymce')
@component('boilerplate::minify')
<script>
whenAssetIsLoaded('{!! mix('/plugins/tinymce/tinymce.min.js', '/assets/vendor/boilerplate') !!}', () => {
tinymce.init({
selector: '#{{ $id }}',
toolbar_sticky: {{ ($sticky ?? false) ? 'true' : 'false' }},
@if(setting('darkmode', false) && config('boilerplate.theme.darkmode'))
skin : "boilerplate-dark",
content_css: 'boilerplate-dark',
@else
skin : "oxide",
content_css: null,
@endif
@if(App::getLocale() !== 'en')
language: '{{ App::getLocale() }}'
@endif
});
});
</script>
@endcomponent
@endif