-
Notifications
You must be signed in to change notification settings - Fork 11k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "[5.3] Hide empty paginators" (#15241)
- Loading branch information
1 parent
30ed616
commit 3578653
Showing
4 changed files
with
90 additions
and
98 deletions.
There are no files selected for viewing
64 changes: 31 additions & 33 deletions
64
src/Illuminate/Pagination/resources/views/bootstrap-4.blade.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,34 @@ | ||
| @if ($paginator->count() > 1) | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="page-item disabled"><span class="page-link">«</span></li> | ||
| @else | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
|
|
||
| <!-- Pagination Elements --> | ||
| @foreach ($elements as $element) | ||
| <!-- "Three Dots" Separator --> | ||
| @if (is_string($element)) | ||
| <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li> | ||
| @endif | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="page-item disabled"><span class="page-link">«</span></li> | ||
| @else | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
|
|
||
| <!-- Array Of Links --> | ||
| @if (is_array($element)) | ||
| @foreach ($element as $page => $url) | ||
| @if ($page == $paginator->currentPage()) | ||
| <li class="page-item active"><span class="page-link">{{ $page }}</span></li> | ||
| @else | ||
| <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li> | ||
| @endif | ||
| @endforeach | ||
| @endif | ||
| @endforeach | ||
| <!-- Pagination Elements --> | ||
| @foreach ($elements as $element) | ||
| <!-- "Three Dots" Separator --> | ||
| @if (is_string($element)) | ||
| <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li> | ||
| @endif | ||
|
|
||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="page-item disabled"><span class="page-link">»</span></li> | ||
| <!-- Array Of Links --> | ||
| @if (is_array($element)) | ||
| @foreach ($element as $page => $url) | ||
| @if ($page == $paginator->currentPage()) | ||
| <li class="page-item active"><span class="page-link">{{ $page }}</span></li> | ||
| @else | ||
| <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li> | ||
| @endif | ||
| @endforeach | ||
| @endif | ||
| </ul> | ||
| @endif | ||
| @endforeach | ||
|
|
||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="page-item disabled"><span class="page-link">»</span></li> | ||
| @endif | ||
| </ul> |
64 changes: 31 additions & 33 deletions
64
src/Illuminate/Pagination/resources/views/default.blade.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,34 @@ | ||
| @if ($paginator->count() > 1) | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="disabled"><span>«</span></li> | ||
| @else | ||
| <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
|
|
||
| <!-- Pagination Elements --> | ||
| @foreach ($elements as $element) | ||
| <!-- "Three Dots" Separator --> | ||
| @if (is_string($element)) | ||
| <li class="disabled"><span>{{ $element }}</span></li> | ||
| @endif | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="disabled"><span>«</span></li> | ||
| @else | ||
| <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
|
|
||
| <!-- Array Of Links --> | ||
| @if (is_array($element)) | ||
| @foreach ($element as $page => $url) | ||
| @if ($page == $paginator->currentPage()) | ||
| <li class="active"><span>{{ $page }}</span></li> | ||
| @else | ||
| <li><a href="{{ $url }}">{{ $page }}</a></li> | ||
| @endif | ||
| @endforeach | ||
| @endif | ||
| @endforeach | ||
| <!-- Pagination Elements --> | ||
| @foreach ($elements as $element) | ||
| <!-- "Three Dots" Separator --> | ||
| @if (is_string($element)) | ||
| <li class="disabled"><span>{{ $element }}</span></li> | ||
| @endif | ||
|
|
||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="disabled"><span>»</span></li> | ||
| <!-- Array Of Links --> | ||
| @if (is_array($element)) | ||
| @foreach ($element as $page => $url) | ||
| @if ($page == $paginator->currentPage()) | ||
| <li class="active"><span>{{ $page }}</span></li> | ||
| @else | ||
| <li><a href="{{ $url }}">{{ $page }}</a></li> | ||
| @endif | ||
| @endforeach | ||
| @endif | ||
| </ul> | ||
| @endif | ||
| @endforeach | ||
|
|
||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="disabled"><span>»</span></li> | ||
| @endif | ||
| </ul> |
30 changes: 14 additions & 16 deletions
30
src/Illuminate/Pagination/resources/views/simple-bootstrap-4.blade.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| @if ($paginator->count() > 1) | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="page-item disabled"><span class="page-link">«</span></li> | ||
| @else | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="page-item disabled"><span class="page-link">«</span></li> | ||
| @else | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
|
|
||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="page-item disabled"><span class="page-link">»</span></li> | ||
| @endif | ||
| </ul> | ||
| @endif | ||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="page-item disabled"><span class="page-link">»</span></li> | ||
| @endif | ||
| </ul> |
30 changes: 14 additions & 16 deletions
30
src/Illuminate/Pagination/resources/views/simple-default.blade.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| @if ($paginator->count() > 1) | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="disabled"><span>«</span></li> | ||
| @else | ||
| <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
| <ul class="pagination"> | ||
| <!-- Previous Page Link --> | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="disabled"><span>«</span></li> | ||
| @else | ||
| <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li> | ||
| @endif | ||
|
|
||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="disabled"><span>»</span></li> | ||
| @endif | ||
| </ul> | ||
| @endif | ||
| <!-- Next Page Link --> | ||
| @if ($paginator->hasMorePages()) | ||
| <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li> | ||
| @else | ||
| <li class="disabled"><span>»</span></li> | ||
| @endif | ||
| </ul> |