diff --git a/resources/views/components/frameworks/bootstrap5/pagination.blade.php b/resources/views/components/frameworks/bootstrap5/pagination.blade.php index 7c2912534..3b4dd1ac6 100644 --- a/resources/views/components/frameworks/bootstrap5/pagination.blade.php +++ b/resources/views/components/frameworks/bootstrap5/pagination.blade.php @@ -1,154 +1,45 @@
- @if ($recordCount === 'full') - - {{ trans('livewire-powergrid::datatable.pagination.showing') }} - {{ $paginator->firstItem() }} - {{ trans('livewire-powergrid::datatable.pagination.to') }} - {{ $paginator->lastItem() }} - {{ trans('livewire-powergrid::datatable.pagination.of') }} - {{ $paginator->total() }} - {{ trans('livewire-powergrid::datatable.pagination.results') }} - - @elseif($recordCount === 'short') - - {{ $paginator->firstItem() }} - - - {{ $paginator->lastItem() }} - | - {{ $paginator->total() }} - - @elseif($recordCount === 'min') - - {{ $paginator->firstItem() }} - - - {{ $paginator->lastItem() }} - - @endif - - @if ($paginator->hasPages() && $recordCount != 'min') - + @endif @endif
diff --git a/resources/views/components/frameworks/daisyui/pagination.blade.php b/resources/views/components/frameworks/daisyui/pagination.blade.php index c274d0304..63b834cec 100644 --- a/resources/views/components/frameworks/daisyui/pagination.blade.php +++ b/resources/views/components/frameworks/daisyui/pagination.blade.php @@ -3,260 +3,262 @@ class="items-center justify-between sm:flex gap-2" wire:loading.class="blur-[2px]" wire:target="loadMore" > -
- @if ($recordCount === 'full') -
$paginator->hasPages()])> -
$paginator->hasPages(), - 'leading-5 text-center sm:text-right', - ])> - {{ trans('livewire-powergrid::datatable.pagination.showing') }} - {{ $paginator->firstItem() }} - {{ trans('livewire-powergrid::datatable.pagination.to') }} - {{ $paginator->lastItem() }} - {{ trans('livewire-powergrid::datatable.pagination.of') }} - {{ $paginator->total() }} - {{ trans('livewire-powergrid::datatable.pagination.results') }} + @if($paginator->count() > 0) +
+ @if ($recordCount === 'full') +
$paginator->hasPages()])> +
$paginator->hasPages(), + 'leading-5 text-center sm:text-right', + ])> + {{ trans('livewire-powergrid::datatable.pagination.showing') }} + {{ $paginator->firstItem() }} + {{ trans('livewire-powergrid::datatable.pagination.to') }} + {{ $paginator->lastItem() }} + {{ trans('livewire-powergrid::datatable.pagination.of') }} + {{ $paginator->total() }} + {{ trans('livewire-powergrid::datatable.pagination.results') }} +
-
- @elseif($recordCount === 'short') -
$paginator->hasPages()])> -

$paginator->hasPages(), - 'leading-5 text-center sm:text-right', - ])> - {{ $paginator->firstItem() }} - - - {{ $paginator->lastItem() }} - | - {{ $paginator->total() }} -

-
- @elseif($recordCount === 'min') -
$paginator->hasPages()])> -

$paginator->hasPages(), - 'leading-5 text-center sm:text-right', - ])> - {{ $paginator->firstItem() }} - - - {{ $paginator->lastItem() }} -

-
- @endif + @elseif($recordCount === 'short') +
$paginator->hasPages()])> +

$paginator->hasPages(), + 'leading-5 text-center sm:text-right', + ])> + {{ $paginator->firstItem() }} + - + {{ $paginator->lastItem() }} + | + {{ $paginator->total() }} +

+
+ @elseif($recordCount === 'min') +
$paginator->hasPages()])> +

$paginator->hasPages(), + 'leading-5 text-center sm:text-right', + ])> + {{ $paginator->firstItem() }} + - + {{ $paginator->lastItem() }} +

+
+ @endif - @if ($paginator->hasPages() && !in_array($recordCount, ['min', 'short'])) - + @endif +
-
+ @endif diff --git a/resources/views/components/frameworks/tailwind/pagination.blade.php b/resources/views/components/frameworks/tailwind/pagination.blade.php index efbf2fde4..6920215b7 100644 --- a/resources/views/components/frameworks/tailwind/pagination.blade.php +++ b/resources/views/components/frameworks/tailwind/pagination.blade.php @@ -3,262 +3,264 @@ class="items-center justify-between sm:flex gap-2" wire:loading.class="blur-[2px]" wire:target="loadMore" > -
- @if ($recordCount === 'full') -
$paginator->hasPages()])> -
$paginator->hasPages(), - 'leading-5 text-center text-pg-primary-700 text-md dark:text-pg-primary-300 sm:text-right', - ])> - {{ trans('livewire-powergrid::datatable.pagination.showing') }} - {{ $paginator->firstItem() }} - {{ trans('livewire-powergrid::datatable.pagination.to') }} - {{ $paginator->lastItem() }} - {{ trans('livewire-powergrid::datatable.pagination.of') }} - {{ $paginator->total() }} - {{ trans('livewire-powergrid::datatable.pagination.results') }} + @if($paginator->count() > 0) +
+ @if ($recordCount === 'full') +
$paginator->hasPages()])> +
$paginator->hasPages(), + 'leading-5 text-center text-pg-primary-700 text-md dark:text-pg-primary-300 sm:text-right', + ])> + {{ trans('livewire-powergrid::datatable.pagination.showing') }} + {{ $paginator->firstItem() }} + {{ trans('livewire-powergrid::datatable.pagination.to') }} + {{ $paginator->lastItem() }} + {{ trans('livewire-powergrid::datatable.pagination.of') }} + {{ $paginator->total() }} + {{ trans('livewire-powergrid::datatable.pagination.results') }} +
-
- @elseif($recordCount === 'short') -
$paginator->hasPages()])> -

$paginator->hasPages(), - 'leading-5 text-center text-pg-primary-700 text-md dark:text-pg-primary-300 sm:text-right', - ])> - {{ $paginator->firstItem() }} - - - {{ $paginator->lastItem() }} - | - {{ $paginator->total() }} -

-
- @elseif($recordCount === 'min') -
$paginator->hasPages()])> -

$paginator->hasPages(), - 'leading-5 text-center text-pg-primary-700 text-md dark:text-pg-primary-300 sm:text-right', - ])> - {{ $paginator->firstItem() }} - - - {{ $paginator->lastItem() }} -

-
- @endif + @elseif($recordCount === 'short') +
$paginator->hasPages()])> +

$paginator->hasPages(), + 'leading-5 text-center text-pg-primary-700 text-md dark:text-pg-primary-300 sm:text-right', + ])> + {{ $paginator->firstItem() }} + - + {{ $paginator->lastItem() }} + | + {{ $paginator->total() }} +

+
+ @elseif($recordCount === 'min') +
$paginator->hasPages()])> +

$paginator->hasPages(), + 'leading-5 text-center text-pg-primary-700 text-md dark:text-pg-primary-300 sm:text-right', + ])> + {{ $paginator->firstItem() }} + - + {{ $paginator->lastItem() }} +

+
+ @endif - @if ($paginator->hasPages() && !in_array($recordCount, ['min', 'short'])) - + @endif +
-
+ @endif