From ffda94096a8741d62e93021475a6ec02a526df3b Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Fri, 10 Jul 2009 08:21:33 +0200
Subject: [PATCH]  ItEr16S09RFComportamentoGraficoPlanificadorItEr15S12:
 Improved order element page styles for name input and popup

   * The name input width is calculated based on treeitem depth
   * Popup has been resized an repositioned
---
 .../web/orders/OrderElementController.java        |  3 ++-
 .../web/orders/OrderElementTreeController.java    |  4 ++++
 .../src/main/webapp/common/css/navalpro_zk.css    | 15 +++++++++++++++
 .../src/main/webapp/orders/_editOrderElement.zul  |  2 +-
 .../src/main/webapp/orders/_orderElementTree.zul  |  3 ++-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index aed9ea147..8321502ec 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -219,7 +219,8 @@ public class OrderElementController extends GenericForwardComposer {
 
         Util.reloadBindings(popup);
 
-        popup.open(popup.getParent(), "start-after");
+//    Review this positioning parameters (popup.getParent(), "start-after");
+      popup.open(150, 150);
 
         reloadSelectedCriterionTypes();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
index 3c0e561cf..5bfb0faac 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
@@ -210,7 +210,11 @@ public class OrderElementTreeController extends GenericForwardComposer {
             }
             // Construct treecells
             int[] path = getOrderElementTreeModel().getPath(t);
+            String cssClass = "depth_"+path.length;
             Treecell cellForName = new Treecell(pathAsString(path));
+            cellForName.setSclass(cssClass);
+            // It would be needed to expand the width for the numbers
+            // to make it ready for 2 and 3 digit numbers
             cellForName.appendChild(Util.bind(new Textbox(),
                     new Util.Getter<String>() {
 
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
index 35382bab9..d36ceb02a 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -60,3 +60,18 @@ table {
     margin:20px;
     font-size: 12px;
 }
+
+
+/* Styles for order element tree */
+.orderTree .depth_1 input {
+    width: 450px !important;
+}
+.orderTree .depth_2 input {
+    width: 420px !important;
+}
+.orderTree .depth_3 input {
+    width: 390px !important;
+}
+.orderTree .depth_4 input {
+    width: 360px !important;
+}
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index 59d43e2e7..932cf148d 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -1,4 +1,4 @@
-<popup id="${arg.top_id}">
+<popup id="${arg.top_id}" width="400px" height="300px" left="100px" top="100px">
 
     <vbox>
 
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
index 9aab5a25d..396ee68e6 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
@@ -19,7 +19,8 @@
         <tree id="tree" width="900px" multiple="true" droppable="true"
             onDrop="orderElementTreeController.move(self, event.dragged)"
             model="@{orderElementTreeController.orderElementTreeModel}"
-            treeitemRenderer="@{orderElementTreeController.renderer}" pageSize="5">
+            treeitemRenderer="@{orderElementTreeController.renderer}" pageSize="5"
+            sclass="orderTree">
             <treecols sizable="true">
                 <treecol label="Name and description" />
                 <treecol label="Estimated init" />