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; - + 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 000000000..f211020dc Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/ico_up.png differ