From a1c9c81252c4822db26e8d70128abc0629449449 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 18 Jan 2010 09:11:23 +0100
Subject: [PATCH]  ItEr43S10SoporteImpresionMultiplesPaxinasItEr42S15: Print
 configuration window close button fixed

---
 .../FunctionalityExposedForExtensions.java    | 15 ++-----------
 .../src/main/webapp/planner/css/print.css     | 21 +++++++++----------
 .../webapp/planner/print_configuration.zul    |  4 +++-
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
index 50b09b758..7b99a9054 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
@@ -20,8 +20,6 @@
 
 package org.zkoss.ganttz;
 
-import static org.zkoss.ganttz.i18n.I18nHelper._;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -414,25 +412,16 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
         final Window printProperties = (Window) Executions.createComponents(
                 "/planner/print_configuration.zul", planner, null);
 
-        Button printButton = new Button(_("Print"));
+        Button printButton = (Button) printProperties.getFellow("printButton");
         printButton.addEventListener(Events.ON_CLICK, new EventListener() {
             @Override
             public void onEvent(Event event) throws Exception {
+                printProperties.detach();
                 configuration.print(buildParameters(printProperties),planner);
             }
         });
         printButton.setParent(printProperties);
 
-        Button cancelPrint = new Button(_("Cancel"));
-        printButton.addEventListener(Events.ON_CLICK, new EventListener() {
-            @Override
-            public void onEvent(Event event) throws Exception {
-                // get Print properties and params
-                printProperties.setVisible(false);
-            }
-        });
-        cancelPrint.setParent(printProperties);
-
         try {
             printProperties.doModal();
         } catch (Exception e) {
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/print.css b/navalplanner-webapp/src/main/webapp/planner/css/print.css
index 65fe43acd..2ee2f95d9 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/print.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/print.css
@@ -66,20 +66,19 @@ a.ruta,
 
 /* ------ Dynamically set heights ------ */
 
-body div.main-layout {
-    height: 1200px !important;
-}
-
-body div.plannerlayout {
-    height: 1190px !important;
-}
-
-body div#timetracker {
-    height: 1130px !important;
-}
 
 body div#scroll_container {
     height: 1110px !important;
 }
+body div#timetracker {
+    height: 1130px !important;
+}
+body div.plannerlayout {
+    height: 1190px !important;
+}
+body div.main-layout {
+    height: 1200px !important;
+}
+
 
 /* ------ Calculated body width added via CutyPrint CSS generator ------ */
diff --git a/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul b/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul
index f1fb6cb1f..ca4d1e691 100644
--- a/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul
@@ -23,7 +23,7 @@
 <zk>
 
     <window border="normal" title="${i18n:_('Print configuration')}"
-        closable="true">
+        closable="true" id="printConfigurationWindow">
         <panel title="${i18n:_('Select print page properties')}"
             border="normal" style="margin-bottom:10px;">
             <panelchildren>
@@ -74,6 +74,8 @@
                 </vbox>
             </panelchildren>
         </panel>
+        <button id="printButton" label="${i18n:_('Print')}" sclass="save-button global-action"></button>
+        <button id="cancelPrintButton" label="${i18n:_('Cancel')}" sclass="cancel-button global-action" onClick="printConfigurationWindow.detach()"/>
     </window>
 
 </zk>