From 5ddf016bf4c0bf8cd9721c9405cc5c0b62b0dad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Thu, 6 May 2010 15:02:59 +0200
Subject: [PATCH]  ItEr57S10CUEscaladoPantallaCargaRecursosEmpresaItEr56S11:
 Changed the texts and the size of the elements in the toolbar of the
 resources load panel.

---
 .../main/resources/web/ganttz/zul/resourcesLoadLayout.zul | 6 +++---
 .../web/resourceload/ResourceLoadController.java          | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index c2ab88df5..fd64688c2 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -41,13 +41,13 @@ resourcesLoadPanel = self;
         <hbox id="additionalFilterInsertionPoint1" />
         <separator/>
         Filter:
-        <listbox id="listFilters" mold="select" rows="1" width="150px"
+        <listbox id="listFilters" mold="select" rows="1" width="100px"
             model="${resourcesLoadPanel.filters}"
             onSelect="resourcesLoadPanel.setFilter(self.selectedItem.value);">
         </listbox>
         <separator/>
-        ${i18n:_('Show elements between')}:
-        <combobox id="filterByNameCombo"
+        ${i18n:_('Name filter')}:
+        <combobox id="filterByNameCombo" width="50px"
             onChange="resourcesLoadPanel.onSelectFilterByName(self.selectedItemApi.value)" />
         <separator/>
         <hbox id="additionalFilterInsertionPoint2" />
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
index 4125676e3..09f9d2a03 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
@@ -229,7 +229,7 @@ public class ResourceLoadController implements Composer {
     private void addWorkersBandbox() {
         bandBox = new BandboxMultipleSearch();
         bandBox.setId("workerBandboxMultipleSearch");
-        bandBox.setWidthBandbox("285px");
+        bandBox.setWidthBandbox("185px");
         bandBox.setWidthListbox("300px");
         bandBox.setFinder("workerMultipleFiltersFinder");
         bandBox.afterCompose();
@@ -258,10 +258,11 @@ public class ResourceLoadController implements Composer {
     }
 
     private void addTimeFilter() {
-        Label label1 = new Label(_("Show load between"));
-        Label label2 = new Label(_("and"));
+        Label label1 = new Label(_("Time filter") + ":");
+        Label label2 = new Label("-");
         final Datebox initDate = new Datebox();
         initDate.setValue(resourceLoadModel.getInitDateFilter());
+        initDate.setWidth("75px");
         initDate.addEventListener(Events.ON_CHANGE, new EventListener() {
             @Override
             public void onEvent(Event event) throws Exception {
@@ -271,6 +272,7 @@ public class ResourceLoadController implements Composer {
         });
         final Datebox endDate = new Datebox();
         endDate.setValue(resourceLoadModel.getEndDateFilter());
+        endDate.setWidth("75px");
         endDate.addEventListener(Events.ON_CHANGE, new EventListener() {
             @Override
             public void onEvent(Event event) throws Exception {