svn commit: r1618554 [8/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [8/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -${virtualJavaScript?if_exists} +${virtualJavaScript!} <#assign addedJavaScript = requestAttributes.addedJavaScript?default("N")/> <#if ("N" == addedJavaScript)> ${setRequestAttribute("addedJavaScript", "Y")} @@ -104,7 +104,7 @@ ${virtualJavaScript?if_exists} function isVirtualInline(inlineCounter, product) { var isVirtual = false; var fieldName = 'VIR' + inlineCounter; - <#if virtualJavaScript?exists> + <#if virtualJavaScript??> for (i = 0; i < window[fieldName].length; i++) { if (window[fieldName][i] == product) { isVirtual = true; @@ -230,7 +230,7 @@ ${virtualJavaScript?if_exists} </script> </#if> -<#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> +<#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content> <script language="JavaScript" type="text/javascript"> function checkRadioButtoninline${inlineCounter}(inlineCounter, productId) { var add_product_id = 'add_product_id' + inlineCounter; @@ -253,32 +253,32 @@ ${virtualJavaScript?if_exists} </#if> -<#assign price = priceMap?if_exists/> +<#assign price = priceMap!/> <div id="inlineproductdetail${inlineCounter}"> <table border="0" cellpadding="2" cellspacing="0" width="100%"> <tr> <td align="left" valign="top" width="0"> - <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")?if_exists> + <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")!> <#if firstLargeImage?has_content> <#assign productLargeImageUrl = firstLargeImage> </#if> <#if productLargeImageUrl?string?has_content> <input type="hidden" name="detailImage${inlineCounter}" value="${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"/> - <a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' class='cssImgLarge' align='left' alt="" /></a> + <a href="javascript:popupDetailInline('${inlineCounter}');"><img src='<@ofbizContentUrl>${contentPathPrefix!}${productLargeImageUrl!}</@ofbizContentUrl>' name='mainImage${inlineCounter}' vspace='5' hspace='5' class='cssImgLarge' align='left' alt="" /></a> </#if> </td> <td align="right" valign="top" width="100%"> - <#-- <h2>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</h2> --> + <#-- <h2>${productContentWrapper.get("PRODUCT_NAME")!}</h2> --> <#assign inStock = true> - <#if product.isVirtual?if_exists?upper_case == "Y"> - <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> + <#if product.isVirtual!?upper_case == "Y"> + <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content> <#list featureLists as featureList> <#list featureList as feature> <#if feature_index == 0> <div>${feature.description}: <select id="FT${inlineCounter}${feature.productFeatureTypeId}" name="FT${inlineCounter}${feature.productFeatureTypeId}" onchange="javascript:checkRadioButtoninline${inlineCounter}('${inlineCounter}', '${product.productId}');"> <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??>(+ <@ofbizCurrency amount=feature.price?string isoCode=feature.currencyUomId/>)</#if></option> </#if> </#list> </select> @@ -287,8 +287,8 @@ ${virtualJavaScript?if_exists} <input type="hidden" name="product_id${inlineCounter}" value="${product.productId}"/> <input type="hidden" name="add_product_id${inlineCounter}" value="NULL"/> </#if> - <#if !product.virtualVariantMethodEnum?exists || product.virtualVariantMethodEnum == "VV_VARIANTTREE"> - <#if variantTree?exists && (variantTree.size() > 0)> + <#if !product.virtualVariantMethodEnum?? || product.virtualVariantMethodEnum == "VV_VARIANTTREE"> + <#if variantTree?? && (variantTree.size() > 0)> <#list featureSet as currentType> <div> <select name="FT${inlineCounter}${currentType}" onchange="javascript:getListInline('${inlineCounter}', this.name, (this.selectedIndex-1), 1);"> @@ -319,21 +319,21 @@ ${virtualJavaScript?if_exists} <div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div> <#assign inStock = false> <#else> - <div><b>${product.inventoryMessage?if_exists}</b></div> + <div><b>${product.inventoryMessage!}</b></div> </#if> </#if> </#if> </td></tr> <tr><td COLSPAN="2" align="right"> <#-- check to see if introductionDate hasnt passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <p> </p> <div style="color: red;">${uiLabelMap.ProductProductNotYetMadeAvailable}.</div> <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.after(product.salesDiscontinuationDate)> + <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)> <div style="color: red;">${uiLabelMap.ProductProductNoLongerAvailable}.</div> <#-- check to see if the product requires inventory check and has inventory --> - <#elseif product.virtualVariantMethodEnum?if_exists != "VV_FEATURETREE"> + <#elseif product.virtualVariantMethodEnum! != "VV_FEATURETREE"> <#if inStock> <#if product.requireAmount?default("N") == "Y"> <#assign hiddenStyle = "visible"> @@ -349,12 +349,12 @@ ${virtualJavaScript?if_exists} </td></tr> <tr><td COLSPAN="2" align="right"> - <#if variantTree?exists && 0 < variantTree.size()> + <#if variantTree?? && 0 < variantTree.size()> <script language="JavaScript" type="text/javascript">eval("list"+ "${inlineCounter}" + "${featureOrderFirst}" + "()");</script> </#if> <#-- Swatches (virtual products only) . For now commented out, before fixing a bug - <#if variantSample?exists && 0 < variantSample.size()> + <#if variantSample?? && 0 < variantSample.size()> <#assign imageKeys = variantSample.keySet()> <#assign imageMap = variantSample> <p> </p> @@ -365,15 +365,15 @@ ${virtualJavaScript?if_exists} <#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 imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)!> <#if !imageUrl?string?has_content> - <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists> + <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")!> </#if> <#if !imageUrl?string?has_content> <#assign imageUrl = "/images/defaultImage.jpg"> </#if> <td align="center" valign="bottom"> - <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a> + <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix!}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" alt="" /></a> <br /> <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl Mon Aug 18 07:42:27 2014 @@ -27,7 +27,7 @@ under the License. <br /> <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> <br /> -<div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> +<div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> <#if !productIds?has_content> <h2> ${uiLabelMap.ProductNoResultsFound}.</h2> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Mon Aug 18 07:42:27 2014 @@ -30,22 +30,22 @@ under the License. <input type="hidden" name="VIEW_SIZE" value="10" /> <input type="hidden" name="PAGING" value="Y" /> <div> - <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}" /> + <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING!}" /> </div> <#if 0 < otherSearchProdCatalogCategories?size> <div> <select name="SEARCH_CATEGORY_ID" size="1"> - <option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option> + <option value="${searchCategoryId!}">${uiLabelMap.ProductEntireCatalog}</option> <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory> <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)> - <#if searchProductCategory?exists> + <#if searchProductCategory??> <option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option> </#if> </#list> </select> </div> <#else> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}" /> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> </#if> <div> <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /><label for="SEARCH_OPERATOR_OR">${uiLabelMap.CommonAny}</label> @@ -59,16 +59,16 @@ under the License. <#if 0 < otherSearchProdCatalogCategories?size> <label for="SEARCH_CATEGORY_ID">${uiLabelMap.ProductAdvancedSearchIn}: </label> <select name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" size="1"> - <option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option> + <option value="${searchCategoryId!}">${uiLabelMap.ProductEntireCatalog}</option> <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory> <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)> - <#if searchProductCategory?exists> + <#if searchProductCategory??> <option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option> </#if> </#list> </select> <#else> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}" /> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> </#if> <input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="button" /> </fieldset> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/product.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/product.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/product.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/product.ftl Mon Aug 18 07:42:27 2014 @@ -20,6 +20,6 @@ ${pages.get("/entry/OrderEntryTabBar.ftl <#if requestAttributes.product?has_content> ${pages.get(requestAttributes.detailTemplate)} <#else> - <#assign productId = requestAttributes.productId?if_exists> - <center><h2>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}!</h2></center> + <#assign productId = requestAttributes.productId!> + <center><h2>${uiLabelMap.ProductProductNotFound} ${productId!}!</h2></center> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Mon Aug 18 07:42:27 2014 @@ -17,11 +17,11 @@ specific language governing permissions under the License. --> <#-- variable setup --> -<#assign price = priceMap?if_exists/> +<#assign price = priceMap!/> <#-- end variable setup --> <#-- virtual product javascript --> -${virtualJavaScript?if_exists} +${virtualJavaScript!} <script language="JavaScript" type="text/javascript"> <!-- var detailImageUrl = null; @@ -71,7 +71,7 @@ ${virtualJavaScript?if_exists} } function isVirtual(product) { var isVirtual = false; - <#if virtualJavaScript?exists> + <#if virtualJavaScript??> for (i = 0; i < VIR.length; i++) { if (VIR[i] == product) { isVirtual = true; @@ -86,7 +86,7 @@ ${virtualJavaScript?if_exists} return; } else { if (isVirtual(document.addform.add_product_id.value)) { - document.location = '<@ofbizUrl>product?category_id=${categoryId?if_exists}&product_id=</@ofbizUrl>' + document.addform.add_product_id.value; + document.location = '<@ofbizUrl>product?category_id=${categoryId!}&product_id=</@ofbizUrl>' + document.addform.add_product_id.value; return; } else { document.addform.submit(); @@ -153,7 +153,7 @@ ${virtualJavaScript?if_exists} // eval the next list if there are more var selectedValue = document.forms["addform"].elements[name].options[(index*1)+1].value; if (index == -1) { - <#if featureOrderFirst?exists> + <#if featureOrderFirst??> var Variable1 = eval("list" + "${featureOrderFirst}" + "()"); </#if> } else { @@ -212,7 +212,7 @@ ${virtualJavaScript?if_exists} } function additemSubmit(){ - <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"> + <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN"> newdatevalue = validate(document.addform.reservStart.value); if (newdatevalue == false) { document.addform.reservStart.focus(); @@ -226,7 +226,7 @@ ${virtualJavaScript?if_exists} } function addShoplistSubmit(){ - <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"> + <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN"> if (document.addToShoppingList.reservStartStr.value == "") { document.addToShoppingList.submit(); } else { @@ -245,7 +245,7 @@ ${virtualJavaScript?if_exists} </#if> } - <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> + <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content> function checkRadioButton() { var block1 = document.getElementById("addCart1"); var block2 = document.getElementById("addCart2"); @@ -285,15 +285,15 @@ ${virtualJavaScript?if_exists} <table border="0" cellpadding="2" cellspacing="0" width="100%"> <#-- Category next/previous --> - <#if category?exists> + <#if category??> <tr> <td colspan="2" align="right"> - <#if previousProductId?exists> - <a href="<@ofbizUrl>product/~category_id=${categoryId?if_exists}/~product_id=${previousProductId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + <#if previousProductId??> + <a href="<@ofbizUrl>product/~category_id=${categoryId!}/~product_id=${previousProductId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | </#if> - <a href="<@ofbizUrl>category/~category_id=${categoryId?if_exists}</@ofbizUrl>" class="linktext">${(category.categoryName)?default(category.description)?if_exists}</a> - <#if nextProductId?exists> - | <a href="<@ofbizUrl>product/~category_id=${categoryId?if_exists}/~product_id=${nextProductId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + <a href="<@ofbizUrl>category/~category_id=${categoryId!}</@ofbizUrl>" class="linktext">${(category.categoryName)?default(category.description)!}</a> + <#if nextProductId??> + | <a href="<@ofbizUrl>product/~category_id=${categoryId!}/~product_id=${nextProductId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </td> </tr> @@ -304,19 +304,19 @@ ${virtualJavaScript?if_exists} <#-- 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")!> <#-- 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 src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" class='cssImgLarge' alt="" /></a> + <a href="javascript:popupDetail();"><img src="<@ofbizContentUrl>${contentPathPrefix!}${productLargeImageUrl!}</@ofbizContentUrl>" name="mainImage" vspace="5" hspace="5" class='cssImgLarge' alt="" /></a> </#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> + <h2>${productContentWrapper.get("PRODUCT_NAME")!}</h2> + <div>${productContentWrapper.get("DESCRIPTION")!}</div> + <div><b>${product.productId!}</b></div> <#-- example of showing a certain type of feature with the product --> <#if sizeProductFeatureAndAppls?has_content> <div> @@ -337,119 +337,119 @@ ${virtualJavaScript?if_exists} - 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?double < price.competitivePrice?double> + <#if price.competitivePrice?? && price.price?? && price.price?double < price.competitivePrice?double> <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?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> <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?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double> + <#if price.listPrice?? && price.defaultPrice?? && price.price?? && price.price?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double> <div>${uiLabelMap.ProductRegularPrice}: <span class="basePrice"><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.specialPromoPrice?exists> + <#if price.specialPromoPrice??> <div>${uiLabelMap.ProductSpecialPromoPrice}: <span class="basePrice"><@ofbizCurrency amount=price.specialPromoPrice isoCode=price.currencyUsed/></span></div> </#if> <div> <b> - <#if price.isSale?exists && price.isSale> + <#if price.isSale?? && price.isSale> <span class="salePrice">${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> <#else> <#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> - <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"> - <#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?exists || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons!1}</#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!1}, ${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!1} ${uiLabelMap.ProductPersons}.</#if> + ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> + <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN"> + <#if product.reserv2ndPPPerc?? && product.reserv2ndPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?? || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons!1}</#if> <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if> + <#if product.reservNthPPPerc?? &&product.reservNthPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if !product.reserv2ndPPPerc?? || product.reserv2ndPPPerc == 0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird} </#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons!1}, ${uiLabelMap.ProductEach}: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if> + <#if (!product.reserv2ndPPPerc?? || product.reserv2ndPPPerc == 0) && (!product.reservNthPPPerc?? || product.reservNthPPPerc == 0)><br />${uiLabelMap.ProductMaximum} ${product.reservMaxPersons!1} ${uiLabelMap.ProductPersons}.</#if> </#if> </b> </div> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> <#assign priceSaved = price.listPrice?double - price.price?double> <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 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")> - <#if price.orderItemPriceInfos?exists> + <#if (showPriceDetails?? && showPriceDetails?default("N") == "Y")> + <#if price.orderItemPriceInfos??> <#list price.orderItemPriceInfos as orderItemPriceInfo> - <div>${orderItemPriceInfo.description?if_exists}</div> + <div>${orderItemPriceInfo.description!}</div> </#list> </#if> </#if> <#-- Included quantities/pieces --> - <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> + <#if product.piecesIncluded?? && product.piecesIncluded?long != 0> <div> ${uiLabelMap.OrderPieces}: ${product.piecesIncluded} </div> </#if> - <#if (product.quantityIncluded?exists && product.quantityIncluded?double != 0) || product.quantityUomId?has_content> - <#assign quantityUom = product.getRelatedOne("QuantityUom", true)?if_exists/> + <#if (product.quantityIncluded?? && product.quantityIncluded?double != 0) || product.quantityUomId?has_content> + <#assign quantityUom = product.getRelatedOne("QuantityUom", true)!/> <div> - ${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists} + ${uiLabelMap.CommonQuantity}: ${product.quantityIncluded!} ${((quantityUom.abbreviation)?default(product.quantityUomId))!} </div> </#if> - <#if (product.weight?exists && product.weight?double != 0) || product.weightUomId?has_content> - <#assign weightUom = product.getRelatedOne("WeightUom", true)?if_exists/> + <#if (product.weight?? && product.weight?double != 0) || product.weightUomId?has_content> + <#assign weightUom = product.getRelatedOne("WeightUom", true)!/> <div> - ${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists} + ${uiLabelMap.CommonWeight}: ${product.weight!} ${((weightUom.abbreviation)?default(product.weightUomId))!} </div> </#if> - <#if (product.productHeight?exists && product.productHeight?double != 0) || product.heightUomId?has_content> - <#assign heightUom = product.getRelatedOne("HeightUom", true)?if_exists/> + <#if (product.productHeight?? && product.productHeight?double != 0) || product.heightUomId?has_content> + <#assign heightUom = product.getRelatedOne("HeightUom", true)!/> <div> - ${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists} + ${uiLabelMap.CommonHeight}: ${product.productHeight!} ${((heightUom.abbreviation)?default(product.heightUomId))!} </div> </#if> - <#if (product.productWidth?exists && product.productWidth?double != 0) || product.widthUomId?has_content> - <#assign widthUom = product.getRelatedOne("WidthUom", true)?if_exists/> + <#if (product.productWidth?? && product.productWidth?double != 0) || product.widthUomId?has_content> + <#assign widthUom = product.getRelatedOne("WidthUom", true)!/> <div> - ${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists} + ${uiLabelMap.CommonWidth}: ${product.productWidth!} ${((widthUom.abbreviation)?default(product.widthUomId))!} </div> </#if> - <#if (product.productDepth?exists && product.productDepth?double != 0) || product.depthUomId?has_content> - <#assign depthUom = product.getRelatedOne("DepthUom", true)?if_exists/> + <#if (product.productDepth?? && product.productDepth?double != 0) || product.depthUomId?has_content> + <#assign depthUom = product.getRelatedOne("DepthUom", true)!/> <div> - ${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists} + ${uiLabelMap.CommonDepth}: ${product.productDepth!} ${((depthUom.abbreviation)?default(product.depthUomId))!} </div> </#if> - <#if daysToShip?exists> + <#if daysToShip??> <div><b>${uiLabelMap.ProductUsuallyShipsIn} <font color="red">${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div> </#if> - <#if disFeatureList?exists && 0 < disFeatureList.size()> + <#if disFeatureList?? && 0 < disFeatureList.size()> <p> </p> <#list disFeatureList as currentFeature> <#assign disFeatureType = currentFeature.getRelatedOne("ProductFeatureType", true)/> <div> - <#if disFeatureType.description?exists>${disFeatureType.get("description", locale)}<#else>${currentFeature.productFeatureTypeId}</#if>: ${currentFeature.description} + <#if disFeatureType.description??>${disFeatureType.get("description", locale)}<#else>${currentFeature.productFeatureTypeId}</#if>: ${currentFeature.description} </div> </#list> <div> </div> </#if> - <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addform" style="margin: 0;"> + <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addform" style="margin: 0;"> <#if requestAttributes.paramMap?has_content> - <input type="hidden" name="itemComment" value="${requestAttributes.paramMap.itemComment?if_exists}" /> - <input type="hidden" name="shipBeforeDate" value="${requestAttributes.paramMap.shipBeforeDate?if_exists}" /> - <input type="hidden" name="shipAfterDate" value="${requestAttributes.paramMap.shipAfterDate?if_exists}" /> - <input type="hidden" name="itemDesiredDeliveryDate" value="${requestAttributes.paramMap.itemDesiredDeliveryDate?if_exists}" /> + <input type="hidden" name="itemComment" value="${requestAttributes.paramMap.itemComment!}" /> + <input type="hidden" name="shipBeforeDate" value="${requestAttributes.paramMap.shipBeforeDate!}" /> + <input type="hidden" name="shipAfterDate" value="${requestAttributes.paramMap.shipAfterDate!}" /> + <input type="hidden" name="itemDesiredDeliveryDate" value="${requestAttributes.paramMap.itemDesiredDeliveryDate!}" /> </#if> <#assign inStock = true> <#-- Variant Selection --> - <#if product.isVirtual?if_exists?upper_case == "Y"> - <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> + <#if product.isVirtual!?upper_case == "Y"> + <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content> <#list featureLists as featureList> <#list featureList as feature> <#if feature_index == 0> <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??>(+ <@ofbizCurrency amount=feature.price?string isoCode=feature.currencyUomId/>)</#if></option> </#if> </#list> </select> @@ -470,8 +470,8 @@ ${virtualJavaScript?if_exists} </div> </#if> - <#if !product.virtualVariantMethodEnum?exists || product.virtualVariantMethodEnum == "VV_VARIANTTREE"> - <#if variantTree?exists && (variantTree.size() > 0)> + <#if !product.virtualVariantMethodEnum?? || product.virtualVariantMethodEnum == "VV_VARIANTTREE"> + <#if variantTree?? && (variantTree.size() > 0)> <#list featureSet as currentType> <div> <select name="FT${currentType}" onchange="javascript:getList(this.name, (this.selectedIndex-1), 1);"> @@ -496,7 +496,7 @@ ${virtualJavaScript?if_exists} <#else> <input type="hidden" name="product_id" value="${product.productId}"/> <input type="hidden" name="add_product_id" value="${product.productId}"/> - <#if productStoreId?exists> + <#if productStoreId??> <#assign isStoreInventoryNotAvailable = !(Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryAvailable(request, product, 1.0?double))> <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)> <#if isStoreInventoryNotAvailable> @@ -504,21 +504,21 @@ ${virtualJavaScript?if_exists} <div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div> <#assign inStock = false> <#else> - <div><b>${product.inventoryMessage?if_exists}</b></div> + <div><b>${product.inventoryMessage!}</b></div> </#if> </#if> </#if> </#if> </td></tr><tr><td colspan="2" align="right"> <#-- check to see if introductionDate hasnt passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <p> </p> <div style="color: red;">${uiLabelMap.ProductProductNotYetMadeAvailable}.</div> <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.after(product.salesDiscontinuationDate)> + <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)> <div style="color: red;">${uiLabelMap.ProductProductNoLongerAvailable}.</div> <#-- check to see if the product requires inventory check and has inventory --> - <#elseif product.virtualVariantMethodEnum?if_exists != "VV_FEATURETREE"> + <#elseif product.virtualVariantMethodEnum! != "VV_FEATURETREE"> <#if inStock> <#if product.requireAmount?default("N") == "Y"> <#assign hiddenStyle = "visible"> @@ -529,7 +529,7 @@ ${virtualJavaScript?if_exists} <span style="white-space: nowrap;"><b>${uiLabelMap.CommonAmount}:</b></span> <input type="text" size="5" name="add_amount" value=""/> </div> - <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"> + <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN"> <table width="100%"><tr> <@htmlTemplate.renderDateTimeField name="reservStart" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="startDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <@htmlTemplate.renderDateTimeField name="reservEnd" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="endDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> @@ -538,12 +538,12 @@ ${virtualJavaScript?if_exists} <td nowrap="nowrap" align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td> <td nowrap="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>/> + <input type="text" size="5" name="quantity" value="1"<#if product.isVirtual!?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> </#if> - <#if requestParameters.category_id?exists> + <#if requestParameters.category_id??> <input type="hidden" name="category_id" value="${requestParameters.category_id}"/> </#if> </#if> @@ -551,10 +551,10 @@ ${virtualJavaScript?if_exists} <div> <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> <hr /> - <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> + <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_??>/${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?if_exists}"/> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> <input type="hidden" name="reservStart" value= ""/> <select name="shoppingListId"> <#if shoppingLists?has_content> @@ -566,7 +566,7 @@ ${virtualJavaScript?if_exists} <option value="">${uiLabelMap.OrderNewShoppingList}</option> </select> - <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"> + <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN"> <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"/> @@ -580,12 +580,12 @@ ${virtualJavaScript?if_exists} </#if> </div> <#-- Prefill first select box (virtual products only) --> - <#if variantTree?exists && 0 < variantTree.size()> + <#if variantTree?? && 0 < variantTree.size()> <script language="JavaScript" type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> </#if> <#-- Swatches (virtual products only) --> - <#if variantSample?exists && 0 < variantSample.size()> + <#if variantSample?? && 0 < variantSample.size()> <#assign imageKeys = variantSample.keySet()> <#assign imageMap = variantSample> <p> </p> @@ -596,15 +596,15 @@ ${virtualJavaScript?if_exists} <#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 imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)!> <#if !imageUrl?string?has_content> - <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists> + <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")!> </#if> <#if !imageUrl?string?has_content> <#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>" class='cssImgSmall' alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix!}${imageUrl}</@ofbizContentUrl>" class='cssImgSmall' alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </td> @@ -633,8 +633,8 @@ ${virtualJavaScript?if_exists} <#-- Long description of product --> <div id="long-description"> - <div>${productContentWrapper.get("LONG_DESCRIPTION")?if_exists}</div> - <div>${productContentWrapper.get("WARNINGS")?if_exists}</div> + <div>${productContentWrapper.get("LONG_DESCRIPTION")!}</div> + <div>${productContentWrapper.get("WARNINGS")!}</div> </div> <#-- Any attributes/etc may go here --> @@ -646,15 +646,15 @@ ${virtualJavaScript?if_exists} <#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> + <h2>${beforeName!}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME")!}</#if>${afterName!}</h2> <div class="productsummary-container"> <#list assocProducts as productAssoc> <div> - <a href="<@ofbizUrl>${targetRequest}/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${productAssoc.productIdTo?if_exists}</@ofbizUrl>" class="buttontext"> - ${productAssoc.productIdTo?if_exists} + <a href="<@ofbizUrl>${targetRequest}/<#if categoryId??>~category_id=${categoryId}/</#if>~product_id=${productAssoc.productIdTo!}</@ofbizUrl>" class="buttontext"> + ${productAssoc.productIdTo!} </a> - - <b>${productAssoc.reason?if_exists}</b> + - <b>${productAssoc.reason!}</b> </div> ${setRequestAttribute("optProductId", productAssoc.productIdTo)} ${setRequestAttribute("listIndex", listIndex)} Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -${virtualJavaScript?if_exists} +${virtualJavaScript!} <script type="text/javascript"> <!-- function displayProductVirtualId(variantId, virtualProductId, pForm) { @@ -51,7 +51,7 @@ ${virtualJavaScript?if_exists} } //--> </script> -<#if product?exists> +<#if product??> <#-- variable setup --> <#if backendPath?default("N") == "Y"> <#assign productUrl><@ofbizCatalogUrl productId=product.productId productCategoryId=categoryId/></#assign> @@ -59,10 +59,10 @@ ${virtualJavaScript?if_exists} <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId productCategoryId=categoryId/></#assign> </#if> - <#if requestAttributes.productCategoryMember?exists> + <#if requestAttributes.productCategoryMember??> <#assign prodCatMem = requestAttributes.productCategoryMember> </#if> - <#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists> + <#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")!> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <#-- end variable setup --> <#assign productInfoLinkId = "productInfoLink"> @@ -72,17 +72,17 @@ ${virtualJavaScript?if_exists} <div class="productsummary"> <div class="smallimage"> <a href="${productUrl}"> - <span id="${productInfoLinkId}" class="popup_link"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/></span> + <span id="${productInfoLinkId}" class="popup_link"><img src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/></span> </a> </div> <div id="${productDetailId}" class="popup" style="display:none;"> <table> <tr valign="top"> <td> - <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> - ${uiLabelMap.ProductProductId} : ${product.productId?if_exists}<br /> - ${uiLabelMap.ProductProductName} : ${product.productName?if_exists}<br /> - ${uiLabelMap.CommonDescription} : ${product.description?if_exists} + <img src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> + ${uiLabelMap.ProductProductId} : ${product.productId!}<br /> + ${uiLabelMap.ProductProductName} : ${product.productName!}<br /> + ${uiLabelMap.CommonDescription} : ${product.description!} </td> </tr> </table> @@ -96,32 +96,32 @@ ${virtualJavaScript?if_exists} </script> <div class="productbuy"> <#-- check to see if introductionDate hasn't passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div> <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.after(product.salesDiscontinuationDate)> + <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)> <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div> <#-- check to see if it is a rental item; will enter parameters on the detail screen--> - <#elseif product.productTypeId?if_exists == "ASSET_USAGE"> + <#elseif product.productTypeId! == "ASSET_USAGE"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a> <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen--> - <#elseif product.productTypeId?if_exists == "AGGREGATED" || product.productTypeId?if_exists == "AGGREGATED_SERVICE"> + <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderConfigure}...</a> <#-- check to see if the product is a virtual product --> - <#elseif product.isVirtual?exists && product.isVirtual == "Y"> + <#elseif product.isVirtual?? && product.isVirtual == "Y"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> <#-- check to see if the product requires an amount --> - <#elseif product.requireAmount?exists && product.requireAmount == "Y"> + <#elseif product.requireAmount?? && product.requireAmount == "Y"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a> - <#elseif product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"> + <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderRent}...</a> <#else> - <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}form" style="margin: 0;"> + <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}form" style="margin: 0;"> <input type="hidden" name="add_product_id" value="${product.productId}"/> <input type="text" size="5" name="quantity" value="1"/> <input type="hidden" name="clearSearch" value="N"/> <input type="hidden" name="mainSubmitted" value="Y"/> - <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}form.submit()" class="buttontext">${uiLabelMap.OrderAddToCart}</a> + <a href="javascript:document.the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}form.submit()" class="buttontext">${uiLabelMap.OrderAddToCart}</a> <#if mainProducts?has_content> <input type="hidden" name="product_id" value=""/> <select name="productVariantId" onchange="javascript:displayProductVirtualId(this.value, '${product.productId}', this.form);"> @@ -137,22 +137,22 @@ ${virtualJavaScript?if_exists} </#if> </form> - <#if prodCatMem?exists && prodCatMem.quantity?exists && 0.00 < prodCatMem.quantity?double> - <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;"> - <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/> - <input type="hidden" name="quantity" value="${prodCatMem.quantity?if_exists}"/> + <#if prodCatMem?? && prodCatMem.quantity?? && 0.00 < prodCatMem.quantity?double> + <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform" style="margin: 0;"> + <input type="hidden" name="add_product_id" value="${prodCatMem.productId!}"/> + <input type="hidden" name="quantity" value="${prodCatMem.quantity!}"/> <input type="hidden" name="clearSearch" value="N"/> <input type="hidden" name="mainSubmitted" value="Y"/> - <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> + <a href="javascript:document.the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> </form> <#assign productCategory = delegator.findOne("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", prodCatMem.productCategoryId), false)/> <#if productCategory.productCategoryTypeId != "BEST_SELL_CATEGORY"> - <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;"> - <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/> - <input type="hidden" name="quantity" value="${prodCatMem.quantity?if_exists}"/> + <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform" style="margin: 0;"> + <input type="hidden" name="add_product_id" value="${prodCatMem.productId!}"/> + <input type="hidden" name="quantity" value="${prodCatMem.quantity!}"/> <input type="hidden" name="clearSearch" value="N"/> <input type="hidden" name="mainSubmitted" value="Y"/> - <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> + <a href="javascript:document.the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> </form> </#if> </#if> @@ -160,12 +160,12 @@ ${virtualJavaScript?if_exists} </div> <div class="productinfo"> <div> - <a href="${productUrl}" class="linktext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a> + <a href="${productUrl}" class="linktext">${productContentWrapper.get("PRODUCT_NAME")!}</a> </div> - <div>${productContentWrapper.get("DESCRIPTION")?if_exists}<#if daysToShip?exists> - ${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div> + <div>${productContentWrapper.get("DESCRIPTION")!}<#if daysToShip??> - ${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div> <#-- Display category-specific product comments --> - <#if prodCatMem?exists && prodCatMem.comments?has_content> + <#if prodCatMem?? && prodCatMem.comments?has_content> <div>${prodCatMem.comments}</div> </#if> @@ -183,18 +183,18 @@ ${virtualJavaScript?if_exists} </div> </#if> <div> - <b>${product.productId?if_exists}</b> - <#if totalPrice?exists> + <b>${product.productId!}</b> + <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> - <#if price.competitivePrice?exists && price.price?exists && price.price?double < price.competitivePrice?double> + <#if price.competitivePrice?? && price.price?? && price.price?double < price.competitivePrice?double> ${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span> </#if> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> ${uiLabelMap.ProductListPrice}: <span class="basePrice"><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span> </#if> <b> - <#if price.isSale?exists && price.isSale> + <#if price.isSale?? && price.isSale> <span class="salePrice">${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> <#else> @@ -202,32 +202,32 @@ ${virtualJavaScript?if_exists} </#if> <#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")> - ${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!> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> </#if> </b> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> <#assign priceSaved = price.listPrice?double - price.price?double> <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100> ${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span> </#if> </#if> <#-- show price details ("showPriceDetails" field can be set in the screen definition) --> - <#if (showPriceDetails?exists && showPriceDetails?default("N") == "Y")> - <#if price.orderItemPriceInfos?exists> + <#if (showPriceDetails?? && showPriceDetails?default("N") == "Y")> + <#if price.orderItemPriceInfos??> <#list price.orderItemPriceInfos as orderItemPriceInfo> - <div>${orderItemPriceInfo.description?if_exists}</div> + <div>${orderItemPriceInfo.description!}</div> </#list> </#if> </#if> </div> - <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?long > 2)> + <#if averageRating?? && (averageRating?double > 0) && numRatings?? && (numRatings?long > 2)> <div>${uiLabelMap.OrderAverageRating}: ${averageRating} (${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</div> </#if> - <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">addToCompare</@ofbizUrl>" name="addToCompare${requestAttributes.listIndex?if_exists}form"> + <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">addToCompare</@ofbizUrl>" name="addToCompare${requestAttributes.listIndex!}form"> <input type="hidden" name="productId" value="${product.productId}"/> <input type="hidden" name="mainSubmitted" value="Y"/> </form> - <a href="javascript:document.addToCompare${requestAttributes.listIndex?if_exists}form.submit()" class="buttontext">${uiLabelMap.ProductAddToCompare}</a> + <a href="javascript:document.addToCompare${requestAttributes.listIndex!}form.submit()" class="buttontext">${uiLabelMap.ProductAddToCompare}</a> </div> </div> <#else> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Mon Aug 18 07:42:27 2014 @@ -21,17 +21,17 @@ under the License. <table border='0' cellpadding='3' cellspacing='0'> <tr> <td> - <h2>${productCategory.categoryName?if_exists}</h2> + <h2>${productCategory.categoryName!}</h2> </td> <td align="right"> <form name="choosequickaddform" method="post" action="<@ofbizUrl>quickadd</@ofbizUrl>" style='margin: 0;'> <select name='category_id'> - <option value='${productCategory.productCategoryId}'>${productCategory.categoryName?if_exists}</option> + <option value='${productCategory.productCategoryId}'>${productCategory.categoryName!}</option> <option value='${productCategory.productCategoryId}'>--</option> <#list quickAddCats as quickAddCatalogId> <#assign loopCategory = delegator.findOne("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", quickAddCatalogId), true)> <#if loopCategory?has_content> - <option value='${quickAddCatalogId}'>${loopCategory.categoryName?if_exists}</option> + <option value='${quickAddCatalogId}'>${loopCategory.categoryName!}</option> </#if> </#list> </select> @@ -39,15 +39,15 @@ under the License. </form> </td> </tr> - <#if productCategory.categoryImageUrl?exists || productCategory.longDescription?exists> + <#if productCategory.categoryImageUrl?? || productCategory.longDescription??> <tr><td colspan='2'><hr class='sepbar'/></td></tr> <tr> <td valign="top" width="0" colspan='2'> <div> - <#if productCategory.categoryImageUrl?exists> + <#if productCategory.categoryImageUrl??> <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgLarge" alt="" /> </#if> - ${productCategory.longDescription?if_exists} + ${productCategory.longDescription!} </div> </td> </tr> @@ -55,7 +55,7 @@ under the License. </table> </#if> -<#if productCategoryMembers?exists && 0 < productCategoryMembers?size> +<#if productCategoryMembers?? && 0 < productCategoryMembers?size> <br /> <center> <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if product?exists> +<#if product??> <span class="pid"> <div> <b>${product.productId}</b> @@ -25,12 +25,12 @@ under the License. </span> <span class="name"> <div> - <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a> + <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME")!}</a> </div> </span> <span class="listPrice"> <div> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/> <#else> @@ -38,25 +38,25 @@ under the License. </div> </span> <span class="totalPrice"> - <#if totalPrice?exists> + <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> - <div class="<#if price.isSale?exists && price.isSale>salePrice<#else>normalPrice</#if>"> + <div class="<#if price.isSale?? && price.isSale>salePrice<#else>normalPrice</#if>"> <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b> </div> </#if> </span> <span class="qty"> <#-- check to see if introductionDate hasn't passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div> <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.before(product.salesDiscontinuationDate)> + <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)> <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div> <#-- check to see if the product is a virtual product --> <#elseif product.isVirtual?default("N") == "Y"> <div> - <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> + <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> </div> <#else> <div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl Mon Aug 18 07:42:27 2014 @@ -17,8 +17,8 @@ specific language governing permissions under the License. --> <#-- variable setup and worker calls --> -<#if (requestAttributes.topLevelList)?exists><#assign topLevelList = requestAttributes.topLevelList></#if> -<#if (requestAttributes.curCategoryId)?exists><#assign curCategoryId = requestAttributes.curCategoryId></#if> +<#if (requestAttributes.topLevelList)??><#assign topLevelList = requestAttributes.topLevelList></#if> +<#if (requestAttributes.curCategoryId)??><#assign curCategoryId = requestAttributes.curCategoryId></#if> <#-- looping macro --> <#macro categoryList parentCategory category> @@ -26,55 +26,55 @@ under the License. <#--if parentCategory.productCategoryId != category.productCategoryId> <#local pStr = "/~pcategory=" + parentCategory.productCategoryId> </#if--> - <#if curCategoryId?exists && curCategoryId == category.productCategoryId> + <#if curCategoryId?? && curCategoryId == category.productCategoryId> <div class="browsecategorytext"> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> </#if> - <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> </#if> <#else> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?if_exists}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName!}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> </#if> </#if> </div> <#else> <div class="browsecategorytext"> <#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> </#if> <#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> </#if> <#else> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?if_exists}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName!}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> </#if> </#if> </div> </#if> - <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> + <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId == category.productCategoryId)> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> - <#if subCatList?exists> + <#if subCatList??> <#list subCatList as subCat> <div class="browsecategorylist"> <@categoryList parentCategory=category category=subCat/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkinits.ftl Mon Aug 18 07:42:27 2014 @@ -20,7 +20,7 @@ under the License. <#assign shoppingCartOrderType = ""> <#assign shoppingCartProductStore = "NA"> <#assign shoppingCartChannelType = ""> -<#if shoppingCart?exists> +<#if shoppingCart??> <#assign shoppingCartOrderType = shoppingCart.getOrderType()> <#assign shoppingCartProductStore = shoppingCart.getProductStoreId()?default("NA")> <#assign shoppingCartChannelType = shoppingCart.getChannelType()?default("")> @@ -36,7 +36,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> + <li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li> <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li> <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> </ul> @@ -44,7 +44,7 @@ under the License. </div> <div class="screenlet-body"> <form method="post" name="salesentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> - <input type="hidden" name="originOrderId" value="${parameters.originOrderId?if_exists}"/> + <input type="hidden" name="originOrderId" value="${parameters.originOrderId!}"/> <input type="hidden" name="finalizeMode" value="type"/> <input type="hidden" name="orderMode" value="SALES_ORDER"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> @@ -54,17 +54,17 @@ under the License. <td > </td> <td valign='middle'> <div class='tabletext'> - <select name="productStoreId"<#if sessionAttributes.orderMode?exists> disabled</#if>> + <select name="productStoreId"<#if sessionAttributes.orderMode??> disabled</#if>> <#assign currentStore = shoppingCartProductStore> <#if defaultProductStore?has_content> - <option value="${defaultProductStore.productStoreId}">${defaultProductStore.storeName?if_exists}</option> + <option value="${defaultProductStore.productStoreId}">${defaultProductStore.storeName!}</option> <option value="${defaultProductStore.productStoreId}">----</option> </#if> <#list productStores as productStore> - <option value="${productStore.productStoreId}"<#if productStore.productStoreId == currentStore> selected="selected"</#if>>${productStore.storeName?if_exists}</option> + <option value="${productStore.productStoreId}"<#if productStore.productStoreId == currentStore> selected="selected"</#if>>${productStore.storeName!}</option> </#list> </select> - <#if sessionAttributes.orderMode?exists>${uiLabelMap.OrderCannotBeChanged}</#if> + <#if sessionAttributes.orderMode??>${uiLabelMap.OrderCannotBeChanged}</#if> </div> </td> </tr> @@ -78,7 +78,7 @@ under the License. <select name="salesChannelEnumId"> <#assign currentChannel = shoppingCartChannelType> <#if defaultSalesChannel?has_content> - <option value="${defaultSalesChannel.enumId}">${defaultSalesChannel.description?if_exists}</option> + <option value="${defaultSalesChannel.enumId}">${defaultSalesChannel.description!}</option> <option value="${defaultSalesChannel.enumId}"> ---- </option> </#if> <option value="">${uiLabelMap.OrderNoChannel}</option> @@ -90,10 +90,10 @@ under the License. </td> </tr> <tr><td colspan="4"> </td></tr> - <#if partyId?exists> + <#if partyId??> <#assign thisPartyId = partyId> <#else> - <#assign thisPartyId = requestParameters.partyId?if_exists> + <#assign thisPartyId = requestParameters.partyId!> </#if> <tr> <td> </td> @@ -111,7 +111,7 @@ under the License. <td> </td> <td valign='middle'> <div class='tabletext'> - <@htmlTemplate.lookupField value='${thisPartyId?if_exists}' formName="salesentryform" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/> + <@htmlTemplate.lookupField value='${thisPartyId!}' formName="salesentryform" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/> </div> </td> </tr> @@ -128,7 +128,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> + <li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li> <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li> <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> </ul> @@ -139,10 +139,10 @@ under the License. <input type='hidden' name='finalizeMode' value='type'/> <input type='hidden' name='orderMode' value='PURCHASE_ORDER'/> <table width="100%" border='0' cellspacing='0' cellpadding='0'> - <#if partyId?exists> + <#if partyId??> <#assign thisPartyId = partyId> <#else> - <#assign thisPartyId = requestParameters.partyId?if_exists> + <#assign thisPartyId = requestParameters.partyId!> </#if> <tr> <td> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |