From 24bb2cf5810d34342537c72cb862c3e01becd5cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 20 Oct 2011 22:58:35 +0200
Subject: [PATCH] Removed 'Up' command in resources load view of a project

FEA: ItEr75S04BugFixing
---
 .../web/ganttz/zul/resourcesLoadLayout.zul    |  4 ++--
 .../tabs/MultipleTabsPlannerController.java   | 22 +------------------
 .../planner/tabs/ResourcesLoadTabCreator.java |  7 +-----
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index f6d1ebb2e..52f96c9fe 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -30,8 +30,8 @@ resourcesLoadPanel = self;
 
     <borderlayout sclass="resourcesloadlayout" width="auto" height="100%">
        <north height="30px" border="0" sclass="toolbar-box">
-       <hbox align="center" id="toolbar">
-        <separator/>
+       <hbox align="center" id="toolbar" >
+        <separator height="30px"/>
         <label>${ganttzk_i18n:_('Zoom')}:</label>
         <listbox id="listZoomLevels" mold="select" rows="1"
             model="${resourcesLoadPanel.zoomLevels}"
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 014b48e68..ae21d0a2f 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
@@ -198,7 +198,7 @@ public class MultipleTabsPlannerController implements Composer,
                 breadcrumbs, parameters, this));
 
         resourceLoadTab = ResourcesLoadTabCreator.create(mode,
-                resourceLoadController, upCommand(),
+                resourceLoadController,
                 resourceLoadControllerGlobal, new IOrderPlanningGate() {
 
                     @Override
@@ -371,26 +371,6 @@ public class MultipleTabsPlannerController implements Composer,
         return tabsSwitcher.getTabsRegistry();
     }
 
-    private IToolbarCommand upCommand() {
-        return new IToolbarCommand() {
-
-            @Override
-            public void doAction() {
-                mode.up();
-            }
-
-            @Override
-            public String getLabel() {
-                return _("Up to company view");
-            }
-
-            @Override
-            public String getImage() {
-                return "/common/img/ico_up.png";
-            }
-        };
-    }
-
     @Override
     public void goToCompanyScheduling() {
         getTabsRegistry().show(planningTab);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
index fff38544a..4628ec928 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
@@ -48,12 +48,11 @@ public class ResourcesLoadTabCreator {
 
     public static ITab create(Mode mode,
             ResourceLoadController resourceLoadController,
-            IToolbarCommand upCommand,
             ResourceLoadController resourceLoadControllerGlobal,
             IOrderPlanningGate orderPlanningGate,
             Component breadcrumbs) {
         return new ResourcesLoadTabCreator(mode, resourceLoadController,
-                upCommand, resourceLoadControllerGlobal, orderPlanningGate,
+                resourceLoadControllerGlobal, orderPlanningGate,
                 breadcrumbs)
                 .build();
     }
@@ -63,18 +62,15 @@ public class ResourcesLoadTabCreator {
 
     private final ResourceLoadController resourceLoadControllerGlobal;
 
-    private final IToolbarCommand upCommand;
     private final Component breadcrumbs;
 
     private ResourcesLoadTabCreator(Mode mode,
             ResourceLoadController resourceLoadController,
-            IToolbarCommand upCommand,
             ResourceLoadController resourceLoadControllerGlobal,
             IOrderPlanningGate orderPlanningGate,
             Component breadcrumbs) {
         this.mode = mode;
         this.resourceLoadController = resourceLoadController;
-        this.upCommand = upCommand;
         this.resourceLoadControllerGlobal = resourceLoadControllerGlobal;
         this.orderPlanningGate = orderPlanningGate;
         this.breadcrumbs = breadcrumbs;
@@ -94,7 +90,6 @@ public class ResourcesLoadTabCreator {
             public org.zkoss.zk.ui.Component create(
                     org.zkoss.zk.ui.Component parent) {
                 Map<String, Object> arguments = new HashMap<String, Object>();
-                resourceLoadController.add(upCommand);
                 arguments.put("resourceLoadController", resourceLoadController);
                 return Executions.createComponents(
                         "/resourceload/_resourceloadfororder.zul", parent,