From bb02bcfb0284079f6235ed4f502fb0acce4cfaf2 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 7 Sep 2009 10:10:59 +0200
Subject: [PATCH]  ItEr24S08CUAsignacionGrupoRecursosAPlanificacionItEr23S10:
 Wrapped resourcesLoad page components inside an static borderlayout

   * Timetracker is not beeing rendered
   * Borderlayout structure definition may be separated to another zul subpage
---
 .../resourceload/ResourcesLoadPanel.java      | 32 +++++++++++++++++--
 .../resourceload/resourcesLoadPanel.dsp       |  1 -
 .../src/main/webapp/planner/css/ganttzk.css   |  7 +---
 3 files changed, 30 insertions(+), 10 deletions(-)

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 13a1586ee..dc9e5af99 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -10,6 +10,10 @@ import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
 import org.zkoss.ganttz.util.MutableTreeModel;
 import org.zkoss.zk.au.out.AuInvoke;
 import org.zkoss.zk.ui.ext.AfterCompose;
+import org.zkoss.zkex.zul.Borderlayout;
+import org.zkoss.zkex.zul.Center;
+import org.zkoss.zkex.zul.West;
+import org.zkoss.zul.Div;
 import org.zkoss.zul.impl.XulElement;
 
 public class ResourcesLoadPanel extends XulElement implements AfterCompose {
@@ -31,9 +35,31 @@ public class ResourcesLoadPanel extends XulElement implements AfterCompose {
         timeTrackerComponent = timeTrackerForResourcesLoadPanel(timeTracker);
         resourceLoadList = new ResourceLoadList(timeTracker, treeModel);
         leftPane = new ResourceLoadLeftPane(treeModel, resourceLoadList);
-        appendChild(timeTrackerComponent);
-        appendChild(leftPane);
-        appendChild(resourceLoadList);
+
+        Borderlayout bl = new Borderlayout();
+        bl.setHeight("300px");
+        bl.setWidth("1600px");
+
+        West w = new West();
+        w.setSize("200px");
+        w.setFlex(true);
+        w.setSplittable(true);
+        w.setCollapsible(true);
+        w.setStyle("overflow: scroll");
+
+        Center c = new Center();
+        c.setFlex(true);
+        c.setStyle("overflow: scroll");
+        Div d = new Div();
+        d.appendChild(timeTrackerComponent);
+        d.appendChild(resourceLoadList);
+        w.appendChild(leftPane);
+        c.appendChild(d);
+
+        bl.appendChild(w);
+        bl.appendChild(c);
+        appendChild(bl);
+
     }
 
     private MutableTreeModel<LoadTimeLine> createModelForTree() {
diff --git a/ganttzk/src/main/resources/web/ganttz/resourceload/resourcesLoadPanel.dsp b/ganttzk/src/main/resources/web/ganttz/resourceload/resourcesLoadPanel.dsp
index 7b8f60250..64bcc594b 100644
--- a/ganttzk/src/main/resources/web/ganttz/resourceload/resourcesLoadPanel.dsp
+++ b/ganttzk/src/main/resources/web/ganttz/resourceload/resourcesLoadPanel.dsp
@@ -2,7 +2,6 @@
 <%@ taglib uri="http://www.zkoss.org/dsp/zk/core" prefix="z" %>
 
 <c:set var="self" value="${requestScope.arg.self}"/>
-<h3>Resources Load</h3>
 <div id="${self.uuid}" class="resourcesloadpanel" z.type="ganttz.resourceload.resourcesloadpanel.ResourcesLoadPanel" ${self.outerAttrs}>
     <c:forEach var="child" items="${self.children}">
         ${z:redraw(child, null)}
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index b6e229137..456f40677 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -381,18 +381,13 @@ tr.z-vbox-sep {
 .resourceloadleftpane {
 	border: 1px;
 	margin-top: 70px;
-	float: left;
-	width: 285px;
+	width: 325px;
 	padding-right: 15px;
-    overflow-y: hidden;
 }
 
 .resourceloadlist {
 	margin-top: 70px;
 	width: 80%;
-	overflow: auto;
-	position: absolute;
-	left: 285px;
 }
 /* Advanced resources assignment */