You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/02/04 04:21:21 UTC
svn commit: r1067073 [2/2] - in /ofbiz/trunk: applications/product/data/
applications/product/data/helpdata/ applications/product/entitydef/
applications/product/script/org/ofbiz/product/imagemanagement/
applications/product/servicedef/ applications/pr...
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml?rev=1067073&r1=1067072&r2=1067073&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductAdditionalViewData.xml Fri Feb 4 03:21:17 2011
@@ -19,35 +19,59 @@ under the License.
-->
<entity-engine-xml>
- <DataResource dataResourceId="GZ-2644-Add1" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/web_browser2.png" />
- <Content contentId="GZ-2644-Add1-CTNT" contentTypeId="DOCUMENT" dataResourceId="GZ-2644-Add1" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="GZ-2644" contentId="GZ-2644-Add1-CTNT" productContentTypeId="ADDITIONAL_IMAGE_1" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="GZ-2644-Add1" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser2.png" objectInfo="/images/products/additional/web_browser2.png" />
+ <Content contentId="GZ-2644-Add1-CTNT" contentTypeId="DOCUMENT" contentName="web_browser2.png" dataResourceId="GZ-2644-Add1" statusId="IM_APPROVED"/>
+ <ProductContent productId="GZ-2644" contentId="GZ-2644-Add1-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="Y"/>
+ <DataResource dataResourceId="GZ-2644-Add1-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser2.png" objectInfo="/images/products/additional/web_browser2.png" />
+ <Content contentId="GZ-2644-Add1-CTNT-T" contentTypeId="DOCUMENT" contentName="web_browser2.png" dataResourceId="GZ-2644-Add1-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="GZ-2644-Add1-CTNT" contentIdTo="GZ-2644-Add1-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="GZ-2644-Add2" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/web_browser3.png" />
- <Content contentId="GZ-2644-Add2-CTNT" contentTypeId="DOCUMENT" dataResourceId="GZ-2644-Add2" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="GZ-2644" contentId="GZ-2644-Add2-CTNT" productContentTypeId="ADDITIONAL_IMAGE_2" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="GZ-2644-Add2" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser3.png" objectInfo="/images/products/additional/web_browser3.png" />
+ <Content contentId="GZ-2644-Add2-CTNT" contentTypeId="DOCUMENT" contentName="web_browser3.png" dataResourceId="GZ-2644-Add2" statusId="IM_APPROVED"/>
+ <ProductContent productId="GZ-2644" contentId="GZ-2644-Add2-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="N"/>
+ <DataResource dataResourceId="GZ-2644-Add2-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser3.png" objectInfo="/images/products/additional/web_browser3.png" />
+ <Content contentId="GZ-2644-Add2-CTNT-T" contentTypeId="DOCUMENT" contentName="web_browser3.png" dataResourceId="GZ-2644-Add2-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="GZ-2644-Add2-CTNT" contentIdTo="GZ-2644-Add2-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="GZ-2644-Add3" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/web_browser4.png" />
- <Content contentId="GZ-2644-Add3-CTNT" contentTypeId="DOCUMENT" dataResourceId="GZ-2644-Add3" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="GZ-2644" contentId="GZ-2644-Add3-CTNT" productContentTypeId="ADDITIONAL_IMAGE_3" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="GZ-2644-Add3" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser4.png" objectInfo="/images/products/additional/web_browser4.png" />
+ <Content contentId="GZ-2644-Add3-CTNT" contentTypeId="DOCUMENT" contentName="web_browser4.png" dataResourceId="GZ-2644-Add3" statusId="IM_APPROVED"/>
+ <ProductContent productId="GZ-2644" contentId="GZ-2644-Add3-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="N"/>
+ <DataResource dataResourceId="GZ-2644-Add3-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser4.png" objectInfo="/images/products/additional/web_browser4.png" />
+ <Content contentId="GZ-2644-Add3-CTNT-T" contentTypeId="DOCUMENT" contentName="web_browser4.png" dataResourceId="GZ-2644-Add3-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="GZ-2644-Add3-CTNT" contentIdTo="GZ-2644-Add3-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="GZ-2644-Add4" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/web_browser5.png" />
- <Content contentId="GZ-2644-Add4-CTNT" contentTypeId="DOCUMENT" dataResourceId="GZ-2644-Add4" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="GZ-2644" contentId="GZ-2644-Add4-CTNT" productContentTypeId="ADDITIONAL_IMAGE_4" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="GZ-2644-Add4" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser5.png" objectInfo="/images/products/additional/web_browser5.png" />
+ <Content contentId="GZ-2644-Add4-CTNT" contentTypeId="DOCUMENT" contentName="web_browser5.png" dataResourceId="GZ-2644-Add4" statusId="IM_APPROVED"/>
+ <ProductContent productId="GZ-2644" contentId="GZ-2644-Add4-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="N"/>
+ <DataResource dataResourceId="GZ-2644-Add1-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="web_browser5.png" objectInfo="/images/products/additional/web_browser5.png" />
+ <Content contentId="GZ-2644-Add4-CTNT-T" contentTypeId="DOCUMENT" contentName="web_browser5.png" dataResourceId="GZ-2644-Add1-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="GZ-2644-Add4-CTNT" contentIdTo="GZ-2644-Add4-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="WG-5569-Add1" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/cellphone_shandy2.png" />
- <Content contentId="WG-5569-Add1-CTNT" contentTypeId="DOCUMENT" dataResourceId="WG-5569-Add1" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="WG-5569" contentId="WG-5569-Add1-CTNT" productContentTypeId="ADDITIONAL_IMAGE_1" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="WG-5569-Add1" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy2.png" objectInfo="/images/products/additional/cellphone_shandy2.png" />
+ <Content contentId="WG-5569-Add1-CTNT" contentTypeId="DOCUMENT" contentName="cellphone_shandy2.png" dataResourceId="WG-5569-Add1" statusId="IM_APPROVED"/>
+ <ProductContent productId="WG-5569" contentId="WG-5569-Add1-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="Y"/>
+ <DataResource dataResourceId="GZ-2644-Add1-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy2.png" objectInfo="/images/products/additional/cellphone_shandy2.png" />
+ <Content contentId="WG-5569-Add1-CTNT-T" contentTypeId="DOCUMENT" contentName="cellphone_shandy2.png" dataResourceId="GZ-2644-Add1-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="WG-5569-Add1-CTNT" contentIdTo="WG-5569-Add1-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="WG-5569-Add2" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/cellphone_shandy3.png" />
- <Content contentId="WG-5569-Add2-CTNT" contentTypeId="DOCUMENT" dataResourceId="WG-5569-Add2" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="WG-5569" contentId="WG-5569-Add2-CTNT" productContentTypeId="ADDITIONAL_IMAGE_2" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="WG-5569-Add2" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy3.png" objectInfo="/images/products/additional/cellphone_shandy3.png" />
+ <Content contentId="WG-5569-Add2-CTNT" contentTypeId="DOCUMENT" contentName="cellphone_shandy3.png" dataResourceId="WG-5569-Add2" statusId="IM_APPROVED"/>
+ <ProductContent productId="WG-5569" contentId="WG-5569-Add2-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="N"/>
+ <DataResource dataResourceId="WG-5569-Add2-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy3.png" objectInfo="/images/products/additional/cellphone_shandy3.png" />
+ <Content contentId="WG-5569-Add2-CTNT-T" contentTypeId="DOCUMENT" contentName="cellphone_shandy3.png" dataResourceId="WG-5569-Add2-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="WG-5569-Add2-CTNT" contentIdTo="WG-5569-Add2-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="WG-5569-Add3" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/cellphone_shandy4.png" />
- <Content contentId="WG-5569-Add3-CTNT" contentTypeId="DOCUMENT" dataResourceId="WG-5569-Add3" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="WG-5569" contentId="WG-5569-Add3-CTNT" productContentTypeId="ADDITIONAL_IMAGE_3" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="WG-5569-Add3" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy4.png" objectInfo="/images/products/additional/cellphone_shandy4.png" />
+ <Content contentId="WG-5569-Add3-CTNT" contentTypeId="DOCUMENT" contentName="cellphone_shandy4.png" dataResourceId="WG-5569-Add3" statusId="IM_APPROVED"/>
+ <ProductContent productId="WG-5569" contentId="WG-5569-Add3-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="N"/>
+ <DataResource dataResourceId="WG-5569-Add3-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy4.png" objectInfo="/images/products/additional/cellphone_shandy4.png" />
+ <Content contentId="WG-5569-Add3-CTNT-T" contentTypeId="DOCUMENT" contentName="cellphone_shandy4.png" dataResourceId="WG-5569-Add3-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="WG-5569-Add3-CTNT" contentIdTo="WG-5569-Add3-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
- <DataResource dataResourceId="WG-5569-Add4" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" objectInfo="/images/products/additional/cellphone_shandy5.png" />
- <Content contentId="WG-5569-Add4-CTNT" contentTypeId="DOCUMENT" dataResourceId="WG-5569-Add4" statusId="CTNT_IN_PROGRESS"/>
- <ProductContent productId="WG-5569" contentId="WG-5569-Add4-CTNT" productContentTypeId="ADDITIONAL_IMAGE_4" fromDate="2001-05-13 12:00:00.0"/>
+ <DataResource dataResourceId="WG-5569-Add4" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy5.png" objectInfo="/images/products/additional/cellphone_shandy5.png" />
+ <Content contentId="WG-5569-Add4-CTNT" contentTypeId="DOCUMENT" contentName="cellphone_shandy5.png" dataResourceId="WG-5569-Add4" statusId="IM_APPROVED"/>
+ <ProductContent productId="WG-5569" contentId="WG-5569-Add4-CTNT" productContentTypeId="IMAGE" fromDate="2001-05-13 12:00:00.0" exclude="N" thumbnail="N"/>
+ <DataResource dataResourceId="WG-5569-Add4-T" dataResourceTypeId="SHORT_TEXT" dataTemplateTypeId="NONE" dataResourceName="cellphone_shandy5.png" objectInfo="/images/products/additional/cellphone_shandy5.png" />
+ <Content contentId="WG-5569-Add4-CTNT-T" contentTypeId="DOCUMENT" contentName="cellphone_shandy5.png" dataResourceId="WG-5569-Add4-T" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="WG-5569-Add4-CTNT" contentIdTo="WG-5569-Add4-CTNT-T" contentAssocTypeId="IMAGE_THUMBNAIL" fromDate="2001-05-13 12:00:00.0"/>
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1067073&r1=1067072&r2=1067073&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Fri Feb 4 03:21:17 2011
@@ -343,88 +343,81 @@ ${virtualVariantJavaScript?if_exists}
<hr />
<div id="productImageBox">
- <#-- Product image/name/price -->
- <div id="detailImageBox">
- <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")?if_exists />
- <#-- remove the next two lines to always display the virtual image first (virtual images must exist) -->
- <#if firstLargeImage?has_content>
- <#assign productLargeImageUrl = firstLargeImage />
- </#if>
- <#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail('${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}');"><img id="detailImage" src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" alt="" /></a>
- <input type="hidden" id="originalImage" name="originalImage" value="<@o...@ofbizContentUrl>" />
- </#if>
- <#if !productLargeImageUrl?string?has_content>
- <img id="detailImage" src="/images/defaultImage.jpg" name="mainImage" alt="" />
- </#if>
- </div>
- <div id="additionalImageBox">
- <#if productAdditionalImage1?string?has_content>
- <#assign productAdditionalImage1Small = productContentWrapper.get("XTRA_IMG_1_SMALL")?if_exists />
- <#assign productAdditionalImage1Large = productContentWrapper.get("XTRA_IMG_1_LARGE")?if_exists />
- <#assign productAdditionalImage1Detail = productContentWrapper.get("XTRA_IMG_1_DETAIL")?if_exists />
- <div class="additionalImage">
- <#if productAdditionalImage1Small?string?has_content && productAdditionalImage1Large?string?has_content>
- <#if productAdditionalImage1Detail?string?has_content>
- <a href="javascript:popupDetail('${productAdditionalImage1Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ <#assign userLoginSecurityGroup = delegator.findByAnd("UserLoginSecurityGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("groupId", "IMAGEADMIN"))>
+ <#if userLoginSecurityGroup != null && userLoginSecurityGroup?has_content>
+ <#-- Product image/name/price -->
+ <div id="detailImageBox">
+ <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")?if_exists />
+ <#-- remove the next two lines to always display the virtual image first (virtual images must exist) -->
+ <#if firstLargeImage?has_content>
+ <#assign productLargeImageUrl = firstLargeImage />
+ </#if>
+ <#if productLargeImageUrl?string?has_content>
+ <a href="javascript:popupDetail();"><img id="detailImage" src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a>
+ <input type="hidden" id="originalImage" name="originalImage" value="<@o...@ofbizContentUrl>" />
+ </#if>
+ <#if !productLargeImageUrl?string?has_content>
+ <img id="detailImage" src="/images/defaultImage.jpg" name="mainImage" alt="" />
</#if>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
- </#if>
</div>
- </#if>
- <#if productAdditionalImage2?string?has_content>
- <#assign productAdditionalImage2Small = productContentWrapper.get("XTRA_IMG_2_SMALL")?if_exists />
- <#assign productAdditionalImage2Large = productContentWrapper.get("XTRA_IMG_2_LARGE")?if_exists />
- <#assign productAdditionalImage2Detail = productContentWrapper.get("XTRA_IMG_2_DETAIL")?if_exists />
- <div class="additionalImage">
- <#if productAdditionalImage2Small?string?has_content && productAdditionalImage2Large?string?has_content>
- <#if productAdditionalImage2Detail?string?has_content>
- <a href="javascript:popupDetail('${productAdditionalImage2Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ <#-- Show Image Approved -->
+ <#assign productContentAndInfos = delegator.findByAnd("ProductContentAndInfo", {"productId", product.productId?if_exists, "productContentTypeId", "IMAGE", "statusId", "IM_APPROVED", "exclude", "N"}, Static["org.ofbiz.base.util.UtilMisc"].toList("defaultSequenceNum"))>
+ <div id="additionalImageBox">
+ <#if productContentAndInfos?has_content>
+ <#list productContentAndInfos as productContentAndInfo>
+ <#assign contentAssocs = delegator.findByAnd("ContentAssoc",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", productContentAndInfo.contentId?if_exists, "contentAssocTypeId", "IMAGE_THUMBNAIL"))/>
+ <#if contentAssocs?has_content>
+ <#list contentAssocs as contentAssoc>
+ <#assign ImageContent = delegator.findByPrimaryKey("Content", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentAssoc.contentIdTo))?if_exists>
+ <#assign contentDataResourceView = delegator.findByPrimaryKey("ContentDataResourceView", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentAssoc.contentIdTo, "drDataResourceId", ImageContent.dataResourceId))?if_exists>
+ <div class="additionalImage">
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ </div>
+ </#list>
+ </#if>
+ </#list>
</#if>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
- </#if>
- </div>
- </#if>
- <#if productAdditionalImage3?string?has_content>
- <#assign productAdditionalImage3Small = productContentWrapper.get("XTRA_IMG_3_SMALL")?if_exists />
- <#assign productAdditionalImage3Large = productContentWrapper.get("XTRA_IMG_3_LARGE")?if_exists />
- <#assign productAdditionalImage3Detail = productContentWrapper.get("XTRA_IMG_3_DETAIL")?if_exists />
- <div class="additionalImage">
- <#if productAdditionalImage3Small?string?has_content && productAdditionalImage3Large?string?has_content>
- <#if productAdditionalImage3Detail?string?has_content>
- <a href="javascript:popupDetail('${productAdditionalImage3Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ </div>
+ <#else>
+ <#-- Product image/name/price -->
+ <div id="detailImageBox">
+ <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")?if_exists />
+ <#-- remove the next two lines to always display the virtual image first (virtual images must exist) -->
+ <#if firstLargeImage?has_content>
+ <#assign productLargeImageUrl = firstLargeImage />
+ </#if>
+ <#if productLargeImageUrl?string?has_content>
+ <a href="javascript:popupDetail();"><img id="detailImage" src="<@o...@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" width="200" alt="" /></a>
+ <input type="hidden" id="originalImage" name="originalImage" value="<@o...@ofbizContentUrl>" />
+ </#if>
+ <#if !productLargeImageUrl?string?has_content>
+ <img id="detailImage" src="/images/defaultImage.jpg" name="mainImage" alt="" />
</#if>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
- </#if>
</div>
- </#if>
- <#if productAdditionalImage4?string?has_content>
- <#assign productAdditionalImage4Small = productContentWrapper.get("XTRA_IMG_4_SMALL")?if_exists />
- <#assign productAdditionalImage4Large = productContentWrapper.get("XTRA_IMG_4_LARGE")?if_exists />
- <#assign productAdditionalImage4Detail = productContentWrapper.get("XTRA_IMG_4_DETAIL")?if_exists />
- <div class="additionalImage">
- <#if productAdditionalImage4Small?string?has_content && productAdditionalImage4Large?string?has_content>
- <#if productAdditionalImage4Detail?string?has_content>
- <a href="javascript:popupDetail('${productAdditionalImage4Detail}');" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt="" /></a>
+ <div id="additionalImageBox">
+ <#if productAdditionalImage1?string?has_content>
+ <div class="additionalImage">
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </div>
+ </#if>
+ <#if productAdditionalImage2?string?has_content>
+ <div class="additionalImage">
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </div>
+ </#if>
+ <#if productAdditionalImage3?string?has_content>
+ <div class="additionalImage">
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </div>
+ </#if>
+ <#if productAdditionalImage4?string?has_content>
+ <div class="additionalImage">
+ <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
+ </div>
</#if>
- <#else>
- <a href="javascript:void(0);" swapDetail="<@o...@ofbizContentUrl>"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" width="200" alt="" /></a>
- </#if>
</div>
- </#if>
- </div>
- </div>
+ </#if>
+
<div id="productDetailBox">
<h2>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</h2>
<div>${productContentWrapper.get("DESCRIPTION")?if_exists}</div>