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/02/21 13:25:05 UTC
svn commit: r746490 - in /ofbiz/trunk:
applications/ecommerce/webapp/ecommerce/cart/
applications/ecommerce/webapp/ecommerce/catalog/
applications/ecommerce/webapp/ecommerce/order/
applications/order/webapp/ordermgr/entry/catalog/ applications/order/we...
Author: jleroux
Date: Sat Feb 21 12:25:04 2009
New Revision: 746490
URL: http://svn.apache.org/viewvc?rev=746490&view=rev
Log:
We need this since now ProductContentWrapper and categoryContentWrapper return a StringUtil.StringWrapper, else "Photo not available" image never shows
Certainly more to come...
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
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/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl Sat Feb 21 12:25:04 2009
@@ -216,8 +216,8 @@
<#assign parentProductId = cartLine.getProductId()/>
</#if>
<#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
- <#if !smallImageUrl?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
- <#if smallImageUrl?has_content>
+ <#if !smallsmallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+ <#if smallsmallImageUrl?string?has_content>
<a href="<@o...@ofbizUrl>">
<img src="<@o...@ofbizContentUrl>" width="50" class="imageborder" border="0"/>
</a>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl Sat Feb 21 12:25:04 2009
@@ -40,7 +40,7 @@
</#if>
<div class="productcategorylink">
- <#if imageUrl?has_content>
+ <#if smallImageUrl?string?has_content>
<div class="smallimage"><a href="${linkUrl}"><img src="<@o...@ofbizContentUrl>" alt="${titleText?default("Link Image")}"/></a></div>
</#if>
<#if titleText?has_content>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Sat Feb 21 12:25:04 2009
@@ -201,7 +201,7 @@
<#if firstLargeImage?has_content>
<#assign productLargeImageUrl = firstLargeImage>
</#if>
- <#if productLargeImageUrl?has_content>
+ <#if productLargesmallImageUrl?string?has_content>
<a href="javascript:popupDetail();"><img src='<@o...@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left'></a>
</#if>
</td>
@@ -403,10 +403,10 @@
<#assign swatchProduct = imageMap.get(key)>
<#if swatchProduct?has_content && indexer < maxIndex>
<#assign imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)?if_exists>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists>
</#if>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sat Feb 21 12:25:04 2009
@@ -287,7 +287,7 @@
<#if firstLargeImage?has_content>
<#assign productLargeImageUrl = firstLargeImage>
</#if>
- <#if productLargeImageUrl?has_content>
+ <#if productLargesmallImageUrl?string?has_content>
<a href="javascript:popupDetail();"><img src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" border="0" width="200"></a>
</#if>
</td>
@@ -573,10 +573,10 @@
<#assign swatchProduct = imageMap.get(key)>
<#if swatchProduct?has_content && indexer < maxIndex>
<#assign imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)?if_exists>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists>
</#if>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Sat Feb 21 12:25:04 2009
@@ -55,7 +55,7 @@
<#assign parentProductId = cartLine.getProductId()/>
</#if>
<#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
- <#if !smallImageUrl?has_content><#assign smallImageUrl = ""></#if>
+ <#if !smallsmallImageUrl?string?has_content><#assign smallImageUrl = ""></#if>
</#if>
<tr id="cartItemDisplayRow_${cartLineIndex}">
<td><div><img src="<@o...@ofbizContentUrl>" align="center" height="20" hspace="0" vspace="0" width="20"></div></td>
@@ -133,8 +133,8 @@
<#assign parentProductId = cartLine.getProductId()/>
</#if>
<#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
- <#if !smallImageUrl?has_content><#assign smallImageUrl = ""></#if>
- <#if smallImageUrl?has_content>
+ <#if !smallsmallImageUrl?string?has_content><#assign smallImageUrl = ""></#if>
+ <#if smallsmallImageUrl?string?has_content>
<img src="<@o...@ofbizContentUrl>" border="0" height="50" hspace="0" vspace="0" width="50"/>
</#if>
</#if>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl Sat Feb 21 12:25:04 2009
@@ -175,8 +175,8 @@
<#-- product item -->
<#-- start code to display a small image of the product -->
<#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
- <#if !smallImageUrl?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
- <#if smallImageUrl?has_content>
+ <#if !smallsmallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+ <#if smallsmallImageUrl?string?has_content>
<a href="<@o...@ofbizUrl>">
<img src="<@o...@ofbizContentUrl>" width="50" class="imageborder" border="0"/>
</a>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sat Feb 21 12:25:04 2009
@@ -68,9 +68,9 @@
</#if>
<#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/>
<#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/>
- <#if categoryImageUrl?has_content || longDescription?has_content>
+ <#if categorysmallImageUrl?string?has_content || longDescription?has_content>
<div>
- <#if categoryImageUrl?has_content>
+ <#if categorysmallImageUrl?string?has_content>
<#assign height=100/>
<img src='<@o...@ofbizContentUrl>' vspace='5' hspace='5' border='1' height='${height}' align='left'/>
</#if>
@@ -96,7 +96,7 @@
<#assign numCol = numCol?number>
<#assign tabCol = 1>
<div
- <#if categoryImageUrl?has_content>
+ <#if categorysmallImageUrl?string?has_content>
style="position: relative; margin-top: ${height}px;"
</#if>
class="productsummary-container<#if (numCol?int > 1)> matrix</#if>">
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=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sat Feb 21 12:25:04 2009
@@ -207,7 +207,7 @@
<#if firstLargeImage?has_content>
<#assign productLargeImageUrl = firstLargeImage>
</#if>
- <#if productLargeImageUrl?has_content>
+ <#if productLargesmallImageUrl?string?has_content>
<a href="javascript:popupDetail();"><img src='<@o...@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left'></a>
</#if>
</td>
@@ -403,10 +403,10 @@
<#assign swatchProduct = imageMap.get(key)>
<#if swatchProduct?has_content && indexer < maxIndex>
<#assign imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)?if_exists>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists>
</#if>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
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=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Sat Feb 21 12:25:04 2009
@@ -259,7 +259,7 @@
<#if firstLargeImage?has_content>
<#assign productLargeImageUrl = firstLargeImage>
</#if>
- <#if productLargeImageUrl?has_content>
+ <#if productLargesmallImageUrl?string?has_content>
<input type="hidden" name="detailImage${inlineCounter}" value="${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"/>
<a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@o...@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' border='0' width='100' align='left'></a>
</#if>
@@ -363,10 +363,10 @@
<#assign swatchProduct = imageMap.get(key)>
<#if swatchProduct?has_content && indexer < maxIndex>
<#assign imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)?if_exists>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists>
</#if>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
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=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Feb 21 12:25:04 2009
@@ -287,7 +287,7 @@
<#if firstLargeImage?has_content>
<#assign productLargeImageUrl = firstLargeImage>
</#if>
- <#if productLargeImageUrl?has_content>
+ <#if productLargesmallImageUrl?string?has_content>
<a href="javascript:popupDetail();"><img src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" border="0" width="200"></a>
</#if>
</td>
@@ -566,10 +566,10 @@
<#assign swatchProduct = imageMap.get(key)>
<#if swatchProduct?has_content && indexer < maxIndex>
<#assign imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)?if_exists>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists>
</#if>
- <#if !imageUrl?has_content>
+ <#if !smallImageUrl?string?has_content>
<#assign imageUrl = "/images/defaultImage.jpg">
</#if>
<td align="center" valign="bottom">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Sat Feb 21 12:25:04 2009
@@ -24,7 +24,7 @@
<#assign prodCatMem = requestAttributes.productCategoryMember>
</#if>
<#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists>
- <#if !smallImageUrl?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+ <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
<#-- end variable setup -->
<#assign productInfoLinkId = "productInfoLink">
<#assign productInfoLinkId = productInfoLinkId + product.productId/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Sat Feb 21 12:25:04 2009
@@ -19,7 +19,7 @@
<#escape x as x?xml>
<fo:block text-align="left">
- <#if logoImageUrl?has_content><fo:external-graphic src="<@o...@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
+ <#if logosmallImageUrl?string?has_content><fo:external-graphic src="<@o...@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
</fo:block>
<fo:block font-size="8pt">
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl?rev=746490&r1=746489&r2=746490&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl Sat Feb 21 12:25:04 2009
@@ -92,8 +92,8 @@
<#assign parentProductId = cartLine.getProductId()/>
</#if>
<#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
- <#if !smallImageUrl?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
- <#if smallImageUrl?has_content>
+ <#if !smallsmallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
+ <#if smallsmallImageUrl?string?has_content>
<img src="<@o...@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0"/>
</#if>
<#-- end code to display a small image of the product -->