svn commit: r1737627 - /ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl

Author: jleroux
Date: Mon Apr  4 06:38:44 2016
New Revision: 1737627

URL: http://svn.apache.org/viewvc?rev=1737627&view=rev
Log:
A modified patch from James Yong's for "Redundant image in popup (tooltip)" - https://issues.apache.org/jira/browse/OFBIZ-6968

Problem
=======
Go to https://localhost:8443/ecommerce/
Popup (tooltip) contains the same image as the target.
Pointless to repeat the same content in a popup (tooltip).

jleroux: I added the introduction of LARGE_IMAGE_URL and updated to reflect the productsummary.ftl location change


Modified:
    ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl

Modified: ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl?rev=1737627&r1=1737626&r2=1737627&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl Mon Apr  4 06:38:44 2016
@@ -63,7 +63,9 @@ ${virtualJavaScript!}
         <#assign prodCatMem = requestAttributes.productCategoryMember>
     </#if>
     <#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL", "url")!>
+    <#assign largeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL", "url")!>
     <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+    <#if !largeImageUrl?string?has_content><#assign largeImageUrl = "/images/defaultImage.jpg"></#if>
     <#-- end variable setup -->
     <#assign productInfoLinkId = "productInfoLink">
     <#assign productInfoLinkId = productInfoLinkId + product.productId/>
@@ -76,14 +78,18 @@ ${virtualJavaScript!}
             </a>
         </div>
         <div id="${productDetailId}" class="popup" style="display:none;">
-          <table>
-            <tr valign="top">
-              <td>
-                <img src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br />
-                ${uiLabelMap.ProductProductId}   : ${product.productId!}<br />
-                ${uiLabelMap.ProductProductName} : ${product.productName!}<br />
-                ${uiLabelMap.CommonDescription}  : ${productContentWrapper.get("DESCRIPTION", "html")!}
-              </td>
+          <table class="ui-widget">
+            <tr>
+              <th><img src="<@ofbizContentUrl>${contentPathPrefix!}${largeImageUrl}</@ofbizContentUrl>" alt="Large Image"/></th><td>&nbsp;</td>
+            </tr>
+            <tr>
+              <th>${uiLabelMap.ProductProductId}</th><td>${product.productId!}</td>
+            </tr>
+            <tr>
+              <th>${uiLabelMap.ProductProductName}</th><td>${productContentWrapper.get("PRODUCT_NAME", "html")!}</td>
+            </tr>
+            <tr>
+              <th>${uiLabelMap.CommonDescription}</th><td>${productContentWrapper.get("DESCRIPTION", "html")!}</td>
             </tr>
           </table>
         </div>
@@ -93,7 +99,8 @@ ${virtualJavaScript!}
               content: function(){
                   return this.getAttribute("title");
               },
-              tooltipClass: "popup",  
+              tooltipClass: "popup",
+              track: true
           });
         </script>
         <div class="productbuy">