[LMS-1476] reordered paging toolbar buttons & used dictionary

SVN: 15502

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java

@@ -823,6 +823,8 @@ public abstract class Dict
 
     public static final String BUTTON_CONFIGURE = "button_configure";
 
+    public static final String BUTTON_FILTERS = "button_filters";
+
     public static final String SHOW_DETAILS_LINK = "show_details_link_column_name";
 
     public static final String SHOW_DETAILS_LINK_TEXT_VALUE = "show_details_link_text_value";

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java

@@ -80,11 +80,14 @@ public final class BrowserGridPagingToolBar extends PagingToolBar
 
         insertTableButton(createTableOperationsLabel());
 
+        this.showFiltersButton = createShowFiltersButton(viewContext, invoker);
+        insertTableButton(showFiltersButton);
+
         this.configButton = createConfigButton(viewContext, invoker, gridId);
         insertTableButton(configButton);
         updateDefaultConfigButton(false);
 
-        this.refreshButton = createRefreshButton(invoker);
+        this.refreshButton = createRefreshButton(viewContext, invoker);
         insertTableButton(refreshButton);
         updateDefaultRefreshButton(false);
         this.refreshButton.setId(REFRESH_BUTTON_ID);
@@ -93,9 +96,6 @@ public final class BrowserGridPagingToolBar extends PagingToolBar
         disableExportButton();
         insertTableButton(exportButton);
 
-        this.showFiltersButton = createShowFiltersButton(viewContext, invoker);
-        insertTableButton(showFiltersButton);
-
         insertTableButton(new FillToolItem());
         viewContext.logStop(logID);
     }
@@ -198,25 +198,23 @@ public final class BrowserGridPagingToolBar extends PagingToolBar
         }
     }
 
-    private Button createRefreshButton(final IBrowserGridActionInvoker invoker)
-    {
-        return createRefreshButton(messageProvider.getMessage(Dict.BUTTON_REFRESH), invoker);
-    }
-
     /** creates a new refresh button, the caller has to add it to a parent container */
-    public static Button createRefreshButton(String title, final IBrowserGridActionInvoker invoker)
+    public static Button createRefreshButton(IMessageProvider messageProvider,
+            final IBrowserGridActionInvoker invoker)
     {
-        final Button button = new Button(title, new SelectionListener<ButtonEvent>()
-            {
-                @Override
-                public void componentSelected(ButtonEvent ce)
-                {
-                    if (ce.getButton().isEnabled())
-                    {
-                        invoker.refresh();
-                    }
-                }
-            });
+        final Button button =
+                new Button(messageProvider.getMessage(Dict.BUTTON_REFRESH),
+                        new SelectionListener<ButtonEvent>()
+                            {
+                                @Override
+                                public void componentSelected(ButtonEvent ce)
+                                {
+                                    if (ce.getButton().isEnabled())
+                                    {
+                                        invoker.refresh();
+                                    }
+                                }
+                            });
         return button;
     }
 
@@ -262,7 +260,8 @@ public final class BrowserGridPagingToolBar extends PagingToolBar
     public static Button createShowFiltersButton(IMessageProvider messageProvider,
             final IBrowserGridActionInvoker invoker)
     {
-        final ToggleButton button = new ToggleButton("Filters");
+        final ToggleButton button =
+                new ToggleButton(messageProvider.getMessage(Dict.BUTTON_FILTERS));
         button.addSelectionListener(new SelectionListener<ButtonEvent>()
             {
                 @Override

openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js

@@ -85,6 +85,7 @@ var common = {
   button_view: "View",
   button_delete: "Delete",
   button_configure: "Settings",  
+  button_filters: "Filters",  
   button_upload_data_via_cifex: "Upload Data",
   button_process: "Process",
   button_top: "Files",