Skip to content

Commit 220048d

Browse files
lrljoelrljoe
committed
Adjust changes to pagination
1 parent c467aca commit 220048d

File tree

1 file changed

+147
-137
lines changed

1 file changed

+147
-137
lines changed

‎resources/views/components/pagination.blade.php‎

Lines changed: 147 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -6,160 +6,170 @@
66
$this->getParametersForConfigurableArea('before-pagination')
77
)
88

9-
@if ($this->isTailwind && $this->paginationIsEnabled() && $this->paginationVisibilityIsEnabled())
9+
@if ($this->isTailwind)
1010
<div {{ $this->getPaginationWrapperAttributesBag()->class([
11-
"mt-4 px-4 md:p-0 sm:flex justify-between items-center space-y-4 sm:space-y-0" => $this->isTailwind && ($this->getPaginationWrapperAttributes['default'] ?? true)
12-
])
13-
->except(['default', 'default-colors', 'default-styling'])
14-
}}
15-
>
16-
@if ($this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
17-
<p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
18-
@if($this->showPaginationDetails())
19-
<span>@lang('livewire-tables::Showing')</span>
20-
<span class="font-medium">{{ $this->getRows->firstItem() }}</span>
21-
<span>@lang('livewire-tables::to')</span>
22-
<span class="font-medium">{{ $this->getRows->lastItem() }}</span>
23-
<span>@lang('livewire-tables::of')</span>
24-
<span class="font-medium"><span x-text="paginationTotalItemCount"></span></span>
25-
<span>@lang('livewire-tables::results')</span>
11+
'mt-4 px-4 md:p-0 sm:flex justify-between items-center space-y-4 sm:space-y-0' => $this->getPaginationWrapperAttributesBag()->getAttributes()['default'] ?? true
12+
])
13+
->except([
14+
'default',
15+
'default-colors',
16+
'default-styling'
17+
])
18+
}}>
19+
@if ($this->paginationVisibilityIsEnabled())
20+
<div>
21+
@if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
22+
<p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
23+
@if($this->showPaginationDetails())
24+
<span>@lang('livewire-tables::Showing')</span>
25+
<span class="font-medium">{{ $this->getRows->firstItem() }}</span>
26+
<span>@lang('livewire-tables::to')</span>
27+
<span class="font-medium">{{ $this->getRows->lastItem() }}</span>
28+
<span>@lang('livewire-tables::of')</span>
29+
<span class="font-medium"><span x-text="paginationTotalItemCount"></span></span>
30+
<span>@lang('livewire-tables::results')</span>
31+
@endif
32+
</p>
33+
@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('simple'))
34+
<p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
35+
@if($this->showPaginationDetails())
36+
<span>@lang('livewire-tables::Showing')</span>
37+
<span class="font-medium">{{ $this->getRows->firstItem() }}</span>
38+
<span>@lang('livewire-tables::to')</span>
39+
<span class="font-medium">{{ $this->getRows->lastItem() }}</span>
40+
@endif
41+
</p>
42+
@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('cursor'))
43+
@else
44+
<p class="total-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
45+
@lang('livewire-tables::Showing')
46+
<span class="font-medium">{{ $this->getRows->count() }}</span>
47+
@lang('livewire-tables::results')
48+
</p>
2649
@endif
27-
</p>
28-
@elseif ($this->isPaginationMethod('simple'))
29-
<p class="paged-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
30-
@if($this->showPaginationDetails())
31-
<span>@lang('livewire-tables::Showing')</span>
32-
<span class="font-medium">{{ $this->getRows->firstItem() }}</span>
33-
<span>@lang('livewire-tables::to')</span>
34-
<span class="font-medium">{{ $this->getRows->lastItem() }}</span>
35-
@endif
36-
</p>
37-
@else
38-
<p class="total-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
39-
@lang('livewire-tables::Showing')
40-
<span class="font-medium">{{ $this->getRows->count() }}</span>
41-
@lang('livewire-tables::results')
42-
</p>
50+
51+
</div>
52+
53+
@if ($this->paginationIsEnabled())
54+
{{ $this->getRows->links('livewire-tables::specific.tailwind.'.(!$this->isPaginationMethod('standard') ? 'simple-' : '').'pagination') }}
55+
@endif
56+
4357
@endif
44-
{{ $this->getRows->links('livewire-tables::specific.tailwind.'.(!$this->isPaginationMethod('standard') ? 'simple-' : '').'pagination') }}
45-
</div>
46-
@elseif ($this->isTailwind && $this->paginationIsDisabled())
47-
<div {{ $this->getPaginationWrapperAttributesBag()->class([
48-
"mt-4 px-4 md:p-0 sm:flex justify-between items-center space-y-4 sm:space-y-0" => $this->isTailwind && ($this->getPaginationWrapperAttributes['default'] ?? true)
49-
])
50-
->except(['default', 'default-colors', 'default-styling'])
51-
}}
52-
>
53-
<p class="total-pagination-results text-sm text-gray-700 leading-5 dark:text-white">
54-
@lang('livewire-tables::Showing')
55-
<span class="font-medium">{{ $this->getRows->count() }}</span>
56-
@lang('livewire-tables::results')
57-
</p>
5858
</div>
59-
@elseif ($this->isBootstrap4 && $this->paginationIsEnabled() && $this->paginationVisibilityIsEnabled())
59+
@elseif ($this->isBootstrap4)
6060
<div {{ $this->getPaginationWrapperAttributesBag()
61-
->except(['default', 'default-colors', 'default-styling'])
62-
}}
63-
>
64-
@if ($this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
65-
<div class="row mt-3">
66-
<div class="col-12 col-md-6 overflow-auto">
67-
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.pagination') }}
68-
</div>
61+
->except([
62+
'default',
63+
'default-colors',
64+
'default-styling'
65+
])
66+
}}>
67+
@if ($this->paginationVisibilityIsEnabled())
68+
@if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
69+
<div class="row mt-3">
70+
<div class="col-12 col-md-6 overflow-auto">
71+
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.pagination') }}
72+
</div>
6973

70-
<div class="col-12 col-md-6 text-center text-md-right text-muted">
71-
@if($this->showPaginationDetails())
72-
<span>@lang('livewire-tables::Showing')</span>
73-
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
74-
<span>@lang('livewire-tables::to')</span>
75-
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
76-
<span>@lang('livewire-tables::of')</span>
77-
<strong><span x-text="paginationTotalItemCount"></span></strong>
78-
<span>@lang('livewire-tables::results')</span>
79-
@endif
80-
</div>
81-
</div>
82-
@elseif ($this->isPaginationMethod('simple'))
83-
<div class="row mt-3">
84-
<div class="col-12 col-md-6 overflow-auto">
85-
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
74+
<div class="col-12 col-md-6 text-center text-md-right text-muted">
75+
@if($this->showPaginationDetails())
76+
<span>@lang('livewire-tables::Showing')</span>
77+
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
78+
<span>@lang('livewire-tables::to')</span>
79+
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
80+
<span>@lang('livewire-tables::of')</span>
81+
<strong><span x-text="paginationTotalItemCount"></span></strong>
82+
<span>@lang('livewire-tables::results')</span>
83+
@endif
84+
</div>
8685
</div>
86+
@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('simple'))
87+
<div class="row mt-3">
88+
<div class="col-12 col-md-6 overflow-auto">
89+
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
90+
</div>
8791

88-
<div class="col-12 col-md-6 text-center text-md-right text-muted">
89-
@if($this->showPaginationDetails())
90-
<span>@lang('livewire-tables::Showing')</span>
91-
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
92-
<span>@lang('livewire-tables::to')</span>
93-
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
94-
@endif
92+
<div class="col-12 col-md-6 text-center text-md-right text-muted">
93+
@if($this->showPaginationDetails())
94+
<span>@lang('livewire-tables::Showing')</span>
95+
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
96+
<span>@lang('livewire-tables::to')</span>
97+
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
98+
@endif
99+
</div>
95100
</div>
96-
</div>
97-
@elseif ($this->isPaginationMethod('cursor'))
98-
<div class="row mt-3">
99-
<div class="col-12 col-md-6 overflow-auto">
100-
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
101+
@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('cursor'))
102+
<div class="row mt-3">
103+
<div class="col-12 col-md-6 overflow-auto">
104+
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
105+
</div>
101106
</div>
102-
</div>
103-
@else
104-
<div class="row mt-3">
105-
<div class="col-12 text-muted">
106-
@lang('livewire-tables::Showing')
107-
<strong>{{ $this->getRows->count() }}</strong>
108-
@lang('livewire-tables::results')
107+
@else
108+
<div class="row mt-3">
109+
<div class="col-12 text-muted">
110+
@lang('livewire-tables::Showing')
111+
<strong>{{ $this->getRows->count() }}</strong>
112+
@lang('livewire-tables::results')
113+
</div>
109114
</div>
110-
</div>
115+
@endif
111116
@endif
112117
</div>
113-
@elseif ($this->isBootstrap5 && $this->paginationIsEnabled() && $this->paginationVisibilityIsEnabled())
118+
@elseif ($this->isBootstrap5)
114119
<div {{ $this->getPaginationWrapperAttributesBag()
115-
->except(['default', 'default-colors', 'default-styling'])
116-
}}
117-
>
118-
@if ($this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
119-
<div class="row mt-3">
120-
<div class="col-12 col-md-6 overflow-auto">
121-
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.pagination') }}
120+
->except([
121+
'default',
122+
'default-colors',
123+
'default-styling'
124+
])
125+
}} >
126+
@if ($this->paginationVisibilityIsEnabled())
127+
@if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)
128+
<div class="row mt-3">
129+
<div class="col-12 col-md-6 overflow-auto">
130+
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.pagination') }}
131+
</div>
132+
<div class="col-12 col-md-6 text-center text-md-end text-muted">
133+
@if($this->showPaginationDetails())
134+
<span>@lang('livewire-tables::Showing')</span>
135+
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
136+
<span>@lang('livewire-tables::to')</span>
137+
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
138+
<span>@lang('livewire-tables::of')</span>
139+
<strong><span x-text="paginationTotalItemCount"></span></strong>
140+
<span>@lang('livewire-tables::results')</span>
141+
@endif
142+
</div>
122143
</div>
123-
<div class="col-12 col-md-6 text-center text-md-end text-muted">
124-
@if($this->showPaginationDetails())
125-
<span>@lang('livewire-tables::Showing')</span>
126-
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
127-
<span>@lang('livewire-tables::to')</span>
128-
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
129-
<span>@lang('livewire-tables::of')</span>
130-
<strong><span x-text="paginationTotalItemCount"></span></strong>
131-
<span>@lang('livewire-tables::results')</span>
132-
@endif
144+
@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('simple'))
145+
<div class="row mt-3">
146+
<div class="col-12 col-md-6 overflow-auto">
147+
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
148+
</div>
149+
<div class="col-12 col-md-6 text-center text-md-end text-muted">
150+
@if($this->showPaginationDetails())
151+
<span>@lang('livewire-tables::Showing')</span>
152+
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
153+
<span>@lang('livewire-tables::to')</span>
154+
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
155+
@endif
156+
</div>
133157
</div>
134-
</div>
135-
@elseif ($this->isPaginationMethod('simple'))
136-
<div class="row mt-3">
137-
<div class="col-12 col-md-6 overflow-auto">
138-
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
158+
@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('cursor'))
159+
<div class="row mt-3">
160+
<div class="col-12 col-md-6 overflow-auto">
161+
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
162+
</div>
139163
</div>
140-
<div class="col-12 col-md-6 text-center text-md-end text-muted">
141-
@if($this->showPaginationDetails())
142-
<span>@lang('livewire-tables::Showing')</span>
143-
<strong>{{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }}</strong>
144-
<span>@lang('livewire-tables::to')</span>
145-
<strong>{{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }}</strong>
146-
@endif
147-
</div>
148-
</div>
149-
@elseif ($this->isPaginationMethod('cursor'))
150-
<div class="row mt-3">
151-
<div class="col-12 col-md-6 overflow-auto">
152-
{{ $this->getRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }}
164+
@else
165+
<div class="row mt-3">
166+
<div class="col-12 text-muted">
167+
@lang('livewire-tables::Showing')
168+
<strong>{{ $this->getRows->count() }}</strong>
169+
@lang('livewire-tables::results')
170+
</div>
153171
</div>
154-
</div>
155-
@else
156-
<div class="row mt-3">
157-
<div class="col-12 text-muted">
158-
@lang('livewire-tables::Showing')
159-
<strong>{{ $this->getRows->count() }}</strong>
160-
@lang('livewire-tables::results')
161-
</div>
162-
</div>
172+
@endif
163173
@endif
164174
</div>
165175
@endif
@@ -168,4 +178,4 @@
168178
$this->hasConfigurableAreaFor('after-pagination'),
169179
$this->getConfigurableAreaFor('after-pagination'),
170180
$this->getParametersForConfigurableArea('after-pagination')
171-
)
181+
)

0 commit comments

Comments
 (0)