From 3263ad7e569cb6a499918832bdae876597246773 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 12 Oct 2009 01:15:28 +0200
Subject: [PATCH]  ItEr29S08CUCreacionProxectoPlanificacionItEr28S09: Improved
 styles inside advanced allocation page components

---
 .../AdvancedAllocationController.java         |  1 +
 .../webapp/planner/advance_allocation.zul     | 17 +++-----
 .../src/main/webapp/planner/css/ganttzk.css   | 40 ++++++++++++++++++-
 .../src/main/webapp/planner/order.zul         |  4 +-
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index c38597f44..6c8ac742c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -444,6 +444,7 @@ abstract class ColumnOnRow implements IConvertibleToColumn {
     public Column toColumn() {
         Column column = new org.zkoss.zul.Column();
         column.setLabel(columnName);
+        column.setSclass(((String) columnName).toLowerCase());
         return column;
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index 5546ee1bf..07da23f09 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -27,8 +27,8 @@
 ]]>
 </zscript>
 
-    <borderlayout height="600px" width="auto" apply="${advancedAllocationController}" class="advancedassignment">
-       <north height="60px" border="0">
+    <borderlayout width="auto" apply="${advancedAllocationController}" class="advancedallocationlayout">
+       <north height="30px" border="0">
        <hbox align="center">
         <button label="${i18n:_('Accept')}" id="acceptButton" />
         <button label="${i18n:_('Cancel')}" id="cancelButton" />
@@ -42,18 +42,11 @@
 
         <center border="0">
             <borderlayout sclass="resourcesload">
-                <west size="200px" flex="true" collapsible="true"
+                <west size="400px" flex="true" collapsible="true"
                     splittable="true" autoscroll="true">
 
                     <borderlayout >
-                        <north border="0" height="38px" flex="true" collapsible="true" sclass="advancedassignmentdetails">
-                            <vbox pack="center" align="center">
-                            <tree fixedLayout="true">
-                                <treecols>
-                                    <treecol label="Listdetails headers" height="29px"/>
-                                </treecols>
-                            </tree>
-                            </vbox>
+                        <north border="0" height="14px" flex="true" collapsible="true" sclass="advancedassignmentdetails">
                         </north>
                         <center border="0">
                             <div sclass="leftpanelgap" id="insertionPointLeftPanel"></div>
@@ -72,4 +65,4 @@
             </borderlayout>
         </center>
     </borderlayout>
-</zk>
\ No newline at end of file
+</zk>
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index 30d35003c..51e350d3a 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -391,7 +391,7 @@ tr.z-vbox-sep {
     /* overflow: auto; */
 }
 
-.advancedassignment #timetrackedtable {
+.advancedallocationlayout #timetrackedtable {
     float: none;
     width: auto;
     overflow: visible;
@@ -523,7 +523,7 @@ div.z-tree {
     border-bottom: 1px dotted #86A4BE !important;
 }
 
-.plannerlayout, .resourcesloadlayout {
+.plannerlayout, .resourcesloadlayout, .advancedallocationlayout {
     height:500px;
 }
 
@@ -536,4 +536,40 @@ div.z-tree {
     background-color: #f7f7bf;
     border: solid 1px #CCCCCC;
     /*z-index: 5; */
+}
+
+.advancedallocationlayout .name {
+    min-width:200px;
+}
+
+.advancedallocationlayout .second_level_ {
+    border-collapse: collapse;
+}
+
+.taskspanelgap table {
+    border-collapse: collapse;
+}
+
+.taskspanelgap input {
+    border: 0;
+    height: 19px;
+}
+
+.advancedallocationlayout .leftpanelgap .z-grid-header {
+    padding-bottom: 3px;
+    border-bottom: solid 1px #DDDDDD;
+    background: #FFFFFF;
+}
+
+.advancedallocationlayout div.z-row-cnt {
+    padding: 0;
+}
+
+.advancedallocationlayout .leftpanelgap td.z-row-inner {
+    padding-top:0;
+    padding-bottom:0;
+}
+
+.advancedallocationlayout .leftpanelgap input {
+    height:19px;
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 8c5961807..28e68f6ec 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -83,7 +83,7 @@
 
     <window id="resourceAllocationWindow" self="@{define(content)}"
         apply="${allocationController}" closable="true"
-        title="${i18n:_('Resource allocation')}" style="min-height:500px" width="600px" visible="false">
+        title="${i18n:_('Resource allocation')}" width="600px" visible="false">
 
     <tabbox mold="accordion-lite">
         <tabs>
@@ -150,7 +150,7 @@
                         <listbox id="allocationsList"
                             model="@{allocationController.resourceAllocations}"
                             itemRenderer="@{allocationController.resourceAllocationRenderer}"
-                            style="margin-bottom: 5px" fixedLayout="true" rows="5">
+                            style="margin-bottom: 5px" fixedLayout="true" rows="3">
                             <listhead>
                                 <listheader label="${i18n:_('Name')}" />
                                 <listheader