From 84ff3836e7fc0b3da6af9712b9d2fd16f9287b6a Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Fri, 9 Oct 2009 10:45:04 +0200
Subject: [PATCH]  ItEr29S08CUCreacionProxectoPlanificacionItEr28S09: Improved
 edit orderelement window

---
 .../src/main/webapp/common/css/navalpro_zk.css     | 14 +++++++++++++-
 .../src/main/webapp/orders/_editOrderElement.zul   |  4 ++--
 .../webapp/orders/_listOrderElementAdvances.zul    |  8 ++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

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 fd6cbf5b0..d5e507061 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -415,9 +415,17 @@ div.z-grid {
 }
 
 .orderTree .name {
-    min-width:505px;
+    min-width:515px;
 }
 
+.orderTree .hours {
+    min-width:50px;
+}
+.orderTree .code {
+    min-width:50px;
+}
+
+
 .orderTree div.z-tree-cell-cnt {
     padding:0px;
 }
@@ -452,4 +460,8 @@ div.z-grid {
     height: 17px;
     font-size: 11px !important;
     font-family: Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.advance-measurement {
+    width: 340px;
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index 4d794e87e..08db938be 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -21,8 +21,8 @@
 <?component name="listOrderElementHours" inline="true" macroURI="_listOrderElementHours.zul"?>
 <?component name="listOrderElementAdvances" inline="true" macroURI="_listOrderElementAdvances.zul"?>
 <?component name="listOrderElementLabels" inline="true" macroURI="_listOrderElementLabels.zul"?>
-<window visible="false" id="${arg.top_id}" title="${i18n:_('Edit order element')}"  width="800px" left="100px" top="100px">
- <tabbox>
+<window visible="false" id="${arg.top_id}" title="${i18n:_('Edit order element')}"  width="950px" left="50px" top="50px">
+ <tabbox height="620px">
         <tabs>
             <tab label="${i18n:_('Details')}"></tab>
             <tab label="${i18n:_('Assigned hours')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
index e0c30dd64..60b5ad7fd 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
@@ -36,8 +36,8 @@
                      onSelect="manageOrderElementAdvancesController.prepareEditAdvanceMeasurements(self.selectedItem.value);"
                      pageSize="10">
                     <listhead sizable="true">
-                         <listheader label="${i18n:_('Type')}" />
-                         <listheader label="${i18n:_('Max value')}"/>
+                         <listheader label="${i18n:_('Type')}" tooltiptext="Advance unit type" />
+                         <listheader label="${i18n:_('Max value')}" tooltiptext="Maximum allowed value"/>
                          <listheader label="${i18n:_('Current value')}"/>
                          <listheader label="${i18n:_('Percentage')}"/>
                          <listheader label="${i18n:_('Date')}"/>
@@ -61,8 +61,8 @@
                     <listbox id="editAdvancesMeasurement" height="200px"
                              model="@{manageOrderElementAdvancesController.advanceMeasurements}"
                              itemRenderer="@{manageOrderElementAdvancesController.advanceMeasurementRenderer}"
-                             mold="paging" pageSize="10">
-                            <listhead sizable="true">
+                             mold="paging" pageSize="10" sclass="advance-measurement">
+                            <listhead>
                                 <listheader label="${i18n:_('Value')}" />
                                 <listheader label="${i18n:_('Percentage')}" />
                                 <listheader label="${i18n:_('Date')}" />