diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedListWidget.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedListWidget.html
new file mode 100644
index 0000000000000000000000000000000000000000..598ecaa782e87fbb9b1640bf5e8c647fc7b7e012
--- /dev/null
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedListWidget.html
@@ -0,0 +1,3 @@
+<f:be.widget.paginate objects="{backendUsers}" as="paginatedBackendUsers" configuration="{itemsPerPage: 50, insertBelow: 1}">
+ <f:render partial="BackendUser/PaginatedListWidgetBody" arguments="{_all}" />
+</f:be.widget.paginate>
\ No newline at end of file
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedListWidgetBody.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedListWidgetBody.html
new file mode 100644
index 0000000000000000000000000000000000000000..e16b5d97b30a9b390eb6c28d6cdc478cebd28fd4
--- /dev/null
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedListWidgetBody.html
@@ -0,0 +1,27 @@
+<div class="table-fit">
+ <table id="typo3-backend-user-list" class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th></th>
+ <th class="col-title"><f:translate key="userName" /> / <f:translate key="realName" /></th>
+ <th><f:translate key="lastLogin" /></th>
+ <th class="col-control"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{paginatedBackendUsers}" as="backendUser">
+ <f:render partial="BackendUser/IndexListRow" arguments="{demand: demand, backendUser: backendUser, onlineBackendUsers: onlineBackendUsers, dateFormat: dateFormat, timeFormat: timeFormat, returnUrl: returnUrl, compareUserUidList: compareUserUidList}" />
+ </f:for>
+ <f:comment>
+ Footer row: no officially defined style yet
+ </f:comment>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td colspan="5">
+ <f:count subject="{backendUsers}" /> <f:translate key="users" />
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+</div>
\ No newline at end of file
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidget.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidget.html
new file mode 100644
index 0000000000000000000000000000000000000000..bf487043c40ac3bdb417bd645b0e504c06f37b69
--- /dev/null
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidget.html
@@ -0,0 +1,3 @@
+<f:be.widget.paginate objects="{backendUserGroups}" as="paginatedBackendUserGroups" configuration="{itemsPerPage: 50, insertBelow: 1}">
+ <f:render partial="BackendUserGroup/PaginatedListWidgetBody" arguments="{_all}" />
+</f:be.widget.paginate>
\ No newline at end of file
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidgetBody.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidgetBody.html
new file mode 100644
index 0000000000000000000000000000000000000000..2982a438ee64887969304a9b9c97ed08310716e1
--- /dev/null
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedListWidgetBody.html
@@ -0,0 +1,25 @@
+<div class="table-fit">
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th class="col-icon"></th>
+ <th class="col-title"><f:translate key="backendUserGroup" /></th>
+ <th><f:translate key="subGroups" /></th>
+ <th class="col-control"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{paginatedBackendUserGroups}" as="backendUserGroup">
+ <f:render partial="BackendUserGroup/IndexListRow" arguments="{demand: demand, backendUserGroup: backendUserGroup, dateFormat: dateFormat, timeFormat: timeFormat, returnUrl: returnUrl}" />
+ </f:for>
+ <f:comment>
+ Footer row: no officially defined style yet
+ </f:comment>
+ <tr>
+ <td colspan="4">
+ <f:count subject="{backendUserGroups}" /> <f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups" />s
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
index 5b8b334b7171ad969a3c833f3cd42603d5c211ac..279f2e881ac2b248c5d43daa3e4c8f49f7826146 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
@@ -48,37 +48,6 @@
</f:comment>
<f:render partial="Filters/BackendUser/Index" arguments="{demand: demand, backendUserGroups: backendUserGroups}" />
- <f:comment>
- Listing of all users
- </f:comment>
- <f:be.widget.paginate objects="{backendUsers}" as="paginatedBackendUsers" configuration="{itemsPerPage: 50, insertBelow: 1}">
- <div class="table-fit">
- <table id="typo3-backend-user-list" class="table table-striped table-hover">
- <thead>
- <tr>
- <th></th>
- <th class="col-title"><f:translate key="userName" /> / <f:translate key="realName" /></th>
- <th><f:translate key="lastLogin" /></th>
- <th class="col-control"></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{paginatedBackendUsers}" as="backendUser">
- <f:render partial="BackendUser/IndexListRow" arguments="{demand: demand, backendUser: backendUser, onlineBackendUsers: onlineBackendUsers, dateFormat: dateFormat, timeFormat: timeFormat, returnUrl: returnUrl, compareUserUidList: compareUserUidList}" />
- </f:for>
- <f:comment>
- Footer row: no officially defined style yet
- </f:comment>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="5">
- <f:count subject="{backendUsers}" /> <f:translate key="users" />
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
- </f:be.widget.paginate>
+ <f:render partial="BackendUser/PaginatedListWidget" arguments="{_all}" />
</f:section>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
index 98146d57deca40509e8b6b20608f6d653506fc85..3213b0499792f9c81f981f455e2b3f54621590bb 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUserGroup/Index.html
@@ -9,35 +9,6 @@
<f:section name="content">
- <f:comment>
- Listing of all user groups
- </f:comment>
- <f:be.widget.paginate objects="{backendUserGroups}" as="paginatedBackendUserGroups" configuration="{itemsPerPage: 50, insertBelow: 1}">
- <div class="table-fit">
- <table class="table table-striped table-hover">
- <thead>
- <tr>
- <th class="col-icon"></th>
- <th class="col-title"><f:translate key="backendUserGroup" /></th>
- <th><f:translate key="subGroups" /></th>
- <th class="col-control"></th>
- </tr>
- </thead>
- <tbody>
- <f:for each="{paginatedBackendUserGroups}" as="backendUserGroup">
- <f:render partial="BackendUserGroup/IndexListRow" arguments="{demand: demand, backendUserGroup: backendUserGroup, dateFormat: dateFormat, timeFormat: timeFormat, returnUrl: returnUrl}" />
- </f:for>
- <f:comment>
- Footer row: no officially defined style yet
- </f:comment>
- <tr>
- <td colspan="4">
- <f:count subject="{backendUserGroups}" /> <f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:be_groups" />s
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </f:be.widget.paginate>
+ <f:render partial="BackendUserGroup/PaginatedListWidget" arguments="{_all}" />
</f:section>