From 0d06c823bc4918fe359448a914cf43b320a811b5 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Thu, 1 Oct 2009 14:18:28 +0200
Subject: [PATCH]  ItEr28S09CUCreacionProxectoPlanificacionItEr27S09: Static
 toolbar added to resourcesload component.

---
 .../web/ganttz/zul/resourcesLoadLayout.zul    | 44 +++++++++++++++----
 .../src/main/webapp/planner/css/ganttzk.css   |  6 ++-
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index db4e1fbe1..fbcb25d65 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -1,14 +1,42 @@
 <zk xmlns:n="http://www.zkoss.org/2005/zk/native">
 
     <borderlayout height="600px" width="auto">
-        <north height="70%" collapsible="true" splittable="true">
+       <north height="30px" border="0">
+       <hbox align="center">
+        <button label="Save" />
+        <button label="Back" />
+        <button label="Company view" />
+        <separator/>
+        <button label="+" />
+        <button label="-" />
+        From: <datebox /> to: <datebox />
+        <separator/>
+        Filter:
+        <combobox>
+            <comboitem label="Orders"
+                description="Show full orders and company view" />
+            <comboitem label="Tasks"
+                description="Tasks inside orders or filtered" />
+        </combobox>
+        <combobox>
+            <comboitem label="Filter by Label" />
+            <comboitem label="Filter by criterion" />
+            <comboitem label="Filter by resources" />
+            <comboitem label="Critical way" />
+        </combobox>
+        <textbox/>
+
+       </hbox>
+       </north>
+
+        <center border="0">
             <borderlayout sclass="resourcesload">
                 <west size="200px" flex="true" collapsible="true"
                     splittable="true" autoscroll="true">
 
-                    <borderlayout>
-                        <north border="0" height="58px" flex="true" collapsible="true">
-                            <vbox pack="center" align="center"><label value="Icons" width="150px" height="29px"/>
+                    <borderlayout >
+                        <north border="0" height="38px" flex="true" collapsible="true">
+                            <vbox pack="center" align="center">
                             <tree fixedLayout="true">
                                 <treecols>
                                     <treecol label="Name" height="29px"/>
@@ -25,7 +53,7 @@
 
                 <center sclass="taskspanel">
                     <borderlayout>
-                        <north border="0"><div sclass="timetrackergap" height="53px" id="insertionPointTimetracker"></div></north>
+                        <north border="0"><div sclass="timetrackergap" height="33px" id="insertionPointTimetracker"></div></north>
                         <center autoscroll="true" border="0" sclass="rightpanellayout">
                             <div id="insertionPointRightPanel" sclass="taskspanelgap"></div>
                         </center>
@@ -33,8 +61,8 @@
 
                 </center>
             </borderlayout>
-        </north>
-        <center>
+        </center>
+        <south height="20%" collapsible="true" splittable="true">
             <borderlayout>
                 <west size="200px" flex="true" collapsible="true"
                     splittable="true">
@@ -93,6 +121,6 @@ catmodel.setValue("2011", "Q4 2009", new Integer(90));
 
                 </center>
             </borderlayout>
-        </center>
+        </south>
     </borderlayout>
 </zk>
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index 680f8e74e..90917650c 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -495,4 +495,8 @@ tr.z-vbox-sep {
 
 .resourceloadlist {
     margin-top: 15px;
-}
\ No newline at end of file
+}
+
+.timetrackergap #zoom_buttons {
+    display:none;
+}