svn commit: r1618554 [28/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [28/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Mon Aug 18 07:42:27 2014 @@ -196,14 +196,14 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">Items to export</li> - <li><a href="<@ofbizUrl>clearExpListing</@ofbizUrl>?productStoreId=${productStoreId?if_exists}">Clear Listing</a></li> - <#if isExportValid?exists && isExportValid == "true"> - <li><a href="<@ofbizUrl>exportListingToEbay</@ofbizUrl>?productStoreId=${productStoreId?if_exists}">Export Products Listing</a></li> + <li><a href="<@ofbizUrl>clearExpListing</@ofbizUrl>?productStoreId=${productStoreId!}">Clear Listing</a></li> + <#if isExportValid?? && isExportValid == "true"> + <li><a href="<@ofbizUrl>exportListingToEbay</@ofbizUrl>?productStoreId=${productStoreId!}">Export Products Listing</a></li> </#if> </ul><br class="clear"/></div> <div class="screenlet-body"> <form id="ProductsExportToEbay" method="post" action="<@ofbizUrl>exportProductsFromEbayStore</@ofbizUrl>" name="ProductsExportToEbay"> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> <table class="basic-table" cellspacing="0"> <tr><td> <#if addItemObj?has_content> @@ -214,9 +214,9 @@ under the License. <#if contentList?has_content> <#list contentList as content> <#if !isProductId?has_content> - <li <#if id == 1>class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li> + <li <#if id == 1>class="selected" <#assign isProductId = content.product.productId!><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId!}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName!}[${content.product.productId}]</a></li> <#else> - <li <#if isProductId?exists && isProductId?if_exists == content.product.productId?if_exists >class="selected" <#assign isProductId = content.product.productId?if_exists><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName?if_exists}[${content.product.productId}]</a></li> + <li <#if isProductId?? && isProductId! == content.product.productId! >class="selected" <#assign isProductId = content.product.productId!><#else>id="tabHeader${id}"</#if>><a href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>exportProductListing</@ofbizUrl>?isProductId=${content.product.productId!}';document.getElementById('ProductsExportToEbay').submit();">${content.product.productName!}[${content.product.productId}]</a></li> </#if> <#assign id = id+1> </#list> @@ -224,37 +224,37 @@ under the License. </ul> <br class="clear"/> </div> - <#assign addItemList = addItemObj.itemListing?if_exists> + <#assign addItemList = addItemObj.itemListing!> <#if addItemList?has_content> <#list addItemList as addItemObj> - <#assign addItem = addItemObj.addItemCall?if_exists> - <#assign isSaved = addItemObj.isSaved?if_exists> - <#assign isAutoRelist = addItemObj.isAutoRelist?if_exists> - <#assign requireEbayInventory = addItemObj.requireEbayInventory?if_exists> - <#assign item = addItem.getItem()?if_exists> - <#assign primaryCate = item.getPrimaryCategory()?if_exists> - <#assign storeFront = item.getStorefront()?if_exists> - <#if isProductId == item.getSKU()?if_exists> - <input type="hidden" name="productId" value="${item.getSKU()?if_exists}"/> + <#assign addItem = addItemObj.addItemCall!> + <#assign isSaved = addItemObj.isSaved!> + <#assign isAutoRelist = addItemObj.isAutoRelist!> + <#assign requireEbayInventory = addItemObj.requireEbayInventory!> + <#assign item = addItem.getItem()!> + <#assign primaryCate = item.getPrimaryCategory()!> + <#assign storeFront = item.getStorefront()!> + <#if isProductId == item.getSKU()!> + <input type="hidden" name="productId" value="${item.getSKU()!}"/> <#assign smallImageUrl = ""> <#if contentList?has_content> <#list contentList as content> - <#if content.product.productId?if_exists == item.getSKU()?if_exists><#assign smallImageUrl = content.productContentWrapper.get("SMALL_IMAGE_URL")?if_exists></#if> + <#if content.product.productId! == item.getSKU()!><#assign smallImageUrl = content.productContentWrapper.get("SMALL_IMAGE_URL")!></#if> </#list> </#if> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <table cellspacing="0" width="70%"> <tr> <td class="label">ItemID</td> - <td><input type="text" readonly="readonly" name="item" value="${item.getItemID()?if_exists}"/></td> + <td><input type="text" readonly="readonly" name="item" value="${item.getItemID()!}"/></td> <td class="label">Item Fee</td> <td> <div> - <input type="text" readonly="readonly" name="itemFee" value="${request.getAttribute("itemFee")?if_exists}"/> + <input type="text" readonly="readonly" name="itemFee" value="${request.getAttribute("itemFee")!}"/> <!-- itemlisting buttons bar --> <a href="#" onclick="javascript:document.ProductsExportToEbay.action='<@ofbizUrl>updateProductExportDetail</@ofbizUrl>';document.ProductsExportToEbay.submit();" class="buttontext">${uiLabelMap.CommonSave}</a> <#-- request.setAttribute("isSaved")--> - <#if isSaved?exists && isSaved=="Y"> + <#if isSaved?? && isSaved=="Y"> <a href="#" class="buttontext" onclick="javascript:document.ProductsExportToEbay.action='<@ofbizUrl>verifyItemBeforeAddAndExportToEbay</@ofbizUrl>';document.ProductsExportToEbay.submit();">Verifly Item</a> </#if> <a href="#" class="buttontext" onclick="javascript:document.ProductsExportToEbay.action='<@ofbizUrl>removeProductFromListing</@ofbizUrl>';document.ProductsExportToEbay.submit();">Remove</a> @@ -265,7 +265,7 @@ under the License. </tr> </table> <div class="screenlet"> - <div class="screenlet-title-bar"><ul><li class="h3">Product ${item.getSKU()?if_exists}</li></ul><br class="clear"/></div> + <div class="screenlet-title-bar"><ul><li class="h3">Product ${item.getSKU()!}</li></ul><br class="clear"/></div> <div class="screenlet-body"> <!-- ebay setting section --> <table width="100%" cellspacing="0"> @@ -275,8 +275,8 @@ under the License. <tr> <td class="label">SiteId</td> <td> - <#assign site = item.getSite().value()?if_exists> - <input type="text" readonly="readonly" name="site" value="${item.getSite().name()?if_exists} [${item.getSite()?if_exists}]"/> + <#assign site = item.getSite().value()!> + <input type="text" readonly="readonly" name="site" value="${item.getSite().name()!} [${item.getSite()!}]"/> </td> </tr> <!-- set ebay category --> @@ -287,32 +287,32 @@ under the License. <div id="loading"></div> <select id="ebayCategory" name="ebayCategory" onchange="retrieveEbayCategoryByParent('<@ofbizUrl>retrieveEbayCategoryByParent</@ofbizUrl>',this.value,'${productStoreId}','ebayCategory')"> <option value="">Please select</option> - <#if categories?exists> + <#if categories??> <#if primaryCate?has_content> <#if !primaryCate.isLeafCategory()?has_content> <#assign leafCate = "false"> <#else> <#assign leafCate = "true"> </#if> - <#assign primaryCateId = primaryCate.getCategoryID()?if_exists> - <option selected="selected" value="${primaryCate.getCategoryID()?if_exists}:${leafCate?if_exists}" >${primaryCate.getCategoryName()?if_exists}</option> + <#assign primaryCateId = primaryCate.getCategoryID()!> + <option selected="selected" value="${primaryCate.getCategoryID()!}:${leafCate!}" >${primaryCate.getCategoryName()!}</option> <#else> <#list categories as csCate> <#if !csCate.isLeafCategory()?has_content> <#assign leafCate = "false"> <#else> - CH_${primaryCate.getCategoryID()?if_exists}<#assign leafCate = "true"> + CH_${primaryCate.getCategoryID()!}<#assign leafCate = "true"> </#if> - <#assign primaryCateId = csCate.getCategoryID()?if_exists> - <option value="${csCate.getCategoryID()?if_exists}:${leafCate?if_exists}" >${csCate.getCategoryName()?if_exists}</option> + <#assign primaryCateId = csCate.getCategoryID()!> + <option value="${csCate.getCategoryID()!}:${leafCate!}" >${csCate.getCategoryName()!}</option> </#list> </#if> </#if> </select> - <a class="buttontext" href="javascript:retrieveEbayCategoryByParent('<@ofbizUrl>retrieveEbayCategoryByParent</@ofbizUrl>','CH_<#if primaryCate?has_content>${primaryCate.getCategoryID()?if_exists}</#if>','${productStoreId}','ebayCategory')">${uiLabelMap.EbayChangeCategory}</a> <a class="buttontext" href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>setSelectedCategory</@ofbizUrl>?isProductId=${isProductId?if_exists}';document.getElementById('ProductsExportToEbay').submit();">${uiLabelMap.EbaySet}</a> + <a class="buttontext" href="javascript:retrieveEbayCategoryByParent('<@ofbizUrl>retrieveEbayCategoryByParent</@ofbizUrl>','CH_<#if primaryCate?has_content>${primaryCate.getCategoryID()!}</#if>','${productStoreId}','ebayCategory')">${uiLabelMap.EbayChangeCategory}</a> <a class="buttontext" href="javascript:document.getElementById('ProductsExportToEbay').action = '<@ofbizUrl>setSelectedCategory</@ofbizUrl>?isProductId=${isProductId!}';document.getElementById('ProductsExportToEbay').submit();">${uiLabelMap.EbaySet}</a> </div> - <input type="hidden" name="primaryCateId" value="${primaryCateId?if_exists}"/> - <div id="ebayCategory_Name">${priCateName?if_exists}</div> + <input type="hidden" name="primaryCateId" value="${primaryCateId!}"/> + <div id="ebayCategory_Name">${priCateName!}</div> </td> </tr> <!-- end of set category --> @@ -324,30 +324,30 @@ under the License. <select id="ebayStore1Category" name="ebayStore1Category" onchange="retrieveEbayCategoryByParent('<@ofbizUrl>retrieveEbayStoreCategoryByParent</@ofbizUrl>',this.value,'${productStoreId}','ebayStore1Category')"> <option value="">Please select</option> <option value="">------</option> - <#if storeCategories?exists> + <#if storeCategories??> <#if storeFront?has_content> <#--if !storeFront.isLeafCategory()?has_content> <#assign leafCate = "false"> <#else> <#assign leafCate = "true"> </#if--> - <#assign storeCate1Id = storeFront.getStoreCategoryID()?if_exists> - <option selected="selected" value="${storeFront.getStoreCategoryID()?if_exists}" >${storeFront.getStoreCategoryID()?if_exists}</option> + <#assign storeCate1Id = storeFront.getStoreCategoryID()!> + <option selected="selected" value="${storeFront.getStoreCategoryID()!}" >${storeFront.getStoreCategoryID()!}</option> <#else> <#list storeCategories as csCate> <#--if !csCate.IsLeafCategory?has_content> <#assign leafCate = "false"> <#else> - CH_${storeFront.getStoreCategoryID()?if_exists}<#assign leafCate = "true"> + CH_${storeFront.getStoreCategoryID()!}<#assign leafCate = "true"> </#if--> - <#assign categoryId = csCate.getCategoryID()?if_exists> - <option value="${csCate.getCategoryID()?if_exists}" >${csCate.getName()?if_exists}</option> + <#assign categoryId = csCate.getCategoryID()!> + <option value="${csCate.getCategoryID()!}" >${csCate.getName()!}</option> </#list> </#if> </#if> </select> </div> - <input type="hidden" name="storeCate1Id" value="${storeCate1Id?if_exists}"/> + <input type="hidden" name="storeCate1Id" value="${storeCate1Id!}"/> </td> </tr> <tr> @@ -357,73 +357,73 @@ under the License. <div id="loading"></div> <select id="ebayStore2Category" name="ebayStore2Category" onchange="retrieveEbayCategoryByParent('<@ofbizUrl>retrieveEbayStoreCategoryByParent</@ofbizUrl>',this.value,'${productStoreId}','ebayStore2Category')"> <option value="">Please select</option> - <#if storeCategories?exists> + <#if storeCategories??> <#if storeFront?has_content> <#--if !storeFront.isLeafCategory()?has_content> <#assign leafCate = "false"> <#else> <#assign leafCate = "true"> </#if--> - <#assign storeCate2Id = storeFront.getStoreCategory2ID()?if_exists> - <option selected="selected" value="${storeFront.getStoreCategory2ID()?if_exists}" >${storeFront.getStoreCategory2ID()?if_exists}</option> + <#assign storeCate2Id = storeFront.getStoreCategory2ID()!> + <option selected="selected" value="${storeFront.getStoreCategory2ID()!}" >${storeFront.getStoreCategory2ID()!}</option> <#else> <#list storeCategories as csCate> <#--if !csCate.IsLeafCategory?has_content> <#assign leafCate = "false"> <#else> - CH_${storeFront.getStoreCategoryID()?if_exists}<#assign leafCate = "true"> + CH_${storeFront.getStoreCategoryID()!}<#assign leafCate = "true"> </#if--> - <#assign categoryId = csCate.getCategoryID()?if_exists> - <option value="${csCate.getCategoryID()?if_exists}" >${csCate.getName()?if_exists}</option> + <#assign categoryId = csCate.getCategoryID()!> + <option value="${csCate.getCategoryID()!}" >${csCate.getName()!}</option> </#list> </#if> </#if> </select> </div> - <input type="hidden" name="storeCate2Id" value="${storeCate2Id?if_exists}"/> + <input type="hidden" name="storeCate2Id" value="${storeCate2Id!}"/> </td> </tr> <tr> <td class="label">Title</td> - <td><input type="text" size="60" name="title" value="${item.getTitle()?if_exists}"/></td> + <td><input type="text" size="60" name="title" value="${item.getTitle()!}"/></td> </tr> <tr> <td class="label">SKU</td> - <td><input type="text" readonly="readonly" name="sku" value="${item.getSKU()?if_exists}"/></td> + <td><input type="text" readonly="readonly" name="sku" value="${item.getSKU()!}"/></td> </tr> <tr> <td class="label">PictureURL</td> <td> - <#assign pic = item.getPictureDetails()?if_exists> - <#assign picUrls = pic.getPictureURL()?if_exists> - <#assign picUrl = picUrls[0]?if_exists> - <input type="text" size="60" name="pictureUrl" value="${picUrl?if_exists}"/> + <#assign pic = item.getPictureDetails()!> + <#assign picUrls = pic.getPictureURL()!> + <#assign picUrl = picUrls[0]!> + <input type="text" size="60" name="pictureUrl" value="${picUrl!}"/> </td> </tr> <#--tr> <td class="label">Description</td> <input type="text" rows="3" cols="50" rows="4" name="description" size="50" value=""/> - <td><textarea name="description" style="height:88px;width:350px;"><#if item.getDescription()?exists>Description of item<#else>${item.getDescription()?if_exists}</#if></textarea></td> + <td><textarea name="description" style="height:88px;width:350px;"><#if item.getDescription()??>Description of item<#else>${item.getDescription()!}</#if></textarea></td> </tr--> <tr> <td class="label">${uiLabelMap.CommonCountry}</td> - <#if item.getCountry().value()?exists> + <#if item.getCountry().value()??> <#assign country = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Geo", {"geoCode": item.getCountry().value()}, null, false))/> <#if country?has_content> <#assign countryname = country.geoName/> </#if> </#if> - <td><input type="text" readonly="readonly" name="country" size="20" value="${countryname?if_exists?default(item.getCountry().value()?if_exists)}"/></td> + <td><input type="text" readonly="readonly" name="country" size="20" value="${countryname!?default(item.getCountry().value()!)}"/></td> </tr> <tr> <td class="label">${uiLabelMap.FormFieldTitle_location}</td> - <td><input type="text" name="location" size="50" maxlength="50" value="${item.getLocation()?if_exists}" /></td> + <td><input type="text" name="location" size="50" maxlength="50" value="${item.getLocation()!}" /></td> </tr> <tr> <td class="label"><b>Enable auto-relist item</b></td> <td><input type="checkbox" name="isAutoRelist" value="Y" <#if isAutoRelist == "Y">checked="checked"</#if>/></td> </tr> - <#if isReserve?exists && isReserve == true> + <#if isReserve?? && isReserve == true> <tr> <td class="label"><b>Require eBay Inventory</b></td> <td><input type="checkbox" name="requireEbayInventory" value="Y" <#if requireEbayInventory == "Y">checked="checked"</#if>/></td> @@ -439,10 +439,10 @@ under the License. <table width="100%" height="100%" id="table2" cellspacing="0"> <tr> <td> - <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> - ${uiLabelMap.ProductProductId} : ${item.getSKU()?if_exists}<br /> - ${uiLabelMap.ProductProductName} : ${item.getTitle()?if_exists}<br /> - ${uiLabelMap.CommonDescription} : ${item.getDescription()?if_exists} + <img src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> + ${uiLabelMap.ProductProductId} : ${item.getSKU()!}<br /> + ${uiLabelMap.ProductProductName} : ${item.getTitle()!}<br /> + ${uiLabelMap.CommonDescription} : ${item.getDescription()!} </td> </tr> </table> @@ -452,26 +452,26 @@ under the License. </div> </div> <!-- item specifices section --> - <#if primaryCate?has_content && primaryCate.getCategoryID()?exists && listingTypes?has_content> + <#if primaryCate?has_content && primaryCate.getCategoryID()?? && listingTypes?has_content> <#if checkSpecific == "true"> <div class="screenlet"> <div class="screenlet-title-bar"><ul><li class="h3">Item specifices</li></ul><br class="clear"/></div> <div class="screenlet-body"> <table width="50%" height="100%" id="table2" cellspacing="0"> <#list categorySpecifix?keys as key> - <#assign values = categorySpecifix.get(key)?if_exists/> + <#assign values = categorySpecifix.get(key)!/> <#assign i = 0/> <#list values?keys as nameSpecific> - <#assign itemSpecifics = values.get(nameSpecific)?if_exists/> + <#assign itemSpecifics = values.get(nameSpecific)!/> <#if itemSpecifics?has_content> <tr> - <td class="label">${nameSpecific?if_exists}</td> - <input type="hidden" name="nameValueListType_o_${i}" value="${nameSpecific?if_exists}"/> + <td class="label">${nameSpecific!}</td> + <input type="hidden" name="nameValueListType_o_${i}" value="${nameSpecific!}"/> <td> <select id="categorySpecifics" name="categorySpecifics_o_${i}"> <option value="" ></option> <#list itemSpecifics as itemSpecific> - <option value="${itemSpecific?if_exists}" >${itemSpecific?if_exists}</option> + <option value="${itemSpecific!}" >${itemSpecific!}</option> </#list> </select> </td> @@ -487,7 +487,7 @@ under the License. </#if> </#if> <!-- Setup ad templates section --> - <#if primaryCate?has_content && primaryCate.getCategoryID()?exists && listingTypes?has_content> + <#if primaryCate?has_content && primaryCate.getCategoryID()?? && listingTypes?has_content> <div class="screenlet"> <div class="screenlet-title-bar"><ul><li class="h3">Details</li></ul><br class="clear"/></div> <div class="screenlet-body"> @@ -511,7 +511,7 @@ under the License. } </script> <textarea id="description" name="description" style="width:800px; height:300px"> - <#if item.getDescription()?exists>description<#else>${item.getDescription()?if_exists}</#if> + <#if item.getDescription()??>description<#else>${item.getDescription()!}</#if> </textarea> <script type="text/javascript"> jQuery('#description').elrte(opts); @@ -529,9 +529,9 @@ under the License. <td class="label">Select Theme</td> <td> <#if adItemTemplates?has_content> - <select id="themeGroup" disabled onchange="javascript:retrieveTemplateByTemGroupId(this.value,'${productStoreId?if_exists}','${primaryCate.getCategoryID()?if_exists}');" name="themeGroup"> + <select id="themeGroup" disabled onchange="javascript:retrieveTemplateByTemGroupId(this.value,'${productStoreId!}','${primaryCate.getCategoryID()!}');" name="themeGroup"> <#list adItemTemplates as adItemTemplate> - <option value="${adItemTemplate.TemplateGroupId?if_exists}">${adItemTemplate.TemplateGroupName?if_exists}</option> + <option value="${adItemTemplate.TemplateGroupId!}">${adItemTemplate.TemplateGroupName!}</option> </#list> </select> </#if> @@ -567,7 +567,7 @@ under the License. </div> </#if> <!-- product Price Type --> - <#if primaryCate?has_content && primaryCate.getCategoryID()?exists && listingTypes?has_content> + <#if primaryCate?has_content && primaryCate.getCategoryID()?? && listingTypes?has_content> <div class="screenlet"> <div class="screenlet-title-bar"><ul><li class="h3">Listing Type</li></ul><br class="clear"/></div> <div class="screenlet-body"> @@ -579,10 +579,10 @@ under the License. <#assign tabName = ""> <#list listingTypes as listingType> <#-- default with aution and fixed price --> - <#if listingType.type?if_exists.equals("Chinese") || listingType.type?if_exists == "FixedPriceItem"> - <#if listingType.type?if_exists.equals("Chinese") > <#assign tabName = "Auction"></#if> - <#if listingType.type?if_exists.equals("FixedPriceItem") > <#assign tabName = "Fixed Price"></#if> - <li <#if id==1 > style="margin-left: 1px" id="tabHeaderActive_"<#else> id="tabHeader_${id}" </#if>><a href="javascript:void(0)" onclick="toggleTab(${id},2)"><span>${tabName?if_exists}</span></a></li> + <#if listingType.type.equals("Chinese") || listingType.type == "FixedPriceItem"> + <#if listingType.type.equals("Chinese") > <#assign tabName = "Auction"></#if> + <#if listingType.type.equals("FixedPriceItem") > <#assign tabName = "Fixed Price"></#if> + <li <#if id==1 > style="margin-left: 1px" id="tabHeaderActive_"<#else> id="tabHeader_${id}" </#if>><a href="javascript:void(0)" onclick="toggleTab(${id},2)"><span>${tabName!}</span></a></li> <#assign id = id + 1> </#if> </#list> @@ -591,26 +591,26 @@ under the License. <div id="tabscontent"> <#assign id = 1> <#list listingTypes as listingType> - <#if listingType.type?if_exists.equals("Chinese") || listingType.type?if_exists == "FixedPriceItem"> - <#if listingType.type?if_exists.equals("Chinese") > <#assign tabName = "Auction"></#if> - <#if listingType.type?if_exists.equals("FixedPriceItem") ><#assign tabName = "Fixed Price"></#if> + <#if listingType.type.equals("Chinese") || listingType.type! == "FixedPriceItem"> + <#if listingType.type.equals("Chinese") > <#assign tabName = "Auction"></#if> + <#if listingType.type.equals("FixedPriceItem") ><#assign tabName = "Fixed Price"></#if> <div id="tabContent${id}" class="tabContent" <#if id != 1>style="display:none;"</#if>> <br /> <table width="50%" height="100%" id="table2" cellspacing="0"> <tr> <td class="label"></td> <td> - <#if listingType.type?if_exists.equals("Chinese")> - <input type="radio" name="listype" value="auction"/><b>${tabName?if_exists}</b> - <#--<input type="checkbox" value="Y" name="enabledAuction_${id}" /><b>${tabName?if_exists}</b></checkbox--> - <#elseif listingType.type?if_exists == "FixedPriceItem"> - <input type="radio" name="listype" value="fixedprice"/><b>${tabName?if_exists}</b> - <#--input type="checkbox" value="Y" name="enabledFixedPrice_${id}" /><b>${tabName?if_exists}</b></checkbox--> + <#if listingType.type.equals("Chinese")> + <input type="radio" name="listype" value="auction"/><b>${tabName!}</b> + <#--<input type="checkbox" value="Y" name="enabledAuction_${id}" /><b>${tabName!}</b></checkbox--> + <#elseif listingType.type == "FixedPriceItem"> + <input type="radio" name="listype" value="fixedprice"/><b>${tabName!}</b> + <#--input type="checkbox" value="Y" name="enabledFixedPrice_${id}" /><b>${tabName!}</b></checkbox--> </#if> </td> <td class="label">Duration</td> <td> - <#assign durations = listingType.durations?if_exists> + <#assign durations = listingType.durations!> <#if durations?has_content> <select name="duration_${id}"> <#list durations as duration> @@ -619,7 +619,7 @@ under the License. <#elseif duration == "GTC"> <#assign dura = "Good 'Til Cancelled"> </#if> - <option value="${duration?if_exists}">${dura?if_exists} ${uiLabelMap.CommonDays}</option> + <option value="${duration!}">${dura!} ${uiLabelMap.CommonDays}</option> </#list> </select> </#if> @@ -628,7 +628,7 @@ under the License. <tr> <td class="label">${uiLabelMap.CommonQuantity}</td> <td> - <#if listingType.type?if_exists.equals("FixedPriceItem") > + <#if listingType.type.equals("FixedPriceItem") > <input type="text" size="3" value="1" name="quantity_${id}" size="12" maxlength="3"/> <#else> <input type="text" size="3" value="1" disabled name="quantity_${id}" size="12" maxlength="3"/> @@ -639,32 +639,32 @@ under the License. </tr> <#if productPrices?has_content> <#list productPrices as productPrice> - <#assign currencyUomId = productPrice.currencyUomId?if_exists> + <#assign currencyUomId = productPrice.currencyUomId!> <#if productPrice.productPriceTypeId == "MINIMUM_PRICE"> - <#assign min = productPrice.price?if_exists> + <#assign min = productPrice.price!> <#elseif productPrice.productPriceTypeId == "MAXIMUM_PRICE"> - <#assign max = productPrice.price?if_exists> + <#assign max = productPrice.price!> </#if> </#list> </#if> <tr> - <input type="hidden" name="currencyId_${id}" value="${currencyUomId?if_exists}"/> - <#if listingType.type?if_exists.equals("FixedPriceItem") > + <input type="hidden" name="currencyId_${id}" value="${currencyUomId!}"/> + <#if listingType.type.equals("FixedPriceItem") > <td class="label">Start Price</td> - <td><input type="text" size="6" name="startPrice_${id}" value="${min?if_exists}" />${currencyUomId?if_exists}</td> + <td><input type="text" size="6" name="startPrice_${id}" value="${min!}" />${currencyUomId!}</td> <td class="label"></td> <td></td> <#else> <td class="label">Start Price</td> - <td><input type="text" size="6" name="startPrice_${id}" value="${min?if_exists}" />${currencyUomId?if_exists}</td> + <td><input type="text" size="6" name="startPrice_${id}" value="${min!}" />${currencyUomId!}</td> <td class="label">BIN Price</td> - <td><input type="text" size="6" name="buyItNowPrice_${id}" value="${max?if_exists}" <#if listingType.type?if_exists.equals("FixedPriceItem") >disabled="disabled"</#if> />${currencyUomId?if_exists}</td> + <td><input type="text" size="6" name="buyItNowPrice_${id}" value="${max!}" <#if listingType.type.equals("FixedPriceItem") >disabled="disabled"</#if> />${currencyUomId!}</td> </#if> </tr> - <#if !listingType.type?if_exists.equals("FixedPriceItem") > + <#if !listingType.type.equals("FixedPriceItem") > <tr> <td class="label">Reserve Price</td> - <td><input type="text" size="6" name="reservePrice_${id}" <#if listingType.type?if_exists.equals("FixedPriceItem") >disabled="disabled"</#if> />${currencyUomId?if_exists}</td> + <td><input type="text" size="6" name="reservePrice_${id}" <#if listingType.type.equals("FixedPriceItem") >disabled="disabled"</#if> />${currencyUomId!}</td> <td class="label"></td> <td></td> </tr> @@ -675,7 +675,7 @@ under the License. <td class="label">Postal code</td> <td><input type="text" size="10" name="postalCode_${id}" /></td> </tr> - <#if listingType.type?if_exists.equals("FixedPriceItem") > + <#if listingType.type.equals("FixedPriceItem") > <tr> <td class="label"></td><!-- use when fixed price and store fixed price --> <td><input type="checkbox" value="true" name="enableBestOffer_${id}" /><b>Enable Best Offer</b></td> @@ -696,7 +696,7 @@ under the License. </div> </#if> <!-- payment section --> - <#if primaryCate?has_content && primaryCate.getCategoryID()?exists && listingTypes?has_content> + <#if primaryCate?has_content && primaryCate.getCategoryID()?? && listingTypes?has_content> <div class="screenlet"> <div class="screenlet-title-bar"><ul><li class="h3">Payment</li></ul><br class="clear"/></div> <div class="screenlet-body"> @@ -717,11 +717,11 @@ under the License. <#list paymentMethods as paymentMethod> <#if paymentMethod.value()??> <#if j == 0><tr></#if> - <#if paymentMethod.compareTo(buyerPayMethCode_PAY_PAL?if_exists) == 0 > + <#if paymentMethod.compareTo(buyerPayMethCode_PAY_PAL!) == 0 > <#assign is_payPal = true> </#if> - <td valign="top"><input type="checkbox" value="true" name="Payments_${paymentMethod.value()?if_exists}" /></td> - <td align="left"><b>${paymentMethod.value()?if_exists}</b></td> + <td valign="top"><input type="checkbox" value="true" name="Payments_${paymentMethod.value()!}" /></td> + <td align="left"><b>${paymentMethod.value()!}</b></td> <#if j == 3> </tr> <#assign j = 0> @@ -733,7 +733,7 @@ under the License. </table> <#--assign i = 0> <#list paymentMethods as paymentMethod> - <input type="checkbox" value="${paymentMethod.name()?if_exists}" name="${paymentMethod.name()?if_exists}_${id}">${paymentMethod.value()?if_exists}</checkbox><span style="width:40px"/><#if i==3><br /><#assign i = -1></#if> + <input type="checkbox" value="${paymentMethod.name()!}" name="${paymentMethod.name()!}_${id}">${paymentMethod.value()!}</checkbox><span style="width:40px"/><#if i==3><br /><#assign i = -1></#if> <#assign i=i+1> </#list--> </#if> @@ -752,7 +752,7 @@ under the License. </div> </div> </#if> - <#if primaryCate?has_content && primaryCate.getCategoryID()?exists && listingTypes?has_content> + <#if primaryCate?has_content && primaryCate.getCategoryID()?? && listingTypes?has_content> <div class="screenlet"> <div class="screenlet-title-bar"><ul><li class="h3">Shipping Service</li></ul><br class="clear"/></div> <div class="screenlet-body"> @@ -774,8 +774,8 @@ under the License. </#if> <#if shippingServiceDetails?has_content> <#list shippingServiceDetails as shippingServiceDetail> - <#assign shippingService = shippingServiceDetail.getShippingService()?if_exists> - <option value="${shippingService?if_exists}">${shippingService?if_exists}</option> + <#assign shippingService = shippingServiceDetail.getShippingService()!> + <option value="${shippingService!}">${shippingService!}</option> </#list> </#if> </select> @@ -793,10 +793,10 @@ under the License. <table> <#assign j=0> <#list shippingLocationDetails as shippingLocationDetail> - <#assign shippingLocation = shippingLocationDetail.getShippingLocation()?if_exists> + <#assign shippingLocation = shippingLocationDetail.getShippingLocation()!> <#if j==0><tr></#if> - <td valign="top"><input type="checkbox" value="true" name="Shipping_${shippingLocation?if_exists}" /></td> - <td align="left"><b>${shippingLocationDetail.getDescription()?if_exists}</b></td> + <td valign="top"><input type="checkbox" value="true" name="Shipping_${shippingLocation!}" /></td> + <td align="left"><b>${shippingLocationDetail.getDescription()!}</b></td> <#if j==3></tr><#assign j=0><#else><#assign j=j+1></#if> </#list> </table> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl Mon Aug 18 07:42:27 2014 @@ -17,23 +17,23 @@ specific language governing permissions under the License. --> -<#assign returnPolicyEnabled = ReturnPolicyEnabled?if_exists> -<#assign eBayDetails = EBayDetails?if_exists> +<#assign returnPolicyEnabled = ReturnPolicyEnabled!> +<#assign eBayDetails = EBayDetails!> <#if eBayDetails?has_content> <#assign returnPolicyDetails = eBayDetails.getReturnPolicyDetails()> </#if> -<#if !returnPolicyEnabled?exists><#assign not = "not"></#if> -<#assign title = "Return policy is "+not?if_exists+" enabled for this category."> +<#if !returnPolicyEnabled??><#assign not = "not"></#if> +<#assign title = "Return policy is "+not!+" enabled for this category."> <form name="APIForm" id="APIForm" method="post" action="ReturnPolicyServlet" > <table align="center" border="0"> <tr><td><img src="ebay.gif" alt="" /></td></tr> - <tr><td>${title?if_exists}</td></tr> + <tr><td>${title!}</td></tr> <tr> <td> </td> </tr> <!-- specify return policy --> - <#if returnPolicyEnabled?if_exists == true> + <#if returnPolicyEnabled! == true> <tr align="left"> <td><b>Returns accepted:</b></td> </tr> @@ -41,14 +41,14 @@ under the License. <td> <select name="ReturnsAccepted"> <#if returnPolicyDetails?has_content> - <#assign retAccpTypeArray = returnPolicyDetails.getReturnsAccepted()?if_exists> + <#assign retAccpTypeArray = returnPolicyDetails.getReturnsAccepted()!> for(int j = 0; j < retAccpTypeArray.length; j++){ <#list retAccpTypeArray as retAccpType> <#assign returnAccepted = ""> - <option value="${retAccpType.getReturnsAcceptedOption()?if_exists}" - <#if returnAccepted?? && returnAccepted.equalsIgnoreCase(retAccpType.getReturnsAcceptedOption()?if_exists)>selected="select"</#if>> - ${retAccpType.getDescription()?if_exists}</option> + <option value="${retAccpType.getReturnsAcceptedOption()!}" + <#if returnAccepted?? && returnAccepted.equalsIgnoreCase(retAccpType.getReturnsAcceptedOption()!)>selected="select"</#if>> + ${retAccpType.getDescription()!}</option> </#list> </#if> </select> @@ -64,12 +64,12 @@ under the License. <td> <select name="ReturnsWithin"> <#if returnPolicyDetails?has_content> - <#assign retWithinArray = returnPolicyDetails.getReturnsWithin()?if_exists> + <#assign retWithinArray = returnPolicyDetails.getReturnsWithin()!> <#list retWithinArray as retWithin> <#assign returnWithin = ""> - <option value="${retWithin.getReturnsWithinOption()?if_exists}" - <#if returnWithin?? && returnWithin.equalsIgnoreCase(retWithin.getReturnsWithinOption()?if_exists)>selected="select"</#if>> - ${retWithin.getDescription()?if_exists}</option> + <option value="${retWithin.getReturnsWithinOption()!}" + <#if returnWithin?? && returnWithin.equalsIgnoreCase(retWithin.getReturnsWithinOption()!)>selected="select"</#if>> + ${retWithin.getDescription()!}</option> </#list> </#if> </select> @@ -87,12 +87,12 @@ under the License. <td> <select name="Refund"> <#if returnPolicyDetails?has_content> - <#assign refundArray = returnPolicyDetails.getRefund()?if_exists> + <#assign refundArray = returnPolicyDetails.getRefund()!> <#list refundArray as refundAr> <#assign refund = ""> - <option value="${refundAr.getRefundOption()?if_exists}" + <option value="${refundAr.getRefundOption()!}" <#if refund?? && refund.equalsIgnoreCase(refundAr.getRefundOption())>selected="select"</#if>> - ${refundArray[j].getDescription()?if_exists}</option> + ${refundArray[j].getDescription()!}</option> </#list> </#if> </select> @@ -109,12 +109,12 @@ under the License. <td> <select name="ShippingCostPaidBy"> <#if returnPolicyDetails?has_content> - <#assign paidByArray = returnPolicyDetails.getShippingCostPaidBy()?if_exists> + <#assign paidByArray = returnPolicyDetails.getShippingCostPaidBy()!> <#list paidByArray as paidBy> <#assign shippingCostPaidBy = ""> - <option value="${paidBy.getShippingCostPaidByOption()?if_exists}" - <#if shippingCostPaidBy?? && shippingCostPaidBy.equalsIgnoreCase(paidBy.getShippingCostPaidByOption()?if_exists)>selected="select"</#if>> - ${paidBy.getDescription()?if_exists}</option> + <option value="${paidBy.getShippingCostPaidByOption()!}" + <#if shippingCostPaidBy?? && shippingCostPaidBy.equalsIgnoreCase(paidBy.getShippingCostPaidByOption()!)>selected="select"</#if>> + ${paidBy.getDescription()!}</option> </#list> </#if> </select> @@ -130,7 +130,7 @@ under the License. </tr> <tr align="left"> <td> - <textarea name="ReturnPolicyDetailsDescription" cols="70" rows="6"<#if !returnPolicyDetails.isDescription()?if_exists.booleanValue()>disabled="true"</#if>></textarea> + <textarea name="ReturnPolicyDetailsDescription" cols="70" rows="6"<#if !returnPolicyDetails.isDescription().booleanValue()>disabled="true"</#if>></textarea> </td> </tr> <tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Mon Aug 18 07:42:27 2014 @@ -29,20 +29,6 @@ <value xml:lang="zh">å ³äºæ们</value> <value xml:lang="zh_TW">éæ¼æå</value> </property> - <property key="EcommerceANew"> - <value xml:lang="da">en ny</value> - <value xml:lang="de">Ein neues</value> - <value xml:lang="en">a new</value> - <value xml:lang="fr">un nouvel</value> - <value xml:lang="it">una nuova</value> - <value xml:lang="ja">ãç¥ãã</value> - <value xml:lang="nl">een nieuw(e)</value> - <value xml:lang="pt_BR">uma nova</value> - <value xml:lang="th">à¹à¸«à¸¡à¹</value> - <value xml:lang="vi">má»i</value> - <value xml:lang="zh">ä¸ä¸ªæ°ç</value> - <value xml:lang="zh_TW">ä¸åæ°ç</value> - </property> <property key="EcommerceAccountInformation"> <value xml:lang="da">Konto information</value> <value xml:lang="en">Account Information</value> @@ -2302,32 +2288,6 @@ <value xml:lang="zh">æ°æ³¨åå表</value> <value xml:lang="zh_TW">æ°è¨»åå表</value> </property> - <property key="EcommerceNewPasswordMssgEncryptionOff"> - <value xml:lang="da">Deres adgangskode er:</value> - <value xml:lang="de">Ihr Passwort ist: </value> - <value xml:lang="en">Your password is :- </value> - <value xml:lang="fr">Votre mot de passe est : </value> - <value xml:lang="it">La tua password è :- </value> - <value xml:lang="ja">ããªãã®ãã¹ã¯ã¼ã㯠:-</value> - <value xml:lang="nl">Uw wachtwoord is :</value> - <value xml:lang="pt_BR">Sua senha é:</value> - <value xml:lang="zh">ä½ çå¯ç æ¯ï¼- </value> - <value xml:lang="vi">Máºt khẩu của bạn :-</value> - <value xml:lang="zh_TW">ä½ çå¯ç¢¼æ¯ :- </value> - </property> - <property key="EcommerceNewPasswordMssgEncryptionOn"> - <value xml:lang="da">Deres nye adgangskode er :- </value> - <value xml:lang="de">Ihr neues Passwort ist : </value> - <value xml:lang="en">Your new password is :- </value> - <value xml:lang="fr">Votre nouveau mot de passe est : </value> - <value xml:lang="it">La nuova password è :- </value> - <value xml:lang="ja">ããªãã®æ°ãããã¹ã¯ã¼ã㯠:-</value> - <value xml:lang="nl">Uw nieuwe wachtwoord is : </value> - <value xml:lang="pt_BR">Sua nova senha é:</value> - <value xml:lang="zh">ä½ çæ°å¯ç æ¯ï¼- </value> - <value xml:lang="zh_TW">ä½ çæ°å¯ç¢¼æ¯ :- </value> - <value xml:lang="vi">Máºt khẩu má»i của bạn :-</value> - </property> <property key="EcommerceNoDigitalProductsFound"> <value xml:lang="da">Der er ikke fundet nogen digitale produkter</value> <value xml:lang="de">Keine digitalen Produkte gefunden</value> @@ -2697,20 +2657,6 @@ <value xml:lang="zh">å¯ç æ¯</value> <value xml:lang="zh_TW">å¯ç¢¼æ¯</value> </property> - <property key="EcommercePasswordSentToYou"> - <value xml:lang="da">kodeord er sendt til Dem</value> - <value xml:lang="de">Passwort das Ihnen zugesendet wurde</value> - <value xml:lang="en">password sent to you</value> - <value xml:lang="fr">mot de passe qui vous a été envoyé</value> - <value xml:lang="it">password inviata a te</value> - <value xml:lang="ja">ãã¹ã¯ã¼ããéä¿¡ãã¾ãã</value> - <value xml:lang="nl">Wachtwoord dat naar u verzonden is</value> - <value xml:lang="pt_BR">Senha enviada para você</value> - <value xml:lang="th">สà¹à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¸à¸¶à¸à¸à¸¸à¸</value> - <value xml:lang="vi">máºt khẩu Äược gá»i tá»i bạn</value> - <value xml:lang="zh">å¯ç åéç»ä½ äº</value> - <value xml:lang="zh_TW">å¯ç¢¼å·²ç¼éçµ¦ä½ </value> - </property> <property key="EcommercePleaseWait"> <value xml:lang="da">Vent venligst</value> <value xml:lang="de">Bitte warten</value> @@ -3842,20 +3788,6 @@ <value xml:lang="zh">è°¢è°¢ä½ </value> <value xml:lang="zh_TW">è¬è¬ä½ </value> </property> - <property key="EcommerceThisEmailIsInResponseToYourRequestToHave"> - <value xml:lang="da">Denne E-mail er et svar pÃ¥ Deres forespørgsel for at fÃ¥</value> - <value xml:lang="de">Dieses E-Mail ist eine Antwort auf Ihre Anfrage zu </value> - <value xml:lang="en">This email is in response to your request to have</value> - <value xml:lang="fr">Ce courriel en réponse à votre demande d'obtenir</value> - <value xml:lang="it">Questa email ti è stata inviata in seguito alla tua richiesta.</value> - <value xml:lang="ja">ãã®ã¡ã¼ã«ã¯ããªãããªã¯ã¨ã¹ãããããã®ã§ã</value> - <value xml:lang="nl">Deze email is verzonden naar aanleiding van uw verzoek.</value> - <value xml:lang="pt_BR">Este e-mail lhe foi enviado devido ao seu pedido</value> - <value xml:lang="th">à¸à¸³à¸£à¹à¸à¸à¸à¸à¸à¸à¸¸à¸à¸¡à¸µà¸à¸²à¸£à¸à¸à¸à¹à¸à¸à¸µà¹à¸¡à¸¥à¸à¸µà¹</value> - <value xml:lang="vi">ThÆ° Äiá»n tá» nà y Äá» phản há»i viá»c bạn yêu cầu muá»n có</value> - <value xml:lang="zh">è¿ä¸ªçµåé®ä»¶æ¯åçä½ è¦æ±ç</value> - <value xml:lang="zh_TW">æ¤é»åéµä»¶æ¯åè¦ä½ çè¦æ±ç</value> - </property> <property key="EcommerceToOrderCreateCustRequestFromCart"> <value xml:lang="da">For at bestille, opret kundeanmodning fra indkøbskurv</value> <value xml:lang="de">um einen Auftrag zu erstellen machen Sie eine Anfrage über den Warenkorb</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListEmailTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListEmailTemplate.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListEmailTemplate.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListEmailTemplate.ftl Mon Aug 18 07:42:27 2014 @@ -27,10 +27,10 @@ under the License. <label>E-mail: ${emailAddress}</label> <input type="hidden" name="contactListId" value="${contactListId}" /> <input type="hidden" name="partyId" value="${partyId}" /> - <input type="hidden" name="preferredContactMechId" value="${preferredContactMechId?if_exists}" /> + <input type="hidden" name="preferredContactMechId" value="${preferredContactMechId!}" /> <input type="hidden" name="fromDate" value="${fromDate}" /> <input type="hidden" name="statusId" value="CLPT_UNSUBS_PENDING" /> - <input type="hidden" name="optInVerifyCode" value="${optInVerifyCode?if_exists}" /> + <input type="hidden" name="optInVerifyCode" value="${optInVerifyCode!}" /> <input type="submit" name="submitButton" value="Click here to unsubscribe your newsletter subscription." /> </fieldset> </form> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl Mon Aug 18 07:42:27 2014 @@ -18,11 +18,11 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> + <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> <p>Successfully subscribed from ${contactList.contactListName} contact list.</p> - <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists> - <#if (contactListParty.preferredContactMechId)?exists> + <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!> + <#if (contactListParty.preferredContactMechId)??> <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> </#if> <a href="${verifyUrl}">If this was by mistake, click here to unsubscribe your subscription again.</a> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl Mon Aug 18 07:42:27 2014 @@ -18,11 +18,11 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> + <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> <p>Successfully unsubscribed from ${contactList.contactListName} contact list.</p> - <#--assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_SUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists> - <#if (contactListParty.preferredContactMechId)?exists> + <#--assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_SUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!> + <#if (contactListParty.preferredContactMechId)??> <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> </#if> <a href="${verifyUrl}">If this was by mistake, click here subscribe again.</a--> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl Mon Aug 18 07:42:27 2014 @@ -28,14 +28,14 @@ under the License. <#-- custom logo or text can be inserted here --> <h1>${title!}</h1> - <#if note?exists><p>${note}</p></#if> + <#if note??><p>${note}</p></#if> - <p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> + <p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> <p>We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p> <p>To complete your unsubscription click the on the following link:</p> - <#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&communicationEventId='+communicationEventId?if_exists+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode> - <#if (contactListParty.preferredContactMechId)?exists> + <#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&communicationEventId='+communicationEventId!+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode> + <#if (contactListParty.preferredContactMechId)??> <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> </#if> <a href="${verifyUrl}">Please click here to verify your unsubscription.</a> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl Mon Aug 18 07:42:27 2014 @@ -28,14 +28,14 @@ under the License. <#-- custom logo or text can be inserted here --> <h1>${title!}</h1> -<#if note?exists><p>${note}</p></#if> +<#if note??><p>${note}</p></#if> -<p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> +<p>Hello ${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}!</p> <p>We have received a request for subscription to the ${contactList.contactListName} contact list.</p> <p>To complete your subscription click the on the following link:</p> -<#assign verifyUrl = baseEcommerceSecureUrl+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists> -<#if (contactListParty.preferredContactMechId)?exists> +<#assign verifyUrl = baseEcommerceSecureUrl+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation!> +<#if (contactListParty.preferredContactMechId)??> <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId> </#if> <a href="${verifyUrl}">Please click here to verify your subscription.</a> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactUsEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactUsEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactUsEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ContactUsEmail.ftl Mon Aug 18 07:42:27 2014 @@ -21,8 +21,8 @@ under the License. <head></head> <body> <p>The information filled by the person on contact us page is as follows:</p> - <p>${uiLabelMap.CommonName}: ${parameters.firstName?if_exists} ${parameters.lastName?if_exists}</p> - <p>${uiLabelMap.CommonEmail}: ${parameters.email?if_exists}</p> - <p>${uiLabelMap.CommonMessage}: ${parameters.message?if_exists}</p> + <p>${uiLabelMap.CommonName}: ${parameters.firstName!} ${parameters.lastName!}</p> + <p>${uiLabelMap.CommonEmail}: ${parameters.email!}</p> + <p>${uiLabelMap.CommonMessage}: ${parameters.message!}</p> </body> </html> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl Mon Aug 18 07:42:27 2014 @@ -131,14 +131,14 @@ under the License. <#-- custom logo or text can be inserted here --> <h1>${title!}</h1> -<#if !isDemoStore?exists || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> -<#if note?exists><p>${note}</p></#if> -<#if orderHeader?exists> +<#if !isDemoStore?? || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> +<#if note??><p>${note}</p></#if> +<#if orderHeader??> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} <br /> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} <#else> -<h1>Order not found with ID [${orderId?if_exists}], or not allowed to view.</h1> +<h1>Order not found with ID [${orderId!}], or not allowed to view.</h1> </#if> </body> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl Mon Aug 18 07:42:27 2014 @@ -17,11 +17,11 @@ specific language governing permissions under the License. --> -<#if baseEcommerceSecureUrl?exists><#assign urlPrefix = baseEcommerceSecureUrl/></#if> +<#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if> <#if shipment?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> - <div class="h3">${title?if_exists}<br /><br /></div> + <div class="h3">${title!}<br /><br /></div> </div> <table border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -53,8 +53,8 @@ under the License. <#assign productId = shipmentItem.productId> <#assign product = shipmentItem.getRelatedOne("Product", false)> <tr> - <td colspan="1" valign="top"> ${productId?if_exists} - ${product.internalName?if_exists}</td> - <td align="right" valign="top"> ${shipmentItem.quantity?if_exists}</td> + <td colspan="1" valign="top"> ${productId!} - ${product.internalName!}</td> + <td align="right" valign="top"> ${shipmentItem.quantity!}</td> </tr> </#list> <tr><td colspan="10"><hr /></td></tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl Mon Aug 18 07:42:27 2014 @@ -22,11 +22,11 @@ under the License. from surveyId 1000 - The gift card purchase survey. --> -<#if recipientName?exists>${recipientName},</#if> +<#if recipientName??>${recipientName},</#if> <br /> <#-- MyCompany.com (not a variable why?) must be adapted - JLR 1/6/5 --> -${uiLabelMap.EcommerceYouHaveBeenSent} MyCompany.com <#if senderName?exists> ${uiLabelMap.EcommerceGiftCardFrom} ${senderName}</#if>! +${uiLabelMap.EcommerceYouHaveBeenSent} MyCompany.com <#if senderName??> ${uiLabelMap.EcommerceGiftCardFrom} ${senderName}</#if>! <br /><br /> <#if giftMessage?has_content> ${uiLabelMap.OrderGiftMessage} @@ -36,7 +36,7 @@ ${uiLabelMap.EcommerceYouHaveBeenSent} M </#if> <pre> - ${uiLabelMap.EcommerceYourCardNumber} ${cardNumber?if_exists} - ${uiLabelMap.EcommerceYourPinNumber} ${pinNumber?if_exists} - ${uiLabelMap.EcommerceGiftAmount} ${amount?if_exists} + ${uiLabelMap.EcommerceYourCardNumber} ${cardNumber!} + ${uiLabelMap.EcommerceYourPinNumber} ${pinNumber!} + ${uiLabelMap.EcommerceGiftAmount} ${amount!} </pre> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/returnaccept.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/returnaccept.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/returnaccept.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/email/returnaccept.ftl Mon Aug 18 07:42:27 2014 @@ -23,8 +23,8 @@ ${uiLabelMap.EcommerceReturnRequest} <br /><br /> <pre> <#list returnItems as item> - <#assign returnReason = item.getRelatedOne("ReturnReason", false)?if_exists> - <#assign returnType = item.getRelatedOne("ReturnType", false)?if_exists> + <#assign returnReason = item.getRelatedOne("ReturnReason", false)!> + <#assign returnType = item.getRelatedOne("ReturnType", false)!> ${item.description?default("N/A")} - ${item.returnQuantity?string.number} @ ${item.returnPrice} </#list> </pre> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |