From 9d84335b7cf77e2765cdac4e6cf1412c917b2e57 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 13 Sep 2010 11:35:20 +0200
Subject: [PATCH] Adapted resourcesload layout for vertical adjustment

FEA: ItEr60S16AdaptacionsPantallasNavalPlan
---
 .../web/ganttz/zul/plannerLayout.zul          | 26 +++++++++++++++++++
 .../web/ganttz/zul/resourcesLoadLayout.zul    |  4 +--
 .../main/webapp/common/layout/template.zul    |  4 ++-
 .../src/main/webapp/planner/css/ganttzk.css   | 12 ++++++++-
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index 6848fc21b..d7d88e977 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -1,5 +1,31 @@
+<!--
+  This file is part of NavalPlan
+
+  Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
+                          Desenvolvemento Tecnolóxico de Galicia
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+
 <borderlayout width="auto" height="100%" class="inner-layout">
        <north height="30px" border="0" sclass="toolbar-box">
+       <zscript><![CDATA[
+planner = self;
+]]>
+</zscript>
+
        <hbox align="center" id="toolbar">
 
         <separator/>
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index 196c61983..8aed780cf 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -21,14 +21,14 @@
 <?xel-method prefix="i18n" name="_" class="org.zkoss.ganttz.i18n.I18nHelper"
     signature="java.lang.String _(java.lang.String name)" ?>
 
-<zk xmlns:n="http://www.zkoss.org/2005/zk/native">
+<zk xmlns:n="http://www.zkoss.org/2005/zk/native" height="100%">
 <zscript><![CDATA[
 resourcesLoadPanel = self;
 ]]>
 </zscript>
 
 
-    <borderlayout sclass="resourcesloadlayout" width="auto">
+    <borderlayout sclass="resourcesloadlayout" width="auto" height="100%">
        <north height="30px" border="0" sclass="toolbar-box">
        <hbox align="center" id="toolbar">
         <separator/>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 62bcd0726..33f8a2476 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -108,7 +108,9 @@
         <vbox id="registeredItemsInsertionPoint" width="90px"/>
         </n:div>
     </west>
-    <center class="main-area" style="border: 1px solid pink" self="@{insert(content)}" />
+
+    <center self="@{insert(content)}"  class="main-area"/>
+
     </borderlayout>
 
 </center>
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index 1d4b59a24..045450ba3 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -1191,6 +1191,16 @@ body .perspectives-column {
     background-color: #484e4d;
 }
 
+/* Workaround for zk 100% height just root components */
+.main-area {height: 100%;}
 .main-area .z-center-body > span {height: 100%;}
 .main-area .z-center-body > span > div { height: 100%;}
-.main-area .z-center-body > span > div > span { height: 100%;}
\ No newline at end of file
+.main-area .z-center-body > span > div > span { height: 100%;}
+.main-area .z-center-body > span > div > div  { height: 100%;}
+.main-area .z-center-body > span > div > div > span { height: 100%;}
+
+.main-area > span {height: 100%;}
+.main-area > span > div { height: 100%;}
+.main-area > span > div > span { height: 100%;}
+.main-area > span > div > div { height: 100%;}
+.main-area > span > div > div > span { height: 100%;}
\ No newline at end of file