bz-996869: Page navigation buttons inconsistent through the GUI

AppFormer · Oct 1, 2013 · 974f80d · 974f80d
1 parent 5363824
commit 974f80d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...uberfire-widgets-commons/src/main/java/org/uberfire/client/tables/AbstractPagedTable.java b/...uberfire-widgets-commons/src/main/java/org/uberfire/client/tables/AbstractPagedTable.java
@@ -20,6 +20,7 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.view.client.AsyncDataProvider;
 import org.uberfire.paging.AbstractPageRow;
+import com.github.gwtbootstrap.client.ui.SimplePager;
 
 /**
  * Widget that shows rows of paged data.
@@ -31,7 +32,7 @@ public abstract class AbstractPagedTable<T extends AbstractPageRow>
     protected AsyncDataProvider<T> dataProvider;
 
     @UiField
-    public UberfireSimplePager pager;
+    public SimplePager pager;
 
     /**
      * Constructor

diff --git a/...erfire-widgets-commons/src/main/java/org/uberfire/client/tables/AbstractPagedTable.ui.xml b/...erfire-widgets-commons/src/main/java/org/uberfire/client/tables/AbstractPagedTable.ui.xml
@@ -18,15 +18,15 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
     xmlns:gwt="urn:import:com.google.gwt.user.client.ui"
     xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
-    xmlns:uf="urn:import:org.uberfire.client.tables">
+    xmlns:gb='urn:import:com.github.gwtbootstrap.client.ui'>
 
   <gwt:VerticalPanel>
     <gwt:HorizontalPanel>
 <!--       <gwt:Button ui:field="refreshButton" text='refresh'/> -->
       <gwt:ToggleButton ui:field="columnPickerButton"/>
     </gwt:HorizontalPanel>
     <b:CellTable ui:field="cellTable"/>
-    <uf:UberfireSimplePager ui:field="pager"/>
+    <gb:SimplePager location="LEFT" ui:field="pager"/>
   </gwt:VerticalPanel>
 
 </ui:UiBinder>
diff --git a/.../src/main/java/org/uberfire/client/workbench/widgets/tables/AbstractPathPagedTable.ui.xml b/.../src/main/java/org/uberfire/client/workbench/widgets/tables/AbstractPathPagedTable.ui.xml
@@ -17,20 +17,19 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
              xmlns:gwt="urn:import:com.google.gwt.user.client.ui"
-             xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
-             xmlns:uf="urn:import:org.uberfire.client.tables">
+             xmlns:gb='urn:import:com.github.gwtbootstrap.client.ui'>
 
   <ui:with field="i18n" type="org.uberfire.client.resources.i18n.CommonConstants"/>
 
   <gwt:VerticalPanel>
     <gwt:HorizontalPanel>
-      <b:Button ui:field="refreshButton" text='{i18n.AbstractTableRefreshList}'/>
-      <b:Button ui:field="openSelectedButton" text='{i18n.AbstractTableOpenSelected}'/>
+      <gb:Button ui:field="refreshButton" text='{i18n.AbstractTableRefreshList}'/>
+      <gb:Button ui:field="openSelectedButton" text='{i18n.AbstractTableOpenSelected}'/>
       <gwt:ToggleButton ui:field="columnPickerButton"/>
     </gwt:HorizontalPanel>
-    <b:CellTable ui:field="cellTable"/>
+    <gb:CellTable ui:field="cellTable"/>
     <!--<b:SimplePager location="CENTER" ui:field="pager"/>-->
-    <uf:UberfireSimplePager ui:field="pager"/>
+    <gb:SimplePager location="LEFT" ui:field="pager"/>
   </gwt:VerticalPanel>
 
 </ui:UiBinder>