Author: mor
Date: Fri Sep 18 03:59:03 2009
New Revision: 816465
URL: http://svn.apache.org/viewvc?rev=816465&view=rev
Log:
Markup cleanup, first pass.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
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=816465&r1=816464&r2=816465&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
Fri Sep 18 03:59:03 2009
@@ -17,13 +17,13 @@
under the License.
-->
<#-- variable setup -->
-<#assign price = priceMap?if_exists/>
+<#assign price = priceMap?if_exists />
<#-- end variable setup -->
<#-- virtual product javascript -->
${virtualJavaScript?if_exists}
-<script language="JavaScript" type="text/javascript">
-<!--
+<script type="text/javascript">
+//<![CDATA[
var detailImageUrl = null;
function setAddProductId(name) {
document.addform.add_product_id.value = name;
@@ -259,14 +259,14 @@
block2.style.display = "none";
}
</#if>
- //-->
+//]]>
</script>
<div id="productdetail">
-<#assign productAdditionalImage1 =
productContentWrapper.get("ADDITIONAL_IMAGE_1")?if_exists>
-<#assign productAdditionalImage2 =
productContentWrapper.get("ADDITIONAL_IMAGE_2")?if_exists>
-<#assign productAdditionalImage3 =
productContentWrapper.get("ADDITIONAL_IMAGE_3")?if_exists>
-<#assign productAdditionalImage4 =
productContentWrapper.get("ADDITIONAL_IMAGE_4")?if_exists>
+<#assign productAdditionalImage1 =
productContentWrapper.get("ADDITIONAL_IMAGE_1")?if_exists />
+<#assign productAdditionalImage2 =
productContentWrapper.get("ADDITIONAL_IMAGE_2")?if_exists />
+<#assign productAdditionalImage3 =
productContentWrapper.get("ADDITIONAL_IMAGE_3")?if_exists />
+<#assign productAdditionalImage4 =
productContentWrapper.get("ADDITIONAL_IMAGE_4")?if_exists />
<table border="0" cellpadding="2" cellspacing="0" width="100%">
<#-- Category next/previous -->
@@ -284,50 +284,50 @@
</tr>
</#if>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<#-- Product image/name/price -->
<tr>
<td valign="top" width="0">
- <#assign productLargeImageUrl =
productContentWrapper.get("LARGE_IMAGE_URL")?if_exists>
+ <#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>
+ <#assign productLargeImageUrl = firstLargeImage />
</#if>
<#if productLargeImageUrl?string?has_content>
- <a href="javascript:popupDetail();"><img id="detailImage"
src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>"
name="mainImage" vspace="5" hspace="5" border="0" width="200"/></a>
- <input type="hidden" id="originalImage" name="originalImage"
value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>"/>
+ <a href="javascript:popupDetail();"><img id="detailImage"
src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>"
name="mainImage" vspace="5" hspace="5" border="0" width="200" /></a>
+ <input type="hidden" id="originalImage" name="originalImage"
value="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>"
/>
</#if>
<#if !productLargeImageUrl?string?has_content>
- <img id="detailImage" src="/images/defaultImage.jpg" name="mainImage"/>
+ <img id="detailImage" src="/images/defaultImage.jpg" name="mainImage"
/>
</#if>
</td>
<td>
<#if productAdditionalImage1?string?has_content>
<div class="additionalImage">
- <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200"/></a>
- </div></br>
+ <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200" /></a>
+ </div><br />
</#if>
<#if productAdditionalImage2?string?has_content>
<div class="additionalImage">
- <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200"/></a>
- </div></br>
+ <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage2}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200" /></a>
+ </div><br />
</#if>
<#if productAdditionalImage3?string?has_content>
<div class="additionalImage">
- <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200"/></a>
+ <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage3}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200" /></a>
</div>
</#if>
<#if productAdditionalImage4?string?has_content>
<div class="additionalImage">
- <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200"/></a>
+ <a href="javascript:void(0);"
swapDetail="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"><img
src="<@ofbizContentUrl>${productAdditionalImage4}</@ofbizContentUrl>"
vspace="5" hspace="5" border="0" width="200" /></a>
</div>
</#if>
</td>
<td align="right" valign="top">
<h2>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</h2>
<div>${productContentWrapper.get("DESCRIPTION")?if_exists}</div>
- <div><b>${product.productId?if_exists}</b></div>
+ <div>${product.productId?if_exists}</div>
<#-- example of showing a certain type of feature with the product -->
<#if sizeProductFeatureAndAppls?has_content>
<div>
@@ -349,38 +349,38 @@
- if price < defaultPrice and defaultPrice < listPrice, show
default
- if isSale show price with salePrice style and print "On Sale!"
-->
- <#if price.competitivePrice?exists && price.price?exists && price.price
< price.competitivePrice>
- <div>${uiLabelMap.ProductCompareAtPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.competitivePrice
isoCode=price.currencyUsed/></span></div>
+ <#if price.competitivePrice?exists && price.price?exists && price.price
< price.competitivePrice>
+ <div>${uiLabelMap.ProductCompareAtPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.competitivePrice
isoCode=price.currencyUsed /></span></div>
</#if>
- <#if price.listPrice?exists && price.price?exists && price.price <
price.listPrice>
- <div>${uiLabelMap.ProductListPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.listPrice
isoCode=price.currencyUsed/></span></div>
+ <#if price.listPrice?exists && price.price?exists && price.price <
price.listPrice>
+ <div>${uiLabelMap.ProductListPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.listPrice
isoCode=price.currencyUsed /></span></div>
</#if>
- <#if price.listPrice?exists && price.defaultPrice?exists &&
price.price?exists && price.price < price.defaultPrice && price.defaultPrice <
price.listPrice>
- <div>${uiLabelMap.ProductRegularPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.defaultPrice
isoCode=price.currencyUsed/></span></div>
+ <#if price.listPrice?exists && price.defaultPrice?exists &&
price.price?exists && price.price < price.defaultPrice && price.defaultPrice
< price.listPrice>
+ <div>${uiLabelMap.ProductRegularPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.defaultPrice
isoCode=price.currencyUsed /></span></div>
</#if>
<#if price.specialPromoPrice?exists>
- <div>${uiLabelMap.ProductSpecialPromoPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.specialPromoPrice
isoCode=price.currencyUsed/></span></div>
+ <div>${uiLabelMap.ProductSpecialPromoPrice}: <span
class="basePrice"><@ofbizCurrency amount=price.specialPromoPrice
isoCode=price.currencyUsed /></span></div>
</#if>
<div>
<b>
<#if price.isSale?exists && price.isSale>
<span class="salePrice">${uiLabelMap.OrderOnSale}!</span>
- <#assign priceStyle = "salePrice">
+ <#assign priceStyle = "salePrice" />
<#else>
- <#assign priceStyle = "regularPrice">
+ <#assign priceStyle = "regularPrice" />
</#if>
- ${uiLabelMap.OrderYourPrice}: <#if "Y" =
product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span
class="${priceStyle}"><@ofbizCurrency amount=price.price
isoCode=price.currencyUsed/></span>
+ ${uiLabelMap.OrderYourPrice}: <#if "Y" =
product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span
class="${priceStyle}"><@ofbizCurrency amount=price.price
isoCode=price.currencyUsed /></span>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
- <#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc !=
0><br/><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if
!product.reservNthPPPerc?exists || product.reservNthPPPerc ==
0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons?if_exists}</#if>
<@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100
isoCode=price.currencyUsed/></span></#if>
- <#if product.reservNthPPPerc?exists &&product.reservNthPPPerc !=
0><br/><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if
!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc ==
0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird}
</#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons?if_exists},
${uiLabelMap.ProductEach}: <@ofbizCurrency
amount=product.reservNthPPPerc*price.price/100
isoCode=price.currencyUsed/></span></#if>
- <#if (!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc
== 0) && (!product.reservNthPPPerc?exists || product.reservNthPPPerc ==
0)><br/>${uiLabelMap.ProductMaximum} ${product.reservMaxPersons?if_exists}
${uiLabelMap.ProductPersons}.</#if>
+ <#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc !=
0><br /><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if
!product.reservNthPPPerc?exists || product.reservNthPPPerc ==
0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons?if_exists}</#if>
<@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100
isoCode=price.currencyUsed /></span></#if>
+ <#if product.reservNthPPPerc?exists &&product.reservNthPPPerc !=
0><br /><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if
!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc ==
0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird}
</#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons?if_exists},
${uiLabelMap.ProductEach}: <@ofbizCurrency
amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed
/></span></#if>
+ <#if (!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc
== 0) && (!product.reservNthPPPerc?exists || product.reservNthPPPerc == 0)><br
/>${uiLabelMap.ProductMaximum} ${product.reservMaxPersons?if_exists}
${uiLabelMap.ProductPersons}.</#if>
</#if>
</b>
</div>
- <#if price.listPrice?exists && price.price?exists && price.price <
price.listPrice>
- <#assign priceSaved = price.listPrice - price.price>
- <#assign percentSaved = (priceSaved / price.listPrice) * 100>
- <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency
amount=priceSaved isoCode=price.currencyUsed/>
(${percentSaved?int}%)</span></div>
+ <#if price.listPrice?exists && price.price?exists && price.price <
price.listPrice>
+ <#assign priceSaved = price.listPrice - price.price />
+ <#assign percentSaved = (priceSaved / price.listPrice) * 100 />
+ <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency
amount=priceSaved isoCode=price.currencyUsed />
(${percentSaved?int}%)</span></div>
</#if>
<#-- show price details ("showPriceDetails" field can be set in the
screen definition) -->
<#if (showPriceDetails?exists && showPriceDetails?default("N") == "Y")>
@@ -398,32 +398,32 @@
</div>
</#if>
<#if (product.quantityIncluded?exists && product.quantityIncluded != 0)
|| product.quantityUomId?has_content>
- <#assign quantityUom =
product.getRelatedOneCache("QuantityUom")?if_exists/>
+ <#assign quantityUom =
product.getRelatedOneCache("QuantityUom")?if_exists />
<div>
${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists}
${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists}
</div>
</#if>
<#if (product.weight?exists && product.weight != 0) ||
product.weightUomId?has_content>
- <#assign weightUom =
product.getRelatedOneCache("WeightUom")?if_exists/>
+ <#assign weightUom = product.getRelatedOneCache("WeightUom")?if_exists
/>
<div>
${uiLabelMap.CommonWeight}: ${product.weight?if_exists}
${((weightUom.abbreviation)?default(product.weightUomId))?if_exists}
</div>
</#if>
<#if (product.productHeight?exists && product.productHeight != 0) ||
product.heightUomId?has_content>
- <#assign heightUom =
product.getRelatedOneCache("HeightUom")?if_exists/>
+ <#assign heightUom = product.getRelatedOneCache("HeightUom")?if_exists
/>
<div>
${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists}
${((heightUom.abbreviation)?default(product.heightUomId))?if_exists}
</div>
</#if>
<#if (product.productWidth?exists && product.productWidth != 0) ||
product.widthUomId?has_content>
- <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists/>
+ <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists />
<div>
${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists}
${((widthUom.abbreviation)?default(product.widthUomId))?if_exists}
</div>
</#if>
<#if (product.productDepth?exists && product.productDepth != 0) ||
product.depthUomId?has_content>
- <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists/>
+ <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists />
<div>
${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists}
${((depthUom.abbreviation)?default(product.depthUomId))?if_exists}
</div>
@@ -438,12 +438,12 @@
<div>
<a
href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');"
class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
</div>
- <br/>
+ <br />
- <#if disFeatureList?exists && 0 < disFeatureList.size()>
+ <#if disFeatureList?exists && 0 < disFeatureList.size()>
<p> </p>
<#list disFeatureList as currentFeature>
- <#assign disFeatureType =
currentFeature.getRelatedOneCache("ProductFeatureType")/>
+ <#assign disFeatureType =
currentFeature.getRelatedOneCache("ProductFeatureType") />
<div>
<#if
disFeatureType.description?exists>${disFeatureType.get("description",
locale)}<#else>${currentFeature.productFeatureTypeId}</#if>: ${currentFeature.description}
</div>
@@ -452,7 +452,7 @@
</#if>
<form method="post" action="<@ofbizUrl>additem</@ofbizUrl>"
name="addform" style="margin: 0;">
- <#assign inStock = true>
+ <#assign inStock = true />
<#-- Variant Selection -->
<#if product.isVirtual?if_exists?upper_case == "Y">
<#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE"
&& featureLists?has_content>
@@ -462,28 +462,28 @@
<div>${feature.description}: <select
id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}"
onChange="javascript:checkRadioButton();">
<option value="select" selected="selected"> select
option </option>
<#else>
- <option
value="${feature.productFeatureId}">${feature.description} <#if
feature.price?exists>(+ <@ofbizCurrency amount=feature.price?string
isoCode=feature.currencyUomId/>)</#if></option>
+ <option
value="${feature.productFeatureId}">${feature.description} <#if
feature.price?exists>(+ <@ofbizCurrency amount=feature.price?string
isoCode=feature.currencyUomId />)</#if></option>
</#if>
</#list>
</select>
</div>
</#list>
- <input type="hidden" name="add_product_id"
value="${product.productId}"/>
+ <input type="hidden" name="add_product_id"
value="${product.productId}" />
<div id="addCart1" style="display:none;>
<span style="white-space:
nowrap;"><b>${uiLabelMap.CommonQuantity}:</b></span>
- <input type="text" size="5" name="quantity" value="1"/>
+ <input type="text" size="5" name="quantity" value="1" />
<a href="javascript:javascript:addItem();"
class="buttontext"><span style="white-space:
nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
</div>
<div id="addCart2" style="display:block;>
<span style="white-space:
nowrap;"><b>${uiLabelMap.CommonQuantity}:</b></span>
- <input type="text" size="5" value="1" disabled="disabled"/>
+ <input type="text" size="5" value="1" disabled="disabled" />
<a href="javascript:alert('Please select all features first');"
class="buttontext"><span style="white-space:
nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
</div>
</#if>
<#if !product.virtualVariantMethodEnum?exists ||
product.virtualVariantMethodEnum == "VV_VARIANTTREE">
- <#if variantTree?exists && (variantTree.size() > 0)>
+ <#if variantTree?exists && (variantTree.size() > 0)>
<#list featureSet as currentType>
<div>
<select name="FT${currentType}"
onchange="javascript:getList(this.name, (this.selectedIndex-1), 1);">
@@ -499,17 +499,17 @@
<#else>
<input type="hidden" name="add_product_id" value="NULL"/>
<div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
- <#assign inStock = false>
+ <#assign inStock = false />
</#if>
</#if>
<#else>
- <input type="hidden" name="add_product_id"
value="${product.productId}"/>
- <#assign isStoreInventoryNotAvailable =
!(Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryAvailable(request,
product, 1.0))>
- <#assign isStoreInventoryRequired =
Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request,
product)>
+ <input type="hidden" name="add_product_id"
value="${product.productId}" />
+ <#assign isStoreInventoryNotAvailable =
!(Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryAvailable(request,
product, 1.0)) />
+ <#assign isStoreInventoryRequired =
Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request,
product) />
<#if isStoreInventoryNotAvailable>
<#if isStoreInventoryRequired>
<div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
- <#assign inStock = false>
+ <#assign inStock = false />
<#else>
<div><b>${product.inventoryMessage?if_exists}</b></div>
</#if>
@@ -527,9 +527,9 @@
<#elseif product.virtualVariantMethodEnum?if_exists !=
"VV_FEATURETREE">
<#if inStock>
<#if product.requireAmount?default("N") == "Y">
- <#assign hiddenStyle = "visible">
+ <#assign hiddenStyle = "visible" />
<#else>
- <#assign hiddenStyle = "hidden">
+ <#assign hiddenStyle = "hidden"/>
</#if>
<div id="add_amount" class="${hiddenStyle}">
<span style="white-space:
nowrap;"><b>${uiLabelMap.CommonAmount}:</b></span>
@@ -543,8 +543,8 @@
<#--td nowrap align="right">Number<br/>of days</td><td><input
type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td
align="right" nowrap> </td-->
<td nowrap align="right">Number of persons</td><td><input
type="text" size="4" name="reservPersons" value="2"/></td>
<td nowrap align="right">Number of rooms</td><td><input
type="text" size="5" name="quantity" value="1"/></td></tr></table>
- <#else/>
- <input type="text" size="5" name="quantity" value="1"<#if
product.isVirtual?if_exists?upper_case == "Y"> disabled="disabled"</#if>/>
+ <#else>
+ <input type="text" size="5" name="quantity" value="1"<#if
product.isVirtual?if_exists?upper_case == "Y"> disabled="disabled"</#if> />
</#if>
<#-- This calls addItem() so that variants of virtual products
cant be added before distinguishing features are selected, it should not be
changed to additemSubmit() -->
<a href="javascript:addItem()" class="buttontext"><span
style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
@@ -553,12 +553,12 @@
</form>
<div>
<#if sessionAttributes.userLogin?has_content &&
sessionAttributes.userLogin.userLoginId != "anonymous">
- <hr/>
+ <hr />
<form name="addToShoppingList" method="post"
action="<@ofbizUrl>addItemToShoppingList<#if
requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>">
- <input type="hidden" name="productId" value="${product.productId}"/>
- <input type="hidden" name="product_id" value="${product.productId}"/>
- <input type="hidden" name="productStoreId"
value="${productStoreId}"/>
- <input type="hidden" name="reservStart" value= ""/>
+ <input type="hidden" name="productId" value="${product.productId}" />
+ <input type="hidden" name="product_id" value="${product.productId}"
/>
+ <input type="hidden" name="productStoreId" value="${productStoreId}"
/>
+ <input type="hidden" name="reservStart" value= "" />
<select name="shoppingListId">
<#if shoppingLists?has_content>
<#list shoppingLists as shoppingList>
@@ -572,47 +572,47 @@
<#if product.productTypeId?if_exists == "ASSET_USAGE">
<table><tr><td> </td><td
align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input
type="text" size="10" name="reservStartStr" ></td><td>Number
of days</td><td><input type="text" size="4"
name="reservLength"></td><td> </td><td align="right">Number
of persons</td><td><input type="text" size="4" name="reservPersons"
value="1"></td><td align="right">Qty </td><td><input type="text" size="5"
name="quantity" value="1"></td></tr></table>
<#else>
- <input type="text" size="5" name="quantity" value="1"/>
- <input type="hidden" name="reservStartStr" value= ""/>
+ <input type="text" size="5" name="quantity" value="1" />
+ <input type="hidden" name="reservStartStr" value= "" />
</#if>
<a href="javascript:addShoplistSubmit();"
class="buttontext">${uiLabelMap.OrderAddToShoppingList}</a>
</form>
- <#else> <br/>
+ <#else> <br />
${uiLabelMap.OrderYouMust} <a
href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonBeLogged}</a>
${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.
</#if>
</div>
<#-- Prefill first select box (virtual products only) -->
- <#if variantTree?exists && 0 < variantTree.size()>
+ <#if variantTree?exists && 0 < variantTree.size()>
<script language="JavaScript" type="text/javascript">eval("list" +
"${featureOrderFirst}" + "()");</script>
</#if>
<#-- Swatches (virtual products only) -->
- <#if variantSample?exists && 0 < variantSample.size()>
- <#assign imageKeys = variantSample.keySet()>
- <#assign imageMap = variantSample>
+ <#if variantSample?exists && 0 < variantSample.size()>
+ <#assign imageKeys = variantSample.keySet() />
+ <#assign imageMap = variantSample />
<p> </p>
<table cellspacing="0" cellpadding="0">
<tr>
- <#assign maxIndex = 7>
- <#assign indexer = 0>
+ <#assign maxIndex = 7 />
+ <#assign indexer = 0 />
<#list imageKeys as key>
- <#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>
+ <#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?string?has_content>
- <#assign imageUrl =
productContentWrapper.get("SMALL_IMAGE_URL")?if_exists>
+ <#assign imageUrl =
productContentWrapper.get("SMALL_IMAGE_URL")?if_exists />
</#if>
<#if !imageUrl?string?has_content>
- <#assign imageUrl = "/images/defaultImage.jpg">
+ <#assign imageUrl = "/images/defaultImage.jpg" />
</#if>
<td align="center" valign="bottom">
- <a
href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img
src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>"
border="0" width="60" height="60"></a>
- <br/>
+ <a
href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img
src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>"
border="0" width="60" height="60" /></a>
+ <br />
<a
href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"
class="linktext">${key}</a>
</td>
</#if>
- <#assign indexer = indexer + 1>
+ <#assign indexer = indexer + 1 />
</#list>
<#if (indexer > maxIndex)>
<div><b>${uiLabelMap.ProductMoreOptions}</b></div>
@@ -645,14 +645,14 @@
<#-- Product Reviews -->
<div id="reviews">
<div>${uiLabelMap.OrderCustomerReviews}:</div>
- <#if averageRating?exists && (averageRating > 0) && numRatings?exists &&
(numRatings > 1)>
+ <#if averageRating?exists && (averageRating > 0) && numRatings?exists
&& (numRatings > 1)>
<div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if
numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings}
${uiLabelMap.OrderRatings})</#if></div>
</#if>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<#if productReviews?has_content>
<#list productReviews as productReview>
- <#assign postedUserLogin = productReview.getRelatedOne("UserLogin")>
- <#assign postedPerson =
postedUserLogin.getRelatedOne("Person")?if_exists>
+ <#assign postedUserLogin = productReview.getRelatedOne("UserLogin")
/>
+ <#assign postedPerson =
postedUserLogin.getRelatedOne("Person")?if_exists />
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
@@ -675,7 +675,7 @@
<div>${productReview.productReview?if_exists}</div>
</td>
</tr>
- <tr><td colspan="3"><hr/></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
</table>
</#list>
<div>
@@ -690,9 +690,9 @@
</#if>
<#-- Upgrades/Up-Sell/Cross-Sell -->
<#macro associated assocProducts beforeName showName afterName
formNamePrefix targetRequestName>
- <#assign targetRequest = "product">
+ <#assign targetRequest = "product" />
<#if targetRequestName?has_content>
- <#assign targetRequest = targetRequestName>
+ <#assign targetRequest = targetRequestName />
</#if>
<#if assocProducts?has_content>
<h2>${beforeName?if_exists}<#if showName ==
"Y">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</#if>${afterName?if_exists}</h2>
@@ -700,9 +700,9 @@
<div class="productsummary-container">
<#list assocProducts as productAssoc>
<#if productAssoc.productId == product.productId>
- <#assign assocProductId = productAssoc.productIdTo/>
- <#else/>
- <#assign assocProductId = productAssoc.productId/>
+ <#assign assocProductId = productAssoc.productIdTo />
+ <#else>
+ <#assign assocProductId = productAssoc.productId />
</#if>
<div>
<a href="<@ofbizUrl>${targetRequest}/<#if
categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${assocProductId}</@ofbizUrl>"
class="buttontext">
@@ -719,7 +719,7 @@
${setRequestAttribute("targetRequestName", targetRequestName)}
</#if>
${screens.render(productsummaryScreen)}
- <#local listIndex = listIndex + 1>
+ <#local listIndex = listIndex + 1 />
</#list>
</div>
@@ -729,24 +729,24 @@
</#if>
</#macro>
-<#assign productValue = product>
-<#assign listIndex = 1>
+<#assign productValue = product />
+<#assign listIndex = 1 />
${setRequestAttribute("productValue", productValue)}
<div id="associated-products">
<#-- also bought -->
- <@associated assocProducts=alsoBoughtProducts beforeName="" showName="N"
afterName="${uiLabelMap.ProductAlsoBought}" formNamePrefix="albt"
targetRequestName=""/>
+ <@associated assocProducts=alsoBoughtProducts beforeName="" showName="N"
afterName="${uiLabelMap.ProductAlsoBought}" formNamePrefix="albt"
targetRequestName="" />
<#-- obsolete -->
- <@associated assocProducts=obsoleteProducts beforeName="" showName="Y"
afterName=" ${uiLabelMap.ProductObsolete}" formNamePrefix="obs"
targetRequestName=""/>
+ <@associated assocProducts=obsoleteProducts beforeName="" showName="Y"
afterName=" ${uiLabelMap.ProductObsolete}" formNamePrefix="obs"
targetRequestName="" />
<#-- cross sell -->
- <@associated assocProducts=crossSellProducts beforeName="" showName="N"
afterName="${uiLabelMap.ProductCrossSell}" formNamePrefix="cssl"
targetRequestName="crosssell"/>
+ <@associated assocProducts=crossSellProducts beforeName="" showName="N"
afterName="${uiLabelMap.ProductCrossSell}" formNamePrefix="cssl"
targetRequestName="crosssell" />
<#-- up sell -->
- <@associated assocProducts=upSellProducts
beforeName="${uiLabelMap.ProductUpSell} " showName="Y" afterName=":"
formNamePrefix="upsl" targetRequestName="upsell"/>
+ <@associated assocProducts=upSellProducts
beforeName="${uiLabelMap.ProductUpSell} " showName="Y" afterName=":"
formNamePrefix="upsl" targetRequestName="upsell" />
<#-- obsolescence -->
- <@associated assocProducts=obsolenscenseProducts beforeName=""
showName="Y" afterName=" ${uiLabelMap.ProductObsolescense}"
formNamePrefix="obce" targetRequestName=""/>
+ <@associated assocProducts=obsolenscenseProducts beforeName=""
showName="Y" afterName=" ${uiLabelMap.ProductObsolescense}"
formNamePrefix="obce" targetRequestName="" />
</div>
<#-- special cross/up-sell area using commonFeatureResultIds (from common
feature product search) -->
-<#if commonFeatureResultIds?has_content>
+<#if comsmonFeatureResultIds?has_content>
<h2>${uiLabelMap.ProductSimilarProducts}</h2>
<div class="productsummary-container">
