From e47457f6b2da16c7668f8e454e0407a78117131f Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 22 Feb 2010 13:08:17 +0100
Subject: [PATCH]  ItEr49S04ValidacionEProbasFuncionaisItEr48S04: Added icon to
 Up command in resourcesload toolbar

---
 .../ganttz/resourceload/ResourcesLoadPanel.java   |  10 +++++++++-
 .../web/ganttz/zul/resourcesLoadLayout.zul        |   2 +-
 .../tabs/MultipleTabsPlannerController.java       |   7 ++++++-
 .../src/main/webapp/common/img/ico_up.png         | Bin 0 -> 670 bytes
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_up.png

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
index 575c0ddad..f321f5617 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -22,6 +22,7 @@ package org.zkoss.ganttz.resourceload;
 
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.zkoss.ganttz.data.resourceload.LoadTimeLine;
 import org.zkoss.ganttz.data.resourceload.LoadTimelinesGroup;
 import org.zkoss.ganttz.timetracker.TimeTracker;
@@ -49,6 +50,8 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
         public void doAction();
 
         public String getLabel();
+
+        public String getImage();
     }
 
     private TimeTrackerComponent timeTrackerComponent;
@@ -108,7 +111,12 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
                 c.doAction();
             }
         });
-        result.setLabel(c.getLabel());
+        if (!StringUtils.isEmpty(c.getImage())) {
+            result.setImage(c.getImage());
+            result.setTooltiptext(c.getLabel());
+        } else {
+            result.setLabel(c.getLabel());
+        }
         return result;
     }
 
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index 3625600a3..c07002122 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -29,7 +29,7 @@ resourcesLoadPanel = self;
 
 
     <borderlayout sclass="resourcesloadlayout" width="auto">
-       <north height="30px" border="0">
+       <north height="30px" border="0" sclass="toolbar-box">
        <hbox align="center" id="toolbar">
         <separator/>
         <label>${i18n:_('Zoom')}:</label>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index 19310c126..115c3731a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -299,7 +299,12 @@ public class MultipleTabsPlannerController implements Composer,
 
             @Override
             public String getLabel() {
-                return _("Up");
+                return _("Up to company view");
+            }
+
+            @Override
+            public String getImage() {
+                return _("/common/img/ico_up.png");
             }
         };
     }
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_up.png b/navalplanner-webapp/src/main/webapp/common/img/ico_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..f211020dc3a69ca1ebc2138e24e0d6051194d4b6
GIT binary patch
literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!FiAu~RCwCV
zluc+8K@`XTv%A?%OwvHXYD*&~R-}+a1)&EOLlG)^5j@lnL<@Q;x%43P&{D)gZx%fG
zaTKNafgoz3>P7GaJm|?<M6^w-^`jorr1{wFZk{uv1WUVHD>*nY?ChI2zkTz6?=2%D
z)N&}O@%SrX<47GfoDWh>fL)`V^wrE^-Ym%Vszjlo+r0MbB4H5JKc1p94^GRquz8(f
zZb|vHFh$XkI8G%FA!LM6cFLH`&Ef8cCz$R1h~`L)t?A0qD{-`MY{j<qt(eYCBb`a3
zDcppu^^J0GO&UtAD!|FMZoK{e2AZNlQB*wr`~nAJoqz>bJ(mHmzrIAb-aW#F-9wnk
zOi5cn^H=vL<|mL!9E0!?zMep#+wprn=-tsR-}B`>LV8%vf>l7+7s8^IN69MTU`rCh
zSDbMLMlZ*aY~GIcO*`=|_XU0}z^5OkW5UO;9pT`JUWasc28o6QTIx3})3ci8!=wA?
z=Ile<*?$%5^dKtS?vRa_>1UYyF$sk!P??I3Eqmpj#j{@E(e^zbMi<xh#?f)M1jvRM
z!CV^q*pb_K{C-T9OMpkKt2%aV-h&hOQ-Je_ufglNpCnML7Wi*NHS_^SBEqbh<=6GW
z&<q59K@K$}jLy-Db*Qb@MItc@W3VeWiaasmBVNN3Xge12TqjY7LN}8?OIGpUfu>zT
zGS(rJp{c)Ii?%n=wU^l-lilLhUvze54cUMH$Nnk60I(t!y56%_vH$=807*qoM6N<$
Ef|xcuC;$Ke

literal 0
HcmV?d00001