MID-6271 paging and dropdowns improvements, popover still not working…

… correctly
Evolveum · Apr 25, 2022 · 7e8fcce · 7e8fcce
1 parent 4d02eb6
commit 7e8fcce
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.html
@@ -14,9 +14,9 @@
     </tbody>
     </div>
     <div class="row boxed-table-footer">
-        <div class="boxed-table-footer-paging-center" align="center" wicket:id="footerContainer">
-            <div class="dataTables_info" wicket:id="count"/>
-            <div class="paging_bootstrap" wicket:id="paging" />
+        <div class="d-flex" align="center" wicket:id="footerContainer">
+            <div class="mr-2" wicket:id="count"/>
+            <div class="mr-2" wicket:id="paging" />
         </div>
     </div>
 </wicket:panel>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html
@@ -18,11 +18,13 @@
 </wicket:panel>
 
 <wicket:fragment wicket:id="pagingFooter">
-    <div class="boxed-table-footer">
-        <div class="boxed-table-footer-button-toolbar" wicket:id="buttonToolbar"/>
-        <div class="boxed-table-footer-paging" wicket:id="footerContainer">
-            <div class="dataTables_info" wicket:id="count"/>
-            <div class="paging_bootstrap" wicket:id="paging" />
+    <div class="d-flex justify-content-between">
+        <div class="d-flex" wicket:id="buttonToolbar"/>
+        <div class="d-flex" wicket:id="footerContainer">
+            <div class="mr-2">
+                <span class="align-middle" wicket:id="count"/>
+            </div>
+            <div class="mr-2" wicket:id="paging" />
             <div wicket:id="menu"/>
         </div>
     </div>

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.html
@@ -8,16 +8,15 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div wicket:id="cogButton" class="btn-group btn-group-sm pull-right" style="margin-left: 10px;">
+    <div wicket:id="cogButton" class="btn-group btn-group-sm">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="false">
             <i class="fa fa-cog"></i>
-            <!--<span class="caret" style="margin-left: 10px;"></span>-->
         </button>
-        <ul class="dropdown-menu">
-            <li><a wicket:id="pageSize"><wicket:message key="TableConfigurationPanel.pageSize"/></a></li>
-            <li><a wicket:id="tableColumns"><wicket:message key="TableConfigurationPanel.tableColumns"/></a></li>
-        </ul>
+        <div class="dropdown-menu">
+            <a class="dropdown-item" wicket:id="pageSize"><wicket:message key="TableConfigurationPanel.pageSize"/></a>
+            <a class="dropdown-item" wicket:id="tableColumns"><wicket:message key="TableConfigurationPanel.tableColumns"/></a>
+        </div>
     </div>
 
     <div wicket:id="popover" class="popover fade left in">

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.html b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.html
@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <ul class="pagination pagination-sm" wicket:id="pagination">
+    <ul class="pagination pagination-sm mb-0" wicket:id="pagination">
         <li class="page-item" wicket:id="first">
             <a class="page-link" wicket:id="firstLink">
                 <wicket:message key="NavigatorPanel.firstLink"/>