Skip to content

Commit 3e12de8

Browse files
rappasoftrappasoft
committed
Merge branch 'WhereIsLucas-master' into develop
2 parents 957875d + a063805 commit 3e12de8

File tree

4 files changed

+65
-39
lines changed

4 files changed

+65
-39
lines changed

‎resources/views/components/table/td/bulk-actions.blade.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
1818
/>
1919
</div>
2020
</x-livewire-tables::table.td.plain>
21-
@elseif ($theme === 'bootstrap-4' || $theme === 'bootstrap-5')
21+
@elseif ($theme === 'bootstrap-4')
2222
<x-livewire-tables::table.td.plain>
2323
<input
2424
wire:model="selected"
@@ -27,5 +27,17 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
2727
type="checkbox"
2828
/>
2929
</x-livewire-tables::table.td.plain>
30+
@elseif ($theme === 'bootstrap-5')
31+
<x-livewire-tables::table.td.plain>
32+
<div class="form-check">
33+
<input
34+
wire:model="selected"
35+
wire:loading.attr.delay="disabled"
36+
value="{{ $row->{$this->getPrimaryKey()} }}"
37+
type="checkbox"
38+
class="form-check-input"
39+
/>
40+
</div>
41+
</x-livewire-tables::table.td.plain>
3042
@endif
3143
@endif

‎resources/views/components/table/th/bulk-actions.blade.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,22 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
1515
/>
1616
</div>
1717
</x-livewire-tables::table.th.plain>
18-
@elseif ($theme === 'bootstrap-4' || $theme === 'bootstrap-5')
18+
@elseif ($theme === 'bootstrap-4')
1919
<x-livewire-tables::table.th.plain>
2020
<input
2121
wire:model="selectAll"
2222
type="checkbox"
2323
/>
2424
</x-livewire-tables::table.th.plain>
25+
@elseif ($theme === 'bootstrap-5')
26+
<x-livewire-tables::table.th.plain>
27+
<div class="form-check">
28+
<input
29+
wire:model="selectAll"
30+
type="checkbox"
31+
class="form-check-input"
32+
/>
33+
</div>
34+
</x-livewire-tables::table.th.plain>
2535
@endif
2636
@endif

‎resources/views/components/tools/filters/select.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class="block w-full border-gray-300 rounded-md shadow-sm transition duration-150
2828
wire:model.stop="{{ $component->getTableName() }}.filters.{{ $filter->getKey() }}"
2929
wire:key="{{ $component->getTableName() }}-filter-{{ $filter->getKey() }}"
3030
id="{{ $component->getTableName() }}-filter-{{ $filter->getKey() }}"
31-
class="form-control"
31+
class="{{ $theme === 'bootstrap-4' ? 'form-control' : 'form-select' }}"
3232
>
3333
@foreach($filter->getOptions() as $key => $value)
3434
@if (is_iterable($value))

‎resources/views/components/tools/toolbar.blade.php

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@ class="inline-flex justify-center w-full rounded-md border border-gray-300 shado
7575
@endif
7676
>
7777
@lang('Filters')
78-
78+
7979
@if ($count = $component->getFilterBadgeCount())
8080
<span class="ml-1 inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 bg-indigo-100 text-indigo-800 capitalize dark:bg-indigo-200 dark:text-indigo-900">
8181
{{ $count }}
8282
</span>
8383
@endif
84-
84+
8585
<svg class="-mr-1 ml-2 h-5 w-5" xmlns="http://www.w3.org/2000/svg" fill="none"
8686
viewBox="0 0 24 24" stroke="currentColor">
8787
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
8888
d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2.586a1 1 0 01-.293.707l-6.414 6.414a1 1 0 00-.293.707V17l-4 4v-6.586a1 1 0 00-.293-.707L3.293 7.293A1 1 0 013 6.586V4z" />
8989
</svg>
9090
</button>
9191
</div>
92-
92+
9393
@if ($component->isFilterLayoutPopover())
9494
<div
9595
x-cloak
@@ -113,7 +113,7 @@ class="origin-top-left absolute left-0 mt-2 w-full md:w-56 rounded-md shadow-lg
113113
class="block text-sm font-medium leading-5 text-gray-700 dark:text-white">
114114
{{ $filter->getName() }}
115115
</label>
116-
116+
117117
{{ $filter->render($component) }}
118118
</div>
119119
</div>
@@ -225,14 +225,14 @@ class="inline-flex justify-center px-4 py-2 w-full text-sm font-medium text-gray
225225
aria-expanded="true"
226226
>
227227
@lang('Columns')
228-
228+
229229
<svg class="-mr-1 ml-2 w-5 h-5" x-description="Heroicon name: chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
230230
<path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd"></path>
231231
</svg>
232232
</button>
233233
</span>
234234
</div>
235-
235+
236236
<div
237237
x-cloak
238238
x-show="open"
@@ -413,13 +413,13 @@ class="btn dropdown-toggle d-block w-100 d-md-inline"
413413
@endif
414414
>
415415
@lang('Filters')
416-
416+
417417
@if ($count = $component->getFilterBadgeCount())
418418
<span class="badge badge-info">
419419
{{ $count }}
420420
</span>
421421
@endif
422-
422+
423423
<span class="caret"></span>
424424
</button>
425425
</div>
@@ -675,13 +675,13 @@ class="btn dropdown-toggle d-block w-100 d-md-inline"
675675
@endif
676676
>
677677
@lang('Filters')
678-
678+
679679
@if ($count = $component->getFilterBadgeCount())
680680
<span class="badge bg-info">
681681
{{ $count }}
682682
</span>
683683
@endif
684-
684+
685685
<span class="caret"></span>
686686
</button>
687687
</div>
@@ -780,41 +780,45 @@ class="dropdown-menu dropdown-menu-end w-100"
780780
x-bind:class="{'show' : open}"
781781
aria-labelledby="columnSelect-{{ $component->getTableName() }}"
782782
>
783-
<div>
783+
<div class="form-check ms-2">
784+
<input
785+
@if($component->allDefaultVisibleColumnsAreSelected())
786+
checked
787+
wire:click="deselectAllColumns"
788+
@else
789+
unchecked
790+
wire:click="selectAllColumns"
791+
@endif
792+
wire:loading.attr="disabled"
793+
type="checkbox"
794+
class="form-check-input"
795+
/>
784796
<label
785797
wire:loading.attr="disabled"
786-
class="px-2 mb-1"
798+
class="form-check-label"
787799
>
788-
<input
789-
@if($component->allDefaultVisibleColumnsAreSelected())
790-
checked
791-
wire:click="deselectAllColumns"
792-
@else
793-
unchecked
794-
wire:click="selectAllColumns"
795-
@endif
796-
wire:loading.attr="disabled"
797-
type="checkbox"
798-
/>
799-
<span class="ml-2">{{ __('All Columns') }}</span>
800+
{{ __('All Columns') }}
800801
</label>
801802
</div>
802803
@foreach($component->getColumns() as $column)
803804
@if ($column->isVisible() && $column->isSelectable())
804-
<div wire:key="columnSelect-{{ $loop->index }}-{{ $component->getTableName() }}">
805+
<div wire:key="columnSelect-{{ $loop->index }}-{{ $component->getTableName() }}"
806+
class="form-check ms-2"
807+
>
808+
<input
809+
wire:model="selectedColumns"
810+
wire:target="selectedColumns"
811+
wire:loading.attr="disabled"
812+
type="checkbox"
813+
class="form-check-input"
814+
value="{{ $column->getSlug() }}"
815+
/>
805816
<label
806817
wire:loading.attr="disabled"
807818
wire:target="selectedColumns"
808-
class="px-2 {{ $loop->last ? 'mb-0' : 'mb-1' }}"
809-
>
810-
<input
811-
wire:model="selectedColumns"
812-
wire:target="selectedColumns"
813-
wire:loading.attr="disabled"
814-
type="checkbox"
815-
value="{{ $column->getSlug() }}"
816-
/>
817-
<span class="ml-2">{{ $column->getTitle() }}</span>
819+
class="{{ $loop->last ? 'mb-0' : 'mb-1' }} form-check-label"
820+
>{{ $column->getTitle() }}</label>
821+
818822
</label>
819823
</div>
820824
@endif
@@ -829,7 +833,7 @@ class="px-2 {{ $loop->last ? 'mb-0' : 'mb-1' }}"
829833
<select
830834
wire:model="perPage"
831835
id="perPage"
832-
class="form-control"
836+
class="form-select"
833837
>
834838
@foreach ($component->getPerPageAccepted() as $item)
835839
<option value="{{ $item }}" wire:key="per-page-{{ $item }}-{{ $component->getTableName() }}">{{ $item === -1 ? __('All') : $item }}</option>

0 commit comments

Comments
 (0)