From 2f5c8577ba796b4c08fdd5b66e302802f07aada5 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Fri, 12 Feb 2010 08:56:51 +0100
Subject: [PATCH]  ItEr47S08RFNavegacionOrganizacionTraballoItEr46S09:
 Shortened labels in order filters

---
 ganttzk/src/main/resources/i18n/es.po                         | 4 ++--
 ganttzk/src/main/resources/i18n/gl.po                         | 4 ++--
 ganttzk/src/main/resources/i18n/keys.pot                      | 4 ++--
 ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul   | 4 ++--
 .../src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul | 2 +-
 .../src/main/webapp/common/css/navalpro_zk.css                | 1 +
 .../src/main/webapp/orders/_orderElementTreeFilter.zul        | 4 ++--
 navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul   | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po
index fe7d82464..272061676 100644
--- a/ganttzk/src/main/resources/i18n/es.po
+++ b/ganttzk/src/main/resources/i18n/es.po
@@ -19,8 +19,8 @@ msgstr ""
 
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
-msgid "Zoom level"
-msgstr "Nivel de zoom"
+msgid "Zoom"
+msgstr "Zoom"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:195
 msgid "Erase"
diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po
index 7bcf9da09..f6d7c3d21 100644
--- a/ganttzk/src/main/resources/i18n/gl.po
+++ b/ganttzk/src/main/resources/i18n/gl.po
@@ -19,8 +19,8 @@ msgstr ""
 
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
-msgid "Zoom level"
-msgstr "Nivel de zoom"
+msgid "Zoom"
+msgstr "Zoom"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:195
 msgid "Erase"
diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot
index ab58bfd5b..4fb836df2 100644
--- a/ganttzk/src/main/resources/i18n/keys.pot
+++ b/ganttzk/src/main/resources/i18n/keys.pot
@@ -18,8 +18,8 @@ msgstr ""
 
 #: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
 #: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
-msgid "Zoom level"
-msgstr ""
+msgid "Zoom"
+msgstr "Zoom"
 
 #: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:195
 msgid "Erase"
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index 4900f05ec..a9fa464f0 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -11,14 +11,14 @@ planner = self;
         <!--  Commands -->
         <button onClick="planner.invalidate()"
             image="/common/img/ico_refresh.png"
-            tooltiptext="${i18n:_('Refresh')}" />
+            tooltiptext="${i18n:_('Refresh')}" visible="false" />
         <button id="btnPrint" onClick="planner.print()"
             image="/common/img/ico_print.png"
             tooltiptext="${i18n:_('Print')}" />
         <separator/>
 
         <!--  Visualization modes -->
-        <label>${i18n:_('Zoom level')}:</label>
+        <label>${i18n:_('Zoom')}:</label>
         <listbox id="listZoomLevels" mold="select" rows="1"
             model="${planner.zoomLevels}"
             onSelect="planner.setZoomLevel(self.selectedItem.value);" >
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index 317028a15..3625600a3 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -32,7 +32,7 @@ resourcesLoadPanel = self;
        <north height="30px" border="0">
        <hbox align="center" id="toolbar">
         <separator/>
-        <label>${i18n:_('Zoom level')}:</label>
+        <label>${i18n:_('Zoom')}:</label>
         <listbox id="listZoomLevels" mold="select" rows="1"
             model="${resourcesLoadPanel.zoomLevels}"
             onSelect="resourcesLoadPanel.setZoomLevel(self.selectedItem.value);" >
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
index f4e12f1ad..97f73b59a 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -1091,6 +1091,7 @@ tr.z-tree-row-seld, tr.z-list-item-seld,
 
 .toolbar-box .z-label {
     color:#0068B1;
+    padding-left:4px;
 }
 
 .toolbar-box span.z-button {
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
index 56985bfbf..bb53b6b93 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
@@ -1,5 +1,5 @@
 <hbox align="center" sclass="filtering-area">
-    <label value="${i18n:_('Filter by')}"
+    <label value="${i18n:_('Filter')}"
         tooltiptext="${i18n:_('Select required criteria set and press filter button')}"/>
     <bandboxMultipleSearch id="bdFiltersOrderElement" widthBandbox="300px" widthListbox="400px"
         finder="orderElementsMultipleFiltersFinder"/>
@@ -9,7 +9,7 @@
     <label value="${i18n:_('to')}"/>
     <datebox id="filterFinishDateOrderElement" constraint = "@{treeController.checkConstraintFinishDate}"
         width="65px" />
-    <label value="${i18n:_('with name')}"/>
+    <label value="${i18n:_('name')}"/>
     <textbox id="filterNameOrderElement" width="50px" />
     <button label="${i18n:_('Filter')}" style="margin-top: -4px"
         tooltiptext="${i18n:_('Apply filtering to order elements satisfying required critera')}"
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul b/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
index 26f09a4b8..175b505d5 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
@@ -1,5 +1,5 @@
 <hbox align="center" sclass="filtering-area">
-    <label value="${i18n:_('Filter by')}"
+    <label value=" ${i18n:_('Filter')}"
         tooltiptext="${i18n:_('Select required criteria set and press filter button')}"/>
     <bandboxMultipleSearch id="bdFilters" widthBandbox="385px" widthListbox="400px"
         finder="ordersMultipleFiltersFinder"/>