diff --git a/typo3/sysext/beuser/Resources/Private/Partials/SimplePagination.html b/typo3/sysext/beuser/Resources/Private/Partials/SimplePagination.html
index 33d569d46aee8ebf2fc0c358c7f32ae907dbc815..2be6843fd903b9e2533921f03f568f5fc0350fb9 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/SimplePagination.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/SimplePagination.html
@@ -1,89 +1,91 @@
-<nav class="pagination-wrap">
- <ul class="pagination">
- <f:if condition="{pagination.previousPageNumber} && {pagination.previousPageNumber} >= {pagination.firstPageNumber}">
- <f:then>
- <li class="page-item">
- <a href="{f:uri.action(arguments:{currentPage: 1})}" title="{f:translate(key:'pagination.first')}" class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </a>
- </li>
- <li class="page-item">
- <a href="{f:uri.action(arguments:{currentPage: pagination.previousPageNumber})}" title="{f:translate(key:'pagination.previous')}" class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <span class="page-link">
- <f:translate key="pagination.records" /> {pagination.startRecordNumber} - {pagination.endRecordNumber}
- </span>
- </li>
- <li class="page-item">
- <span class="page-link">
- <f:translate key="pagination.page" />
- <form style="display:inline;"
- data-global-event="submit"
- data-action-navigate="$form=~s/$value/"
- data-navigate-value="{f:uri.action(arguments:'{currentPage: \'$[value]\'}')}"
- data-value-selector="input[name='paginator-target-page']">
- <input
- min="{pagination.firstPageNumber}"
- max="{pagination.lastPageNumber}"
- data-number-of-pages="{paginator.numberOfPages}"
- name="paginator-target-page"
- class="form-control form-control-sm paginator-input"
- size="5"
- value="{paginator.currentPageNumber}"
- type="number"
- />
- </form>
- / {pagination.lastPageNumber}
- </span>
- </li>
+<f:if condition="{paginator.numberOfPages} > 1">
+ <nav class="pagination-wrap">
+ <ul class="pagination">
+ <f:if condition="{pagination.previousPageNumber} && {pagination.previousPageNumber} >= {pagination.firstPageNumber}">
+ <f:then>
+ <li class="page-item">
+ <a href="{f:uri.action(arguments:{currentPage: 1})}" title="{f:translate(key:'pagination.first')}" class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </a>
+ </li>
+ <li class="page-item">
+ <a href="{f:uri.action(arguments:{currentPage: pagination.previousPageNumber})}" title="{f:translate(key:'pagination.previous')}" class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <span class="page-link">
+ <f:translate key="pagination.records" /> {pagination.startRecordNumber} - {pagination.endRecordNumber}
+ </span>
+ </li>
+ <li class="page-item">
+ <span class="page-link">
+ <f:translate key="pagination.page" />
+ <form style="display:inline;"
+ data-global-event="submit"
+ data-action-navigate="$form=~s/$value/"
+ data-navigate-value="{f:uri.action(arguments:'{currentPage: \'$[value]\'}')}"
+ data-value-selector="input[name='paginator-target-page']">
+ <input
+ min="{pagination.firstPageNumber}"
+ max="{pagination.lastPageNumber}"
+ data-number-of-pages="{paginator.numberOfPages}"
+ name="paginator-target-page"
+ class="form-control form-control-sm paginator-input"
+ size="5"
+ value="{paginator.currentPageNumber}"
+ type="number"
+ />
+ </form>
+ / {pagination.lastPageNumber}
+ </span>
+ </li>
- <f:if condition="{pagination.nextPageNumber} && {pagination.nextPageNumber} <= {pagination.lastPageNumber}">
- <f:then>
- <li class="page-item">
- <a href="{f:uri.action(arguments:{currentPage: pagination.nextPageNumber})}" title="{f:translate(key:'pagination.next')}" class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </a>
- </li>
- <li class="page-item">
- <a href="{f:uri.action(arguments:{currentPage: pagination.lastPageNumber})}" title="{f:translate(key:'pagination.last')}" class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <a href="{f:uri.action(arguments:{currentPage: paginator.currentPageNumber})}" title="{f:translate(key:'pagination.refresh')}" class="page-link">
- <core:icon identifier="actions-refresh" />
- </a>
- </li>
- </ul>
-</nav>
+ <f:if condition="{pagination.nextPageNumber} && {pagination.nextPageNumber} <= {pagination.lastPageNumber}">
+ <f:then>
+ <li class="page-item">
+ <a href="{f:uri.action(arguments:{currentPage: pagination.nextPageNumber})}" title="{f:translate(key:'pagination.next')}" class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </a>
+ </li>
+ <li class="page-item">
+ <a href="{f:uri.action(arguments:{currentPage: pagination.lastPageNumber})}" title="{f:translate(key:'pagination.last')}" class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <a href="{f:uri.action(arguments:{currentPage: paginator.currentPageNumber})}" title="{f:translate(key:'pagination.refresh')}" class="page-link">
+ <core:icon identifier="actions-refresh" />
+ </a>
+ </li>
+ </ul>
+ </nav>
+</f:if>
diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/GetExtensionsCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/GetExtensionsCest.php
index decb233ba289f7281427f9e64ec2e5cf1cd5ad5c..231f0a6bd6a0b7fb37a82454a6a94a4f5a61e43a 100644
--- a/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/GetExtensionsCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/GetExtensionsCest.php
@@ -55,10 +55,10 @@ class GetExtensionsCest
/**
* @param ApplicationTester $I
*/
- public function checkPageBrowserDisplaysTwoRecords(ApplicationTester $I): void
+ public function checkPaginationIsNotDisplayedForTwoRecords(ApplicationTester $I)
{
- $I->seeElement('.pagination-wrap');
- $I->see('Extensions 1 - 2');
+ $I->dontSeeElement('.pagination-wrap');
+ $I->dontSee('Extensions 1 - 2');
}
/**
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerPagination.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerPagination.html
new file mode 100644
index 0000000000000000000000000000000000000000..b53ed1cf10381cca36bfdc7d577d68e7fc385f70
--- /dev/null
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerPagination.html
@@ -0,0 +1,90 @@
+<f:if condition="{paginator.numberOfPages} > 1">
+ <nav class="pagination-wrap">
+ <ul class="pagination">
+ <f:if condition="{pagination.previousPageNumber} && {pagination.previousPageNumber} >= {pagination.firstPageNumber}">
+ <f:then>
+ <li class="page-item">
+ <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: 1})}" title="{f:translate(key:'pagination.first')}" class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </a>
+ </li>
+ <li class="page-item">
+ <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: pagination.previousPageNumber})}" title="{f:translate(key:'pagination.previous')}" class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <span class="page-link">
+ <f:translate key="pagination.records" /> {pagination.startRecordNumber} - {pagination.endRecordNumber}
+ </span>
+ </li>
+ <li class="page-item">
+ <span class="page-link">
+ <f:translate key="pagination.page" />
+ <form style="display:inline;"
+ data-global-event="submit"
+ data-action-navigate="$form=~s/$value/"
+ data-navigate-value="{f:uri.action(action:actionName, arguments:'{search:search, currentPage: \'$[value]\'}')}"
+ data-value-selector="input[name='paginator-target-page']">
+ <input
+ min="{pagination.firstPageNumber}"
+ max="{pagination.lastPageNumber}"
+ data-number-of-pages="{paginator.numberOfPages}"
+ name="paginator-target-page"
+ class="form-control form-control-sm paginator-input"
+ value="{paginator.currentPageNumber}"
+ type="number"
+ />
+ </form>
+ / {pagination.lastPageNumber}
+ </span>
+ </li>
+
+ <f:if condition="{pagination.nextPageNumber} && {pagination.nextPageNumber} <= {pagination.lastPageNumber}">
+ <f:then>
+ <li class="page-item">
+ <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: pagination.nextPageNumber})}" title="{f:translate(key:'pagination.next')}" class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </a>
+ </li>
+ <li class="page-item">
+ <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: pagination.lastPageNumber})}" title="{f:translate(key:'pagination.last')}" class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: paginator.currentPageNumber})}" title="{f:translate(key:'pagination.refresh')}" class="page-link">
+ <core:icon identifier="actions-refresh" />
+ </a>
+ </li>
+ </ul>
+ </nav>
+</f:if>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
index f4f723f33a0f064eed235611e97fb0e1bd39bda4..6eb721f32fc6e87fbd7c3d9418ebdbdcda7b46cd 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
@@ -22,94 +22,7 @@
<div id="terTableWrapper">
<f:render partial="List/TerTable" arguments="{tableId: tableId, extensions:paginator.paginatedItems, availableAndInstalled:availableAndInstalled}" />
- <nav class="pagination-wrap">
- <ul class="pagination">
- <f:if condition="{pagination.previousPageNumber} && {pagination.previousPageNumber} >= {pagination.firstPageNumber}">
- <f:then>
- <li class="page-item">
- <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: 1})}" title="{f:translate(key:'pagination.first')}" class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </a>
- </li>
- <li class="page-item">
- <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: pagination.previousPageNumber})}" title="{f:translate(key:'pagination.previous')}" class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <span class="page-link">
- <f:translate key="pagination.records" /> {pagination.startRecordNumber} - {pagination.endRecordNumber}
- </span>
- </li>
- <li class="page-item">
- <span class="page-link">
- <f:translate key="pagination.page" />
- <form style="display:inline;"
- data-global-event="submit"
- data-action-navigate="$form=~s/$value/"
- data-navigate-value="{f:uri.action(action:actionName, arguments:'{search:search, currentPage: \'$[value]\'}')}"
- data-value-selector="input[name='paginator-target-page']">
- <input
- min="{pagination.firstPageNumber}"
- max="{pagination.lastPageNumber}"
- data-number-of-pages="{paginator.numberOfPages}"
- name="paginator-target-page"
- class="form-control form-control-sm paginator-input"
- value="{paginator.currentPageNumber}"
- type="number"
- />
- </form>
- / {pagination.lastPageNumber}
- </span>
- </li>
-
- <f:if condition="{pagination.nextPageNumber} && {pagination.nextPageNumber} <= {pagination.lastPageNumber}">
- <f:then>
- <li class="page-item">
- <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: pagination.nextPageNumber})}" title="{f:translate(key:'pagination.next')}" class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </a>
- </li>
- <li class="page-item">
- <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: pagination.lastPageNumber})}" title="{f:translate(key:'pagination.last')}" class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <a href="{f:uri.action(action:actionName, arguments:{search:search, currentPage: paginator.currentPageNumber})}" title="{f:translate(key:'pagination.refresh')}" class="page-link">
- <core:icon identifier="actions-refresh" />
- </a>
- </li>
- </ul>
- </nav>
+ <f:render partial="List/TerPagination" arguments="{_all}" />
<div class="splash-receivedata"><core:icon identifier="spinner-circle-dark" /> <f:translate key="extensionList.updateFromTer.label"/></div>
</div>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormManager/Pagination.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormManager/Pagination.html
index 3a1d5dd27d0be9b3b94e38bc512711b0531a068c..1fc6f89053e3688b0c8a27d1a1b4eabf06c53401 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormManager/Pagination.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormManager/Pagination.html
@@ -1,87 +1,89 @@
-<nav class="pagination-wrap">
- <ul class="pagination">
- <f:if condition="{pagination.previousPageNumber} && {pagination.previousPageNumber} >= {pagination.firstPageNumber}">
- <f:then>
- <li class="page-item">
- <f:link.action arguments="{page: 1}" title="{f:translate(key:'pagination.first')}" class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </f:link.action>
- </li>
- <li class="page-item">
- <f:link.action arguments="{page: pagination.previousPageNumber}" title="{f:translate(key:'pagination.previous')}" class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </f:link.action>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <span class="page-link">
- <f:translate key="pagination.forms" /> {pagination.startRecordNumber} - {pagination.endRecordNumber}
- </span>
- </li>
- <li class="page-item">
- <span class="page-link">
- <f:translate key="pagination.page" />
- <form style="display:inline;"
- data-global-event="submit"
- data-action-navigate="$form=~s/$value/"
- data-navigate-value="{f:uri.action(arguments:'{page: \'$[value]\'}')}"
- data-value-selector="input[name='paginator-target-page']">
- <input
- min="{pagination.firstPageNumber}"
- max="{pagination.lastPageNumber}"
- data-number-of-pages="{paginator.numberOfPages}"
- name="paginator-target-page"
- class="form-control form-control-sm paginator-input"
- size="5"
- value="{paginator.currentPageNumber}"
- type="number"/>
- </form>
- / {pagination.lastPageNumber}
- </span>
- </li>
- <f:if condition="{pagination.nextPageNumber} && {pagination.nextPageNumber} <= {pagination.lastPageNumber}">
- <f:then>
- <li class="page-item">
- <f:link.action arguments="{page: pagination.nextPageNumber}" title="{f:translate(key:'pagination.next')}" class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </f:link.action>
- </li>
- <li class="page-item">
- <f:link.action arguments="{page: pagination.lastPageNumber}" title="{f:translate(key:'pagination.last')}" class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </f:link.action>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <f:link.action arguments="{page: paginator.currentPageNumber}" title="{f:translate(key:'pagination.refresh')}" class="page-link">
- <core:icon identifier="actions-refresh" />
- </f:link.action>
- </li>
- </ul>
-</nav>
+<f:if condition="{paginator.numberOfPages} > 1">
+ <nav class="pagination-wrap">
+ <ul class="pagination">
+ <f:if condition="{pagination.previousPageNumber} && {pagination.previousPageNumber} >= {pagination.firstPageNumber}">
+ <f:then>
+ <li class="page-item">
+ <f:link.action arguments="{page: 1}" title="{f:translate(key:'pagination.first')}" class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </f:link.action>
+ </li>
+ <li class="page-item">
+ <f:link.action arguments="{page: pagination.previousPageNumber}" title="{f:translate(key:'pagination.previous')}" class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </f:link.action>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <span class="page-link">
+ <f:translate key="pagination.forms" /> {pagination.startRecordNumber} - {pagination.endRecordNumber}
+ </span>
+ </li>
+ <li class="page-item">
+ <span class="page-link">
+ <f:translate key="pagination.page" />
+ <form style="display:inline;"
+ data-global-event="submit"
+ data-action-navigate="$form=~s/$value/"
+ data-navigate-value="{f:uri.action(arguments:'{page: \'$[value]\'}')}"
+ data-value-selector="input[name='paginator-target-page']">
+ <input
+ min="{pagination.firstPageNumber}"
+ max="{pagination.lastPageNumber}"
+ data-number-of-pages="{paginator.numberOfPages}"
+ name="paginator-target-page"
+ class="form-control form-control-sm paginator-input"
+ size="5"
+ value="{paginator.currentPageNumber}"
+ type="number"/>
+ </form>
+ / {pagination.lastPageNumber}
+ </span>
+ </li>
+ <f:if condition="{pagination.nextPageNumber} && {pagination.nextPageNumber} <= {pagination.lastPageNumber}">
+ <f:then>
+ <li class="page-item">
+ <f:link.action arguments="{page: pagination.nextPageNumber}" title="{f:translate(key:'pagination.next')}" class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </f:link.action>
+ </li>
+ <li class="page-item">
+ <f:link.action arguments="{page: pagination.lastPageNumber}" title="{f:translate(key:'pagination.last')}" class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </f:link.action>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <f:link.action arguments="{page: paginator.currentPageNumber}" title="{f:translate(key:'pagination.refresh')}" class="page-link">
+ <core:icon identifier="actions-refresh" />
+ </f:link.action>
+ </li>
+ </ul>
+ </nav>
+</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html b/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html
index 9270995e85aedb0f3a8fdc070a82bc96a5723fa7..e6e766e834e33c9d2a7fce38061badc212fd44e1 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Templates/FormManager/Index.html
@@ -5,9 +5,7 @@
<h1><f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.headline" /></h1>
<f:if condition="{paginator.paginatedItems}">
<f:then>
- <f:if condition="{paginator.numberOfPages} > 1">
- <f:render partial="FormManager/Pagination" arguments="{_all}" />
- </f:if>
+ <f:render partial="FormManager/Pagination" arguments="{_all}" />
<div class="table-fit">
<table id="forms" class="table table-striped table-hover">
<thead>
@@ -121,9 +119,7 @@
</tbody>
</table>
</div>
- <f:if condition="{paginator.numberOfPages} > 1">
- <f:render partial="FormManager/Pagination" arguments="{_all}" />
- </f:if>
+ <f:render partial="FormManager/Pagination" arguments="{_all}" />
</f:then>
<f:else>
<f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:form/Resources/Private/Language/Database.xlf:formManager.forms_not_found.title')}">
diff --git a/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html b/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html
index 2bf7b46415337e3eb4d92f0aef9db1c6791294d6..a56df941592509e3a2e3e8e4c03e68375eb37015 100644
--- a/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html
+++ b/typo3/sysext/redirects/Resources/Private/Partials/Pagination.html
@@ -1,90 +1,87 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
- data-namespace-typo3-fluid="true">
-
-<nav class="pagination-wrap">
- <ul class="pagination">
- <f:if condition="{pagination.hasLessPages}">
- <f:then>
- <li class="page-item">
- <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: 1}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.first')}" class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </a>
- </li>
- <li class="page-item">
- <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: pagination.previousPage}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.previous')}" class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-first" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-previous" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <span class="page-link">
- Redirects
- {pagination.startRecord} - {pagination.endRecord}
- </span>
- </li>
- <li class="page-item">
- <span class="page-link">
- <f:translate extensionName="fluid" key="widget.pagination.page" />
- <f:variable name="gotToPageUrl">
- <f:be.uri route="site_redirects" parameters="{action: 'overview', demand: demand.parameters, page: 987654322}" />
- </f:variable>
- <form data-on-submit="processNavigate" style="display:inline;">
- <f:form.textfield
- additionalAttributes="{min: 1, max: pagination.numberOfPages}"
- data="{number-of-pages: pagination.numberOfPages, url: gotToPageUrl}"
- name="paginator-target-page"
- class="form-control form-control-sm paginator-input"
- value="{pagination.current}"
- type="number" />
- </form>
- / {pagination.numberOfPages}
- </span>
- </li>
- <f:if condition="{pagination.hasMorePages}">
- <f:then>
- <li class="page-item">
- <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: pagination.nextPage}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.next')}" class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </a>
- </li>
- <li class="page-item">
- <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: pagination.numberOfPages}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.last')}" class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </a>
- </li>
- </f:then>
- <f:else>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-next" />
- </span>
- </li>
- <li class="page-item disabled">
- <span class="page-link">
- <core:icon identifier="actions-view-paging-last" />
- </span>
- </li>
- </f:else>
- </f:if>
- <li class="page-item">
- <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: demand.page}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.refresh')}" class="page-link">
- <core:icon identifier="actions-refresh" />
- </a>
- </li>
- </ul>
-</nav>
-
-</html>
+<f:if condition="{pagination.numberOfPages} > 1">
+ <nav class="pagination-wrap">
+ <ul class="pagination">
+ <f:if condition="{pagination.hasLessPages}">
+ <f:then>
+ <li class="page-item">
+ <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: 1}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.first')}" class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </a>
+ </li>
+ <li class="page-item">
+ <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: pagination.previousPage}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.previous')}" class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-first" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-previous" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <span class="page-link">
+ Redirects
+ {pagination.startRecord} - {pagination.endRecord}
+ </span>
+ </li>
+ <li class="page-item">
+ <span class="page-link">
+ <f:translate extensionName="fluid" key="widget.pagination.page" />
+ <f:variable name="gotToPageUrl">
+ <f:be.uri route="site_redirects" parameters="{action: 'overview', demand: demand.parameters, page: 987654322}" />
+ </f:variable>
+ <form data-on-submit="processNavigate" style="display:inline;">
+ <f:form.textfield
+ additionalAttributes="{min: 1, max: pagination.numberOfPages}"
+ data="{number-of-pages: pagination.numberOfPages, url: gotToPageUrl}"
+ name="paginator-target-page"
+ class="form-control form-control-sm paginator-input"
+ value="{pagination.current}"
+ type="number" />
+ </form>
+ / {pagination.numberOfPages}
+ </span>
+ </li>
+ <f:if condition="{pagination.hasMorePages}">
+ <f:then>
+ <li class="page-item">
+ <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: pagination.nextPage}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.next')}" class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </a>
+ </li>
+ <li class="page-item">
+ <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: pagination.numberOfPages}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.last')}" class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </a>
+ </li>
+ </f:then>
+ <f:else>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-next" />
+ </span>
+ </li>
+ <li class="page-item disabled">
+ <span class="page-link">
+ <core:icon identifier="actions-view-paging-last" />
+ </span>
+ </li>
+ </f:else>
+ </f:if>
+ <li class="page-item">
+ <a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, page: demand.page}')}" title="{f:translate(extensionName: 'fluid', key:'widget.pagination.refresh')}" class="page-link">
+ <core:icon identifier="actions-refresh" />
+ </a>
+ </li>
+ </ul>
+ </nav>
+</f:if>