svn commit: r1840093 - in /ofbiz/ofbiz-framework/trunk/themes: common-theme/template/macro/ rainbowstone/template/macro/

[Deepak Dixit-5]

Author: deepak
Date: Wed Sep  5 07:16:21 2018
New Revision: 1840093

URL: http://svn.apache.org/viewvc?rev=1840093&view=rev
Log:
Improved: Use of layered-modal with parameter does not work
(OFBIZ-10511)
Thanks Arsalane Arrach for your contribution. Use " to escape the double quotation marks

Modified:
    ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
    ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlMenuMacroLibrary.ftl
    ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/macro/HtmlMenuMacroLibrary.ftl

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl?rev=1840093&r1=1840092&r2=1840093&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl Wed Sep  5 07:16:21 2018
@@ -803,17 +803,17 @@ Parameter: delegatorName, String, option
 </#macro>
 <#macro makeHyperlinkString hiddenFormName imgSrc title  alternate linkUrl description linkStyle="" event="" action="" targetParameters="" targetWindow="" confirmation="" uniqueItemName="" height="" width="" id="">
     <#if uniqueItemName?has_content>
-        <#local params = "{\"presentation\": \"layer\"">
+        <#local params = "{&quot;presentation&quot;: &quot;layer&quot;">
         <#if targetParameters?has_content>
           <#local parameterMap = targetParameters?eval>
           <#local parameterKeys = parameterMap?keys>
           <#list parameterKeys as key>
-            <#local params += ",\"${key}\": \"${parameterMap[key]}\"">
+            <#local params += ",&quot;${key}&quot;: &quot;${parameterMap[key]}&quot;">
           </#list>
         </#if>
         <#local params += "}">
         <a href="javascript:void(0);" id="${uniqueItemName}_link"
-           data-dialog-params='${params}'
+           data-dialog-params="${params}"
            data-dialog-width="${width}"
            data-dialog-height="${height}"
            data-dialog-url="${linkUrl}"

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlMenuMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlMenuMacroLibrary.ftl?rev=1840093&r1=1840092&r2=1840093&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlMenuMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlMenuMacroLibrary.ftl Wed Sep  5 07:16:21 2018
@@ -55,15 +55,15 @@ under the License.
 </form><#rt/>
   </#if>
   <#if uniqueItemName?has_content && "layered-modal" == linkType>
-    <#local params = "{\"presentation\":\"layer\" ">
+    <#local params = "{&quot;presentation&quot;:&quot;layer&quot; ">
     <#if parameterList?has_content>
       <#list parameterList as parameter>
-        <#local params += ",\"${parameter.name}\": \"${parameter.value}\"">
+        <#local params += ",&quot;${parameter.name}&quot;: &quot;${parameter.value}&quot;">
       </#list>
     </#if>
     <#local params += "}">
     <a href="javascript:void(0);" id="${uniqueItemName}_link"
-       data-dialog-params='${params}'
+       data-dialog-params="${params}"
        data-dialog-width="${width}"
        data-dialog-height="${height}"
        data-dialog-url="${linkUrl}"

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl?rev=1840093&r1=1840092&r2=1840093&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl Wed Sep  5 07:16:21 2018
@@ -67,7 +67,7 @@ under the License.
     <#-- If a label widget has one of the h1-h6 styles, then it is considered block level element.
          Otherwise it is considered an inline element. -->
     <#local idText = ""/>
-    <#if id?has_content><#local idText = " id=\"${id}\""/></#if>
+    <#if id?has_content><#local idText = " id=&quot;${id}&quot;"/></#if>
     <#if style?has_content>
       <#if style=="h1">
         <h1${idText}>${text}</h1>
@@ -108,10 +108,10 @@ under the License.
             <#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if>
         </a>
     <#else>
-        <#local params = "{\"presentation\":\"layer\" ">
+        <#local params = "{&quot;presentation&quot;:&quot;layer&quot; ">
         <#if parameterList?has_content>
           <#list parameterList as parameter>
-            <#local params += ",\"${parameter.name}\": \"${parameter.value}\"">
+            <#local params += ",&quot;${parameter.name}&quot;: &quot;${parameter.value}&quot;">
           </#list>
         </#if>
         <#local params += "}">

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/macro/HtmlMenuMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/macro/HtmlMenuMacroLibrary.ftl?rev=1840093&r1=1840092&r2=1840093&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/macro/HtmlMenuMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/macro/HtmlMenuMacroLibrary.ftl Wed Sep  5 07:16:21 2018
@@ -28,15 +28,15 @@ under the License.
     </form><#rt/>
     </#if>
     <#if uniqueItemName?has_content && "layered-modal" == linkType>
-      <#local params = "{\"presentation\":\"layer\" ">
+      <#local params = "{&quot;presentation&quot;:&quot;layer&quot; ">
       <#if parameterList?has_content>
         <#list parameterList as parameter>
-          <#local params += ",\"${parameter.name}\": \"${parameter.value}\"">
+          <#local params += ",&quot;${parameter.name}&quot;: &quot;${parameter.value}&quot;">
         </#list>
       </#if>
       <#local params += "}">
     <a href="javascript:void(0);" id="${uniqueItemName}_link"
-       data-dialog-params='${params}'
+       data-dialog-params="${params}"
        data-dialog-width="${width}"
        data-dialog-height="${height}"
        data-dialog-url="${linkUrl}"