table paging improved based on screens

Evolveum · Apr 11, 2016 · af62171 · af62171
1 parent e9b8533
commit af62171
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedPagingPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedPagingPanel.html
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <ul class="pagination">
+    <ul class="pagination pagination-sm no-margin pull-right" style="margin-bottom: 0px;">
         <li wicket:id="first">
             <a wicket:id="firstLink"><wicket:message key="NavigatorPanel.firstLink"/></a>
         </li>

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
@@ -29,11 +29,12 @@
 <wicket:fragment wicket:id="pagingFooter">
     <div class="row">
         <div class="col-md-6">
-            <div class="dataTables_info" wicket:id="count"/>
+            <!--buttons here [lazyman]-->
         </div>
         <div wicket:id="footerContainer" class="col-md-6">
             <div wicket:id="menu"/>
             <div wicket:id="paging" class="dataTables_paginate paging_bootstrap" />
+            <div class="dataTables_info pull-right" wicket:id="count" style="margin-right: 10px;"/>
         </div>
     </div>
 </wicket:fragment>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
@@ -202,7 +202,7 @@ public String getObject() {
 				}
 			});
 			count.setOutputMarkupId(true);
-			add(count);
+			footerContainer.add(count);
 
 			BoxedPagingPanel nb2 = new BoxedPagingPanel(ID_PAGING, dataTable, true) {
 

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
@@ -17,7 +17,7 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div wicket:id="cogButton" class="btn-group pull-right" style="margin-left: 10px; margin-top:2px;">
+    <div wicket:id="cogButton" class="btn-group btn-group-sm pull-right" style="margin-left: 10px;">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="false">
             <i class="fa fa-cog"></i>

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -273,7 +273,7 @@ ContainerValuePanel.label.attribute=Attribute
 ContainerValuePanel.label.value=Value(s)
 contentPanel.accounts=Content
 contentPanel.entitlements=Entitlements
-CountToolbar.label=Displaying {0,number,integer} to {1,number,integer} of {2,number,integer} matching result.
+CountToolbar.label={0,number,integer} to {1,number,integer} of {2,number,integer}
 CountToolbar.noFound=No matching result found.
 DateValidator.message.fromAfterTo=Valid from date must be before valid to date.
 DebugButtonPanel.button.delete=Delete

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
@@ -274,7 +274,7 @@ ContainerValuePanel.label.attribute=Attribute
 ContainerValuePanel.label.value=Value(s)
 contentPanel.accounts=Content
 contentPanel.entitlements=Entitlements
-CountToolbar.label=Displaying {0,number,integer} to {1,number,integer} of {2,number,integer} matching result.
+CountToolbar.label={0,number,integer} to {1,number,integer} of {2,number,integer}
 CountToolbar.noFound=No matching result found.
 DateValidator.message.fromAfterTo=Valid from date must be before valid to date.
 DebugButtonPanel.button.delete=Delete