From 84ac0b2def6340f50309cf883cd3cb6118665848 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Mon, 13 Dec 2010 21:18:44 +0100
Subject: [PATCH] Tooltip iframe src loaded on demand

FEA: ItEr65S11TooltipPerformance
---
 .../src/main/webapp/common/configuration.zul     |  2 +-
 .../main/webapp/common/layout/_customMenu.zul    | 16 ++++++++++------
 .../webapp/qualityforms/_editQualityForm.zul     |  7 +++++--
 .../webapp/resources/machine/_editMachine.zul    |  7 +++++--
 .../main/webapp/resources/worker/_edition.zul    |  7 +++++--
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index fb604980a..cad0184c4 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -67,7 +67,7 @@
                                     mold="select" />
                             </row>
                             <row>
-                                <label value="${i18n:_('Company logo')}" />
+                                <label value="${i18n:_('Company logo URL')}" />
                                 <textbox id="companyLogoURL"
                                     value="@{configurationController.companyLogoURL}" width="300px"/>
                             </row>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
index 4c1d3ee2c..83623c1eb 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
@@ -82,13 +82,17 @@
   </n:tr>
     </n:table>
 
-    <popup id="help-popup" width="700px" style="position:relative;right:190px;padding:10px">
-        <iframe id="iframe" src="/help/${i18n:_('en')}/${menuContainer.helpLink}" width="670px" height="450px"
-            style="border: 1px solid gray" />
+    <zscript><![CDATA[
+        i18nHelpLink = "/help/" + org.navalplanner.web.I18nHelper._("en") + "/" + menuContainer.getHelpLink();
+        i18nAboutLink = "/help/" + org.navalplanner.web.I18nHelper._("en") + "/20-acerca-de.html";
+    ]]></zscript>
+    <popup id="help-popup" width="700px" style="position:relative;right:190px;padding:10px"
+      onOpen="helpIframe.setSrc(i18nHelpLink)">
+        <iframe id="helpIframe" width="670px" height="450px" style="border: 1px solid gray" />
     </popup>
-    <popup id="help-about" width="700px" style="position:relative;right:190px;padding:10px">
-        <iframe id="iframe-about" src="/help/${i18n:_('en')}/20-acerca-de.html" width="670px" height="350px"
-            style="border: 1px solid gray" />
+    <popup id="help-about" width="700px" style="position:relative;right:190px;padding:10px"
+        onOpen="aboutIframe.setSrc(i18nAboutLink)">
+        <iframe id="aboutIframe" width="670px" height="350px" style="border: 1px solid gray" />
     </popup>
 
 </div>
diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul b/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
index 6fc5806af..7933142d3 100644
--- a/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
+++ b/navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul
@@ -135,8 +135,11 @@
             sclass="cancel-button global-action"/>
     </hbox>
 
-    <popup id="quality-forms-popup" width="700px" >
-        <iframe id="iframe" src="/help/${i18n:_('en')}/12-formularios-calidad.html#administracion-de-formularios-de-calidade" width="100%" />
+    <zscript><![CDATA[
+        i18iframe = "/help/" + org.navalplanner.web.I18nHelper._("en") + "/12-formularios-calidad.html#administracion-de-formularios-de-calidade";
+    ]]></zscript>
+    <popup id="quality-forms-popup" width="700px" onOpen='iframe.setSrc(i18iframe)'>
+        <iframe id="iframe" width="100%" />
     </popup>
 
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
index f67acced4..9e9716297 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
@@ -101,8 +101,11 @@
         onClick="controller.cancel();"
         sclass="cancel-button global-action"/>
 
-    <popup id="limiting-resources-popup" width="700px" >
-        <iframe id="iframe" src="/help/${i18n:_('en')}/05-recursos.html#recursos-limitantes" width="100%" />
+    <zscript><![CDATA[
+        i18iframe = "/help/" + org.navalplanner.web.I18nHelper._("en") + "/05-recursos.html#recursos-limitantes";
+    ]]></zscript>
+    <popup id="limiting-resources-popup" width="700px" onOpen='iframe.setSrc(i18iframe)'>
+        <iframe id="iframe" width="100%" />
     </popup>
 
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
index 947e4a6ea..67ae457ef 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -114,8 +114,11 @@
     <button onClick="controller.cancel();"
         label="${arg.cancel_button_label}" sclass="cancel-button global-action"/>
 
-    <popup id="limiting-resources-popup" width="700px" >
-        <iframe id="iframe" src="/help/${i18n:_('en')}/05-recursos.html#recursos-limitantes" width="100%" />
+    <zscript><![CDATA[
+        i18iframe = "/help/" + org.navalplanner.web.I18nHelper._("en") + "/05-recursos.html#recursos-limitantes";
+    ]]></zscript>
+    <popup id="limiting-resources-popup" width="700px" onOpen='iframe.setSrc(i18iframe)'>
+        <iframe id="iframe" width="100%" />
     </popup>
 
 </window>