From 3c01e0fa29c97671f3c1f2d7288e912fed132ec8 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 9 Oct 2009 01:31:32 +0200
Subject: [PATCH]  ItEr29S13CUVistaRecursosTempoEmpresa: Align chart and
 planner (aprox).

---
 .../main/resources/web/ganttz/zul/plannerLayout.zul  |  2 +-
 navalplanner-webapp/pom.xml                          |  6 ++----
 .../navalplanner/web/planner/OrderPlanningModel.java |  1 +
 pom.xml                                              | 12 ++++++------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index e21c0a7df..3b67e4049 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -65,7 +65,7 @@ planner = self;
         </center>
         <south height="100px" collapsible="true" splittable="true">
             <borderlayout>
-                <west width="200px" flex="true" collapsible="true"
+                <west width="284px" flex="true" collapsible="true"
                     splittable="true">
                     <vbox pack="center" align="center">
                     <label value="ResourcesLoadGraph details"
diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index db58da846..e1a357043 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -132,14 +132,12 @@
         </dependency>
         <!-- ZK Timeplot -->
         <dependency>
-            <groupId>org.zkoss.zkforge</groupId>
+            <groupId>org.zkoss.zkforge.timeline</groupId>
             <artifactId>timelinez</artifactId>
-            <version>1.2_1</version>
         </dependency>
         <dependency>
-            <groupId>org.zkoss.zkforge</groupId>
+            <groupId>org.zkoss.zkforge.timeplot</groupId>
             <artifactId>timeplotz</artifactId>
-            <version>1.0_2</version>
         </dependency>
    </dependencies>
 </project>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
index 534b8dd65..1d0e1c2c7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
@@ -357,6 +357,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
         chart.appendChild(plotInfoOrder);
         chart.appendChild(plotInfoCompany);
 
+        size = size + (16 * 2);
         chart.setWidth(size + "px");
         chart.setHeight("200px");
     }
diff --git a/pom.xml b/pom.xml
index d72c27418..749b3dd2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -438,15 +438,15 @@
             </dependency>
             <!-- ZK Timeplot -->
             <dependency>
-                <groupId>org.zkoss.zkforge</groupId>
-                <artifactId>timelinez</artifactId>
-                <version>1.2_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.zkoss.zkforge</groupId>
+                <groupId>org.zkoss.zkforge.timeplot</groupId>
                 <artifactId>timeplotz</artifactId>
                 <version>1.0_2</version>
             </dependency>
+            <dependency>
+                <groupId>org.zkoss.zkforge.timeline</groupId>
+                <artifactId>timelinez</artifactId>
+                <version>1.2_1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>