From a9defb54466c1066af775e9c8322edc9dfcf9d39 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 10 Aug 2011 18:13:45 +0200
Subject: [PATCH] [Bug #1126] Fix issue in Chromium/Google Chrome

This is an issue with Chromium and it is fixed thanks to a workaround
commented in this ZK bug: http://tracker.zkoss.org/browse/ZK-276

FEA: ItEr75S04BugFixing
---
 .../web/calendars/BaseCalendarCRUDController.java     |  3 ++-
 .../navalplanner/web/common/BaseCRUDController.java   | 11 +++++++----
 .../web/resources/worker/WorkerCRUDController.java    |  5 +++--
 .../src/main/webapp/advance/_editAdvanceTypes.zul     |  1 +
 .../src/main/webapp/calendars/_edition.zul            |  2 +-
 .../src/main/webapp/common/css/navalplan_zk.css       |  4 ++++
 .../main/webapp/costcategories/_editCostCategory.zul  |  1 +
 .../webapp/costcategories/_editTypeOfWorkHours.zul    |  1 +
 .../webapp/excetiondays/_editExceptionDayType.zul     |  3 ++-
 .../webapp/externalcompanies/_editExternalCompany.zul |  1 +
 .../src/main/webapp/labels/_editLabelType.zul         |  1 +
 .../src/main/webapp/materials/_editUnitType.zul       |  1 +
 .../src/main/webapp/qualityforms/_editQualityForm.zul |  1 +
 .../src/main/webapp/resources/criterions/_edition.zul |  1 +
 .../main/webapp/resources/machine/_editMachine.zul    |  1 +
 .../src/main/webapp/resources/worker/_edition.zul     |  1 +
 .../src/main/webapp/scenarios/_edition.zul            |  1 +
 .../src/main/webapp/users/_editProfile.zul            |  1 +
 .../src/main/webapp/users/_editUser.zul               |  1 +
 .../main/webapp/workreports/_editWorkReportType.zul   |  1 +
 .../src/main/webapp/workreports/workReportTypes.zul   |  2 +-
 21 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
index 8f62605b8..b64618946 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
@@ -50,6 +50,7 @@ import org.zkoss.zul.Treecell;
 import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.TreeitemRenderer;
 import org.zkoss.zul.Treerow;
+import org.zkoss.zul.api.Caption;
 import org.zkoss.zul.api.Window;
 
 /**
@@ -519,7 +520,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
                 throw new IllegalStateException(
                         "You should be in creation or edition mode to use this method");
             }
-            editWindow.setTitle(title);
+            ((Caption) editWindow.getFellow("caption")).setLabel(title);
         }
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java
index a62581aa6..ab2ef82ff 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java
@@ -28,6 +28,7 @@ import org.navalplanner.business.common.exceptions.ValidationException;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.api.Caption;
 import org.zkoss.zul.api.Window;
 
 /**
@@ -116,23 +117,25 @@ public abstract class BaseCRUDController<T extends IHumanIdentifiable> extends
                     "You should be editing one entity in order to use this method");
         }
 
+        String title;
+
         String humanId = entityBeingEdited.getHumanId();
         switch (state) {
         case CREATE:
             if (StringUtils.isEmpty(humanId)) {
-                editWindow.setTitle(_("Create {0}", getEntityType()));
+                title = _("Create {0}", getEntityType());
             } else {
-                editWindow.setTitle(_("Create {0}: {1}", getEntityType(),
-                        humanId));
+                title = _("Create {0}: {1}", getEntityType(), humanId);
             }
             break;
         case EDIT:
-            editWindow.setTitle(_("Edit {0}: {1}", getEntityType(), humanId));
+            title = _("Edit {0}: {1}", getEntityType(), humanId);
             break;
         default:
             throw new IllegalStateException(
                     "You should be in creation or edition mode to use this method");
         }
+        ((Caption) editWindow.getFellow("caption")).setLabel(title);
     }
 
     /**
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index 0e972abde..4185840c4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -77,6 +77,7 @@ import org.zkoss.zul.RowRenderer;
 import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.Tab;
 import org.zkoss.zul.Textbox;
+import org.zkoss.zul.api.Caption;
 import org.zkoss.zul.api.Window;
 
 /**
@@ -320,7 +321,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
 
     private void showEditWindow(String title) {
         personalDataTab.setSelected(true);
-        editWindow.setTitle(title);
+        ((Caption) editWindow.getFellow("caption")).setLabel(title);
         getVisibility().showOnly(editWindow);
         Util.reloadBindings(editWindow);
     }
@@ -909,7 +910,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
                 throw new IllegalStateException(
                         "You should be in creation or edition mode to use this method");
             }
-            editWindow.setTitle(title);
+            ((Caption) editWindow.getFellow("caption")).setLabel(title);
         }
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
index 5fd9c1d56..e8b6942ee 100644
--- a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
@@ -20,6 +20,7 @@
 -->
 
 <window id="${arg.top_id}" title="${arg.title}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Edit')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index d23f3a06d..a71be43f5 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -20,7 +20,7 @@
 -->
 
 <window id="${arg.top_id}" xmlns:w="client">
-
+  <caption id="caption" sclass="caption-title" />
   <tabbox sclass="calendar-tabbox">
     <tabs>
       <tab label="${i18n:_('Calendar data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 2c7e3c742..404bd3758 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -449,6 +449,10 @@ div.z-row-cnt {
     background-position: 0px 3px;
 }
 
+.caption-title .z-caption-l {
+    font-size: 18px;
+}
+
 .z-tabs-scroll .z-tabs-cnt {
     background: #FAFDFE none repeat scroll 0 0;
     border-bottom: 1px solid #7EAAC6;
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul b/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
index bee057d8d..bb5268fc8 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul
@@ -21,6 +21,7 @@
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Category data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
index 7b6db07cf..89372afdb 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul
@@ -21,6 +21,7 @@
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Type data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul b/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul
index f6ff2aa20..7e598c996 100644
--- a/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul
+++ b/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul
@@ -20,6 +20,7 @@
 -->
 
 <window id="${arg.id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Edit')}"></tab>
@@ -89,4 +90,4 @@
         label="${i18n:_('Cancel')}"
         sclass="cancel-button global-action"/>
 
-</window>
\ No newline at end of file
+</window>
diff --git a/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
index 49b645d11..a876af9ca 100644
--- a/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
+++ b/navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
@@ -21,6 +21,7 @@
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
 
     <tabbox>
         <tabs>
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 788eebe84..d10028df0 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -20,6 +20,7 @@
 -->
 
 <window id="${arg.id}" visible="false">
+    <caption id="caption" sclass="caption-title" />
     <!--  Messages for user -->
     <vbox id="messagesContainer"/>
 
diff --git a/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul b/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
index ef7b9a1e0..76bf07baa 100644
--- a/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul
@@ -19,6 +19,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>
  -->
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Edit')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul b/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
index bde0ca074..320bb531a 100644
--- a/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
+++ b/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
@@ -20,6 +20,7 @@
 -->
 
 <window id="${arg.id}" visible="false">
+    <caption id="caption" sclass="caption-title" />
     <!--  Messages for user -->
     <vbox id="messagesContainer"/>
 
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
index 132cca926..e6580cab5 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
@@ -22,6 +22,7 @@
 <?component name="criterionsTree" inline="true" macroURI="_criterionsTree.zul"?>
 
 <window id="${arg.id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Edit')}" width="850"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
index aedcc213d..949a86a3a 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
@@ -24,6 +24,7 @@
 <?component name="machineConfigurationUnits" inline="true" macroURI="_machineConfigurationUnits.zul"?>
 <?component name="costCategoryAssignment" inline="true" macroURI="../_costCategoryAssignment.zul"?>
 <window id="editWindow" >
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab id="tbMachineData" label="${i18n:_('Machine data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
index f118ddccc..d45b4c5d0 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -25,6 +25,7 @@
 <?component name="criterions" inline="true" macroURI="../_criterions.zul"?>
 <?component name="costCategoryAssignment" inline="true" macroURI="../_costCategoryAssignment.zul"?>
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab id="personalDataTab" label="${i18n:_('Personal data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/scenarios/_edition.zul b/navalplanner-webapp/src/main/webapp/scenarios/_edition.zul
index 5fef633a6..c2259870b 100644
--- a/navalplanner-webapp/src/main/webapp/scenarios/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/scenarios/_edition.zul
@@ -20,6 +20,7 @@
 -->
 
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
 
     <grid  fixedLayout="true" style="margin-bottom: 10px;">
         <columns>
diff --git a/navalplanner-webapp/src/main/webapp/users/_editProfile.zul b/navalplanner-webapp/src/main/webapp/users/_editProfile.zul
index b31b62e96..4f48dc35b 100644
--- a/navalplanner-webapp/src/main/webapp/users/_editProfile.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_editProfile.zul
@@ -21,6 +21,7 @@
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('Profile data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/users/_editUser.zul b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
index 2763238fd..2a16c4123 100644
--- a/navalplanner-webapp/src/main/webapp/users/_editUser.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_editUser.zul
@@ -21,6 +21,7 @@
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
 <window id="${arg.top_id}">
+    <caption id="caption" sclass="caption-title" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('User data')}"></tab>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
index d26f731d6..c374671ef 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
@@ -21,6 +21,7 @@
 
 <?component name="sortFieldsAndLabels" inline="true" macroURI="_sortFieldsAndLabels.zul"?>
 <window id="${arg.top_id}" title="${arg.title}" >
+    <caption id="caption" sclass="caption-title" />
 
     <tabbox>
         <tabs>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
index db25b3f54..940175116 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
@@ -33,7 +33,7 @@
         apply="org.navalplanner.web.workreports.WorkReportTypeCRUDController">
         <vbox id="messagesContainer"></vbox>
         <list top_id="listWindow" />
-        <edition top_id="editWindow" title="${i18n:_('Edit Work Report Type')}"
+        <edition top_id="editWindow"
             save_button_label="${i18n:_('Save')}"
             saveAndContinue_button_label="${i18n:_('Save &amp; Continue')}"
             cancel_button_label="${i18n:_('Cancel')}" />