-
-
Notifications
You must be signed in to change notification settings - Fork 222
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #171 from Power-Components/dev
Dev - 1.5.6
- Loading branch information
Showing
43 changed files
with
1,381 additions
and
1,131 deletions.
There are no files selected for viewing
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
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,22 +1,25 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true"> | ||
| <testsuites> | ||
| <testsuite name="Feature"> | ||
| <directory suffix="Test.php">./tests/Feature</directory> | ||
| </testsuite> | ||
| </testsuites> | ||
| <coverage processUncoveredFiles="true"> | ||
| <include> | ||
| <directory suffix=".php">./app</directory> | ||
| </include> | ||
| </coverage> | ||
| <php> | ||
| <server name="APP_ENV" value="testing"/> | ||
| <server name="DB_DRIVER" value="mysql"/> | ||
| <server name="DB_HOST" value="127.0.0.1"/> | ||
| <server name="DB_PORT" value="3307"/> | ||
| <server name="DB_USERNAME" value="root"/> | ||
| <server name="DB_PASSWORD" value="password"/> | ||
| <server name="DB_DATABASE" value="powergridtest"/> | ||
| </php> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" | ||
| colors="true"> | ||
| <testsuites> | ||
| <testsuite name="Feature"> | ||
| <directory suffix="Test.php">./tests/Feature</directory> | ||
| <exclude>./tests/Feature/FilterInputOptionsCollectionTest.php</exclude> | ||
| </testsuite> | ||
| </testsuites> | ||
| <coverage processUncoveredFiles="true"> | ||
| <include> | ||
| <directory suffix=".php">./app</directory> | ||
| </include> | ||
| </coverage> | ||
| <php> | ||
| <server name="APP_ENV" value="testing"/> | ||
| <server name="DB_DRIVER" value="mysql"/> | ||
| <server name="DB_HOST" value="127.0.0.1"/> | ||
| <server name="DB_PORT" value="3307"/> | ||
| <server name="DB_USERNAME" value="root"/> | ||
| <server name="DB_PASSWORD" value="password"/> | ||
| <server name="DB_DATABASE" value="powergridtest"/> | ||
| </php> | ||
| </phpunit> |
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
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
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,22 +1,25 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true"> | ||
| <testsuites> | ||
| <testsuite name="Feature"> | ||
| <directory suffix="Test.php">./tests/Feature</directory> | ||
| </testsuite> | ||
| </testsuites> | ||
| <coverage processUncoveredFiles="true"> | ||
| <include> | ||
| <directory suffix=".php">./app</directory> | ||
| </include> | ||
| </coverage> | ||
| <php> | ||
| <server name="APP_ENV" value="testing"/> | ||
| <server name="DB_DRIVER" value="sqlsrv"/> | ||
| <server name="DB_HOST" value="127.0.0.1"/> | ||
| <server name="DB_PORT" value="1434"/> | ||
| <server name="DB_USERNAME" value="sa"/> | ||
| <server name="DB_PASSWORD" value="yourStrong(!)Password"/> | ||
| <server name="DB_DATABASE" value="tempdb"/> | ||
| </php> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" | ||
| colors="true"> | ||
| <testsuites> | ||
| <testsuite name="Feature"> | ||
| <directory suffix="Test.php">./tests/Feature</directory> | ||
| <exclude>./tests/Feature/FilterInputOptionsCollectionTest.php</exclude> | ||
| </testsuite> | ||
| </testsuites> | ||
| <coverage processUncoveredFiles="true"> | ||
| <include> | ||
| <directory suffix=".php">./app</directory> | ||
| </include> | ||
| </coverage> | ||
| <php> | ||
| <server name="APP_ENV" value="testing"/> | ||
| <server name="DB_DRIVER" value="sqlsrv"/> | ||
| <server name="DB_HOST" value="127.0.0.1"/> | ||
| <server name="DB_PORT" value="1434"/> | ||
| <server name="DB_USERNAME" value="sa"/> | ||
| <server name="DB_PASSWORD" value="yourStrong(!)Password"/> | ||
| <server name="DB_DATABASE" value="tempdb"/> | ||
| </php> | ||
| </phpunit> |
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
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
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
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
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
113 changes: 69 additions & 44 deletions
113
resources/views/components/frameworks/bootstrap5/pagination.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,48 +1,73 @@ | ||
| <div> | ||
| @if ($paginator->hasPages()) | ||
| <nav> | ||
| <ul class="pagination"> | ||
| {{-- Previous Page Link --}} | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')"> | ||
| <span class="page-link" aria-hidden="true">‹</span> | ||
| </li> | ||
| @else | ||
| <li class="page-item"> | ||
| <button type="button" dusk="previousPage" class="page-link" wire:click="previousPage" wire:loading.attr="disabled" rel="prev" aria-label="@lang('pagination.previous')">‹</button> | ||
| </li> | ||
| @endif | ||
|
|
||
| {{-- Pagination Elements --}} | ||
| @foreach ($elements as $element) | ||
| {{-- "Three Dots" Separator --}} | ||
| @if (is_string($element)) | ||
| <li class="page-item disabled" aria-disabled="true"><span class="page-link">{{ $element }}</span></li> | ||
| @endif | ||
| <div class="d-flex align-items-center justify-content-between"> | ||
| @if($recordCount === 'full') | ||
| <small class="text-muted d-block"> | ||
| {{ trans('livewire-powergrid::datatable.pagination.showing') }} | ||
| <span class="font-semibold">{{ $paginator->firstItem() }}</span> | ||
| {{ trans('livewire-powergrid::datatable.pagination.to') }} | ||
| <span class="font-semibold">{{ $paginator->lastItem() }}</span> | ||
| {{ trans('livewire-powergrid::datatable.pagination.of') }} | ||
| <span class="font-semibold">{{ $paginator->total() }}</span> | ||
| {{ trans('livewire-powergrid::datatable.pagination.results') }} | ||
| </small> | ||
| @elseif($recordCount === 'short') | ||
| <small class="text-muted d-block"> | ||
| <span class="font-semibold"> {{ $paginator->firstItem() }}</span> | ||
| - | ||
| <span class="font-semibold"> {{ $paginator->lastItem() }}</span> | ||
| | | ||
| <span class="font-semibold"> {{ $paginator->total() }}</span> | ||
| </small> | ||
| @elseif($recordCount === 'min') | ||
| <small class="text-muted d-block"> | ||
| <span class="font-semibold"> {{ $paginator->firstItem() }}</span> | ||
| - | ||
| <span class="font-semibold"> {{ $paginator->lastItem() }}</span> | ||
| </small> | ||
| @endif | ||
| @if ($paginator->hasPages()) | ||
| <nav> | ||
| <ul class="pagination mb-0 ms-1"> | ||
| {{-- Previous Page Link --}} | ||
| @if ($paginator->onFirstPage()) | ||
| <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')"> | ||
| <span class="page-link" aria-hidden="true">‹</span> | ||
| </li> | ||
| @else | ||
| <li class="page-item"> | ||
| <button type="button" dusk="previousPage" class="page-link" wire:click="previousPage" wire:loading.attr="disabled" rel="prev" aria-label="@lang('pagination.previous')">‹</button> | ||
| </li> | ||
| @endif | ||
|
|
||
| {{-- Array Of Links --}} | ||
| @if (is_array($element)) | ||
| @foreach ($element as $page => $url) | ||
| @if ($page == $paginator->currentPage()) | ||
| <li class="page-item active" wire:key="paginator-page-{{ $page }}" aria-current="page"><span class="page-link">{{ $page }}</span></li> | ||
| @else | ||
| <li class="page-item" wire:key="paginator-page-{{ $page }}"><button type="button" class="page-link" wire:click="gotoPage({{ $page }})">{{ $page }}</button></li> | ||
| @endif | ||
| @endforeach | ||
| @endif | ||
| @endforeach | ||
| {{-- Pagination Elements --}} | ||
| @foreach ($elements as $element) | ||
| {{-- "Three Dots" Separator --}} | ||
| @if (is_string($element)) | ||
| <li class="page-item disabled" aria-disabled="true"><span class="page-link">{{ $element }}</span></li> | ||
| @endif | ||
|
|
||
| {{-- Next Page Link --}} | ||
| @if ($paginator->hasMorePages()) | ||
| <li class="page-item"> | ||
| <button type="button" dusk="nextPage" class="page-link" wire:click="nextPage" wire:loading.attr="disabled" rel="next" aria-label="@lang('pagination.next')">›</button> | ||
| </li> | ||
| @else | ||
| <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.next')"> | ||
| <span class="page-link" aria-hidden="true">›</span> | ||
| </li> | ||
| {{-- Array Of Links --}} | ||
| @if (is_array($element)) | ||
| @foreach ($element as $page => $url) | ||
| @if ($page == $paginator->currentPage()) | ||
| <li class="page-item active" wire:key="paginator-page-{{ $page }}" aria-current="page"><span class="page-link">{{ $page }}</span></li> | ||
| @else | ||
| <li class="page-item" wire:key="paginator-page-{{ $page }}"><button type="button" class="page-link" wire:click="gotoPage({{ $page }})">{{ $page }}</button></li> | ||
| @endif | ||
| @endforeach | ||
| @endif | ||
| </ul> | ||
| </nav> | ||
| @endif | ||
| @endforeach | ||
|
|
||
| {{-- Next Page Link --}} | ||
| @if ($paginator->hasMorePages()) | ||
| <li class="page-item"> | ||
| <button type="button" dusk="nextPage" class="page-link" wire:click="nextPage" wire:loading.attr="disabled" rel="next" aria-label="@lang('pagination.next')">›</button> | ||
| </li> | ||
| @else | ||
| <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.next')"> | ||
| <span class="page-link" aria-hidden="true">›</span> | ||
| </li> | ||
| @endif | ||
| </ul> | ||
| </nav> | ||
| @endif | ||
| </div> |
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
Oops, something went wrong.