You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/09/05 23:12:34 UTC
svn commit: r811714 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/entry/catalog/
specialpurpose/ecommerce/webapp/ecommerce/catalog/
Author: jleroux
Date: Sat Sep 5 21:12:31 2009
New Revision: 811714
URL: http://svn.apache.org/viewvc?rev=811714&view=rev
Log:
Complete r811708
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=811714&r1=811713&r2=811714&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sat Sep 5 21:12:31 2009
@@ -71,8 +71,8 @@
hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
alert(hack.innerHTML);
return;
- return;
}
+ detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/");
popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</...@ofbizUrl>", 'detailImage', '400', '550');
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=811714&r1=811713&r2=811714&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Sat Sep 5 21:12:31 2009
@@ -39,8 +39,8 @@
hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
alert(hack.innerHTML);
return;
- return;
}
+ window[fieldName] = window[fieldName].replace(/\&\#47;/g, "/");
popUp("<@ofbizUrl>detailImage?detail=" + window[fieldName] + "</...@ofbizUrl>", 'detailImage', '400', '550');
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=811714&r1=811713&r2=811714&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Sep 5 21:12:31 2009
@@ -109,8 +109,8 @@
hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
alert(hack.innerHTML);
return;
- return;
}
+ detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/");
popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</...@ofbizUrl>", 'detailImage', '400', '550');
}
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=811714&r1=811713&r2=811714&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Sat Sep 5 21:12:31 2009
@@ -71,9 +71,8 @@
hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
alert(hack.innerHTML);
return;
- return;
}
- alert(detailImageUrl);
+ detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/");
popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</...@ofbizUrl>", 'detailImage', '400', '550');
}