svn commit: r1618554 [29/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [29/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/genericresult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/genericresult.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/genericresult.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/genericresult.ftl Mon Aug 18 07:42:27 2014 @@ -19,7 +19,7 @@ under the License. <#assign uiLabelMap = Static["org.ofbiz.base.util.UtilProperties"].getResourceBundleMap("CommonUiLabels", locale)> -<h1>${survey.description?if_exists}</h1> +<h1>${survey.description!}</h1> <br /> <table width="100%" border="0" cellpadding="2" cellspacing="0"> @@ -33,19 +33,19 @@ under the License. <#-- get an answer from the answerMap --> <#if surveyAnswers?has_content> - <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists> + <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)!> </#if> <#-- get the question results --> <#if surveyResults?has_content> - <#assign results = surveyResults.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists> + <#assign results = surveyResults.get(surveyQuestionAndAppl.surveyQuestionId)!> </#if> <tr> <#-- seperator options --> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT"> - <td colspan="5"><div>${surveyQuestionAndAppl.question?if_exists}</div></td> + <td colspan="5"><div>${surveyQuestionAndAppl.question!}</div></td> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"> <td colspan="5"><hr /></td> <#else> @@ -56,7 +56,7 @@ under the License. <#if (results._total?default(0) == 1)> <#assign answerString = "answer"> </#if> - <div>${surveyQuestionAndAppl.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div> + <div>${surveyQuestionAndAppl.question!} (${results._total?default(0)?string.number} ${answerString})</div> <#if surveyQuestionAndAppl.hint?has_content> <div>${surveyQuestionAndAppl.hint}</div> </#if> @@ -73,21 +73,21 @@ under the License. <#if "N" == selectedOption><b>==> <font color="red"></#if>N<#if "N" == selectedOption></font></b></#if> [${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%] </span></div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY"> <div>${answer.currencyResponse?number?default(0)}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT"> @@ -99,17 +99,17 @@ under the License. <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"> <#if answer.contentId?has_content> <#assign content = answer.getRelatedOne("Content", false)> - <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists} + <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName!} </#if> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")> <#if options?has_content> <#list options as option> - <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists> + <#assign optionResults = results.get(option.surveyOptionSeqId)!> <div><span style="white-space: nowrap;"> <#if option.surveyOptionSeqId == selectedOption><b>==> <font color="red"></#if> - ${option.description?if_exists} + ${option.description!} <#if option.surveyOptionSeqId == selectedOption></font></b></#if> [${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%] </span></div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/miniresult.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/miniresult.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/miniresult.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/miniresult.ftl Mon Aug 18 07:42:27 2014 @@ -22,12 +22,12 @@ under the License. <#-- get an answer from the answerMap --> <#if surveyAnswers?has_content> - <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists> + <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)!> </#if> <#-- get the question results --> <#if surveyResults?has_content> - <#assign results = surveyResults.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists> + <#assign results = surveyResults.get(surveyQuestionAndAppl.surveyQuestionId)!> </#if> <tr> @@ -37,7 +37,7 @@ under the License. <#if (results._total?default(0) == 1)> <#assign answerString = "answer"> </#if> - <div>${surveyQuestionAndAppl.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div> + <div>${surveyQuestionAndAppl.question!} (${results._total?default(0)?string.number} ${answerString})</div> </td> </tr> @@ -57,14 +57,14 @@ under the License. </span></div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")> <#if options?has_content> <#list options as option> - <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists> + <#assign optionResults = results.get(option.surveyOptionSeqId)!> <div><span style="white-space: nowrap;"> <#if option.surveyOptionSeqId == selectedOption><b>==> <font color="red"></#if> - ${option.description?if_exists} + ${option.description!} <#if option.surveyOptionSeqId == selectedOption></font></b></#if> [${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%] </span></div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/minisurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/minisurvey.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/minisurvey.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/templates/survey/minisurvey.ftl Mon Aug 18 07:42:27 2014 @@ -40,13 +40,13 @@ under the License. <#list surveyQuestionAndAppls as surveyQuestionAndAppl> <#-- get an answer from the answerMap --> <#if surveyAnswers?has_content> - <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists> + <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)!> </#if> <tr> <#-- standard question options --> <td align='left'> - <div>${surveyQuestionAndAppl.question?if_exists}</div> + <div>${surveyQuestionAndAppl.question!}</div> <#if surveyQuestionAndAppl.hint?has_content> <div>${surveyQuestionAndAppl.hint}</div> </#if> @@ -65,31 +65,31 @@ under the License. <option <#if "N" == selectedOption>selected="selected"</#if>>N</option> </select> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA"> - <textarea class="textAreaBox" cols="40" rows="5" name="answers_${surveyQuestionAndAppl.surveyQuestionId}">${(answer.textResponse)?if_exists}</textarea> + <textarea class="textAreaBox" cols="40" rows="5" name="answers_${surveyQuestionAndAppl.surveyQuestionId}">${(answer.textResponse)!}</textarea> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT"> - <input type="text" size="15" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="text" size="15" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG"> - <input type="text" size="35" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="text" size="35" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL"> - <input type="text" size="30" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="text" size="30" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL"> - <input type="text" size="40" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="text" size="40" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE"> - <input type="text" size="12" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="text" size="12" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD"> - <input type="text" size="20" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="text" size="20" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD"> - <input type="text" size="20" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="text" size="20" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY"> - <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.currencyResponse)?if_exists}"/> + <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.currencyResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT"> - <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.floatResponse)?if_exists}"/> + <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.floatResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG"> - <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.numericResponse?string("#"))?if_exists}"/> + <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.numericResponse?string("#"))!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD"> - <input type="password" size="30" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)?if_exists}"/> + <input type="password" size="30" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")> <select class="selectBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}"> <#if surveyQuestionAndAppl.requiredField?default("N") != "Y"> @@ -97,7 +97,7 @@ under the License. </#if> <#if options?has_content> <#list options as option> - <option value="${option.surveyOptionSeqId}" <#if option.surveyOptionSeqId == selectedOption>selected="selected"</#if>>${option.description?if_exists}</option> + <option value="${option.surveyOptionSeqId}" <#if option.surveyOptionSeqId == selectedOption>selected="selected"</#if>>${option.description!}</option> </#list> <#else> <option value="">Nothing to choose</option> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Mon Aug 18 07:42:27 2014 @@ -27,7 +27,7 @@ import org.ofbiz.order.order.*; import org.ofbiz.party.contact.*; import org.ofbiz.product.catalog.*; import org.ofbiz.product.store.*; -import org.ofbiz.webapp.website.WebSiteWorker + orderId = parameters.orderId; orderHeader = null; @@ -148,7 +148,6 @@ if (orderHeader) { } } - webSiteId = orderHeader.webSiteId ?: WebSiteWorker.getWebSiteId(request); payToPartyId = productStore.payToPartyId; paymentAddress = PaymentWorker.getPaymentAddress(delegator, payToPartyId); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl Mon Aug 18 07:42:27 2014 @@ -57,8 +57,8 @@ <#assign textDataResourceId=""/> <#if textContent?has_content > - <#assign textContentId=textContent.contentId?if_exists/> - <#assign textDataResourceId=textContent.drDataResourceId?if_exists/> + <#assign textContentId=textContent.contentId!/> + <#assign textDataResourceId=textContent.drDataResourceId!/> </#if> <#if textElectronicText?has_content && textElectronicText.textData?has_content > @@ -69,8 +69,8 @@ <#assign imageDataResourceId=""/> <#if imageContent?has_content > - <#assign imageContentId=imageContent.contentId?if_exists/> - <#assign imageDataResourceId=imageContent.drDataResourceId?if_exists/> + <#assign imageContentId=imageContent.contentId!/> + <#assign imageDataResourceId=imageContent.drDataResourceId!/> </#if> <input type="hidden" name="textContentId" value="${textContentId}"/> @@ -89,7 +89,7 @@ </td> <td> </td> <td width="60%"> - <textarea class="textAreaBox" class="inputBox" name="textData" cols="60" rows="24">${textData?if_exists}</textarea> + <textarea class="textAreaBox" class="inputBox" name="textData" cols="60" rows="24">${textData!}</textarea> </td> <td width="10%" align="right"> <span class="treeHeader"> </span> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Mon Aug 18 07:42:27 2014 @@ -42,7 +42,7 @@ under the License. <td width="100%"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="headerboxtop"> <tr> - <#if layoutSettings.headerImageUrl?exists> + <#if layoutSettings.headerImageUrl??> <td width="1%"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></td> </#if> <td align="right" width="1%" nowrap="nowrap" <#if layoutSettings.headerRightBackgroundUrl?has_content>background="${layoutSettings.headerRightBackgroundUrl}"</#if>> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl Mon Aug 18 07:42:27 2014 @@ -60,18 +60,18 @@ under the License. </tfoot> <tbody> <#list shoppingCart.items() as cartLine> - <#if cartLine.getProductId()?exists> - <#if cartLine.getParentProductId()?exists> + <#if cartLine.getProductId()??> + <#if cartLine.getParentProductId()??> <#assign parentProductId = cartLine.getParentProductId() /> <#else> <#assign parentProductId = cartLine.getProductId() /> </#if> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)! /> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" /></#if> </#if> <tr id="cartItemDisplayRow_${cartLine_index}"> - <td headers="orderItem"><img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt = "Product Image" /></td> - <td headers="description">${cartLine.getName()?if_exists}</td> + <td headers="orderItem"><img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt = "Product Image" /></td> + <td headers="description">${cartLine.getName()!}</td> <td headers="unitPrice">${cartLine.getDisplayPrice()}</td> <td headers="quantity"><span id="completedCartItemQty_${cartLine_index}">${cartLine.getQuantity()?string.number}</span></td> <td headers="adjustment"><span id="completedCartItemAdjustment_${cartLine_index}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></span></td> @@ -130,20 +130,20 @@ under the License. <#list shoppingCart.items() as cartLine> <tr id="cartItemRow_${cartLine_index}"> <td headers="editOrderItem"> - <#if cartLine.getProductId()?exists> - <#if cartLine.getParentProductId()?exists> + <#if cartLine.getProductId()??> + <#if cartLine.getParentProductId()??> <#assign parentProductId = cartLine.getParentProductId() /> <#else> <#assign parentProductId = cartLine.getProductId() /> </#if> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)! /> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" /></#if> <#if smallImageUrl?string?has_content> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Product Image" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Product Image" /> </#if> </#if> </td> - <td headers="editDescription">${cartLine.getName()?if_exists}</td> + <td headers="editDescription">${cartLine.getName()!}</td> <td headers="editUnitPrice" id="itemUnitPrice_${cartLine_index}"><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency() /></td> <td headers="editQuantity"> <#if cartLine.getIsPromo()> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.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. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#assign shoppingCart = sessionAttributes.shoppingCart!> <#if shoppingCart?has_content> <#assign shoppingCartSize = shoppingCart.size()> <#else> @@ -36,8 +36,8 @@ under the License. <ul> <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>">[${uiLabelMap.OrderViewCart}]</a></li> <#if (shoppingCartSize > 0)> - <#if !initialLocaleComplete?exists || initialLocaleComplete?length == 2 > - <#if initialLocaleComplete?exists && initialLocaleComplete?length == 2 && initialLocaleComplete == "fr"> + <#if !initialLocaleComplete?? || initialLocaleComplete?length == 2 > + <#if initialLocaleComplete?? && initialLocaleComplete?length == 2 && initialLocaleComplete == "fr"> <#assign initialLocaleComplete = "fr_FR"><#-- same idea can be used with other default locale --> <#else> <#assign initialLocaleComplete = "en_US"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl Mon Aug 18 07:42:27 2014 @@ -33,7 +33,7 @@ under the License. <li> <p> <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> - ${StringUtil.wrapString(productPromo.promoText?if_exists)} + ${StringUtil.wrapString(productPromo.promoText!)} </p> </li> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Mon Aug 18 07:42:27 2014 @@ -115,9 +115,9 @@ function setAlternateGwp(field) { <div> <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="quickaddform"> <fieldset> - ${uiLabelMap.EcommerceProductNumber}<input type="text" class="inputBox" name="add_product_id" value="${requestParameters.add_product_id?if_exists}" /> + ${uiLabelMap.EcommerceProductNumber}<input type="text" class="inputBox" name="add_product_id" value="${requestParameters.add_product_id!}" /> <#-- check if rental data present insert extra fields in Quick Add--> - <#if (product?exists && product.getString("productTypeId") == "ASSET_USAGE") || (product?exists && product.getString("productTypeId") == "ASSET_USAGE_OUT_IN")> + <#if (product?? && product.getString("productTypeId") == "ASSET_USAGE") || (product?? && product.getString("productTypeId") == "ASSET_USAGE_OUT_IN")> ${uiLabelMap.EcommerceStartDate}: <input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /> ${uiLabelMap.EcommerceLength}: <input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /> </div> @@ -170,7 +170,7 @@ function setAlternateGwp(field) { <tr> <th></th> <th scope="row">${uiLabelMap.OrderProduct}</th> - <#if asslGiftWraps?has_content && productStore.showCheckoutGiftOptions?if_exists != "N">> + <#if asslGiftWraps?has_content && productStore.showCheckoutGiftOptions! != "N">> <th scope="row"> <select class="selectBox" name="GWALL" onchange="javascript:gwAll(this);"> <option value="">${uiLabelMap.EcommerceGiftWrapAllItems}</option> @@ -218,7 +218,7 @@ function setAlternateGwp(field) { <tr id="cartItemDisplayRow_${cartLineIndex}"> <td> - <#if cartLine.getShoppingListId()?exists> + <#if cartLine.getShoppingListId()??> <#assign itemsFromList = true /> <a href="<@ofbizUrl>editShoppingList?shoppingListId=${cartLine.getShoppingListId()}</@ofbizUrl>" class="linktext">L</a> <#elseif cartLine.getIsPromo()> @@ -229,29 +229,29 @@ function setAlternateGwp(field) { </#if> </td> <td> - <#if cartLine.getProductId()?exists> + <#if cartLine.getProductId()??> <#-- product item --> <#-- start code to display a small image of the product --> - <#if cartLine.getParentProductId()?exists> + <#if cartLine.getParentProductId()??> <#assign parentProductId = cartLine.getParentProductId() /> <#else> <#assign parentProductId = cartLine.getProductId() /> </#if> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)! /> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg" /></#if> <#if smallImageUrl?string?has_content> <a href="<@ofbizCatalogAltUrl productId=parentProductId/>"> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Product Image" class="imageborder" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Product Image" class="imageborder" /> </a> </#if> <#-- end code to display a small image of the product --> <#-- ${cartLineIndex} - --> <a href="<@ofbizCatalogAltUrl productId=parentProductId/>" class="linktext">${cartLine.getProductId()} - - ${cartLine.getName()?if_exists}</a> : ${cartLine.getDescription()?if_exists} + ${cartLine.getName()!}</a> : ${cartLine.getDescription()!} <#-- For configurable products, the selected options are shown --> - <#if cartLine.getConfigWrapper()?exists> - <#assign selectedOptions = cartLine.getConfigWrapper().getSelectedOptions()?if_exists /> - <#if selectedOptions?exists> + <#if cartLine.getConfigWrapper()??> + <#assign selectedOptions = cartLine.getConfigWrapper().getSelectedOptions()! /> + <#if selectedOptions??> <div> </div> <#list selectedOptions as option> <div> @@ -270,7 +270,7 @@ function setAlternateGwp(field) { <#else> <#-- this is a non-product item --> - ${cartLine.getItemTypeDescription()?if_exists}: ${cartLine.getName()?if_exists} + ${cartLine.getItemTypeDescription()!}: ${cartLine.getName()!} </#if> <#assign attrs = cartLine.getOrderItemAttributes()/> <#if attrs?has_content> @@ -307,13 +307,13 @@ function setAlternateGwp(field) { <#-- gift wrap option --> <#assign showNoGiftWrapOptions = false /> <td > - <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP?if_exists /> - <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")?if_exists /> + <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP! /> + <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")! /> <#if giftWrapOption?has_content> <select class="selectBox" name="option^GIFT_WRAP_${cartLineIndex}" onchange="javascript:document.cartform.submit()"> <option value="NO^">${uiLabelMap.EcommerceNoGiftWrap}</option> <#list giftWrapOption as option> - <option value="${option.productFeatureId}" <#if ((selectedOption.productFeatureId)?exists && selectedOption.productFeatureId == option.productFeatureId)>selected="selected"</#if>>${option.description} : ${option.amount?default(0)}</option> + <option value="${option.productFeatureId}" <#if ((selectedOption.productFeatureId)?? && selectedOption.productFeatureId == option.productFeatureId)>selected="selected"</#if>>${option.description} : ${option.amount?default(0)}</option> </#list> </select> <#elseif showNoGiftWrapOptions> @@ -327,9 +327,9 @@ function setAlternateGwp(field) { <#-- end gift wrap option --> <td> - <#if cartLine.getIsPromo() || cartLine.getShoppingListId()?exists> + <#if cartLine.getIsPromo() || cartLine.getShoppingListId()??> <#if fixedAssetExist == true> - <#if cartLine.getReservStart()?exists> + <#if cartLine.getReservStart()??> <table > <tr> <td> </td> @@ -354,7 +354,7 @@ function setAlternateGwp(field) { ${cartLine.getQuantity()?string.number} </#if> <#else><#-- Is Promo or Shoppinglist --> - <#if fixedAssetExist == true><#if cartLine.getReservStart()?exists><table><tr><td> </td><td><input type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}" value=${cartLine.getReservStart()?string}/></td><td><input type="text" class="inputBox" size="2" name="reservLength_${cartLineIndex}" value="${cartLine.getReservLength()?string.number}"/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}" value=${cartLine.getReservPersons()?string.number} /></td><td><#else> + <#if fixedAssetExist == true><#if cartLine.getReservStart()??><table><tr><td> </td><td><input type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}" value=${cartLine.getReservStart()?string}/></td><td><input type="text" class="inputBox" size="2" name="reservLength_${cartLineIndex}" value="${cartLine.getReservLength()?string.number}"/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}" value=${cartLine.getReservPersons()?string.number} /></td><td><#else> <table><tr><td>--</td><td>--</td></tr><tr><td>--</td><td></#if> <input size="6" class="inputBox" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" /></td></tr></table> <#else><#-- fixedAssetExist --> @@ -388,7 +388,7 @@ function setAlternateGwp(field) { <#assign adjustmentType = cartAdjustment.getRelatedOne("OrderAdjustmentType", true) /> <tr> <th> - ${uiLabelMap.EcommerceAdjustment} - ${adjustmentType.get("description",locale)?if_exists} + ${uiLabelMap.EcommerceAdjustment} - ${adjustmentType.get("description",locale)!} <#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a></#if>: </th> <td><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=shoppingCart.getCurrency()/></td> @@ -473,7 +473,7 @@ function setAlternateGwp(field) { <fieldset> <input type="text" class="inputBox" size="15" name="productPromoCodeId" value="" /> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}" /> - <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())?if_exists /> + <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())! /> <#if productPromoCodeIds?has_content> ${uiLabelMap.ProductPromoCodesEntered} <ul> @@ -488,7 +488,7 @@ function setAlternateGwp(field) { </div> </div> -<#if showPromoText?exists && showPromoText> +<#if showPromoText?? && showPromoText> <div> <div> <h2>${uiLabelMap.OrderSpecialOffers}</h2> @@ -497,7 +497,7 @@ function setAlternateGwp(field) { <#-- show promotions text --> <ul> <#list productPromos as productPromo> - <li><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">[${uiLabelMap.CommonDetails}]</a>${StringUtil.wrapString(productPromo.promoText?if_exists)}</li> + <li><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">[${uiLabelMap.CommonDetails}]</a>${StringUtil.wrapString(productPromo.promoText!)}</li> </#list> </ul> <div><a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a></div> @@ -527,4 +527,4 @@ function setAlternateGwp(field) { ${screens.render("component://ecommerce/widget/CartScreens.xml#promoUseDetailsInline")} </#if> -<!-- Internal cart info: productStoreId=${shoppingCart.getProductStoreId()?if_exists} locale=${shoppingCart.getLocale()?if_exists} currencyUom=${shoppingCart.getCurrency()?if_exists} userLoginId=${(shoppingCart.getUserLogin().getString("userLoginId"))?if_exists} autoUserLogin=${(shoppingCart.getAutoUserLogin().getString("userLoginId"))?if_exists} --> +<!-- Internal cart info: productStoreId=${shoppingCart.getProductStoreId()!} locale=${shoppingCart.getLocale()!} currencyUom=${shoppingCart.getCurrency()!} userLoginId=${(shoppingCart.getUserLogin().getString("userLoginId"))!} autoUserLogin=${(shoppingCart.getAutoUserLogin().getString("userLoginId"))!} --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl Mon Aug 18 07:42:27 2014 @@ -43,17 +43,17 @@ under the License. </#macro> -<#if productCategory?exists> - <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME")?if_exists/> - <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION")?if_exists/> +<#if productCategory??> + <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME")!/> + <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION")!/> <#if categoryName?has_content> <h1>${categoryName}</h1> </#if> <#if categoryDescription?has_content> <h1>${categoryDescription}</h1> </#if> - <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/> - <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/> + <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")!/> + <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")!/> <#if categoryImageUrl?string?has_content || longDescription?has_content> <div> <#if categoryImageUrl?string?has_content> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if currentSearchCategory?exists> +<#if currentSearchCategory??> <div id="layeredNav" class="screenlet"> <h3>Layered Navigation</h3> <#escape x as x?xml> @@ -25,14 +25,14 @@ under the License. <#assign currentSearchCategoryName = categoryContentWrapper.get("CATEGORY_NAME")?string /> <#list searchConstraintStrings as searchConstraintString> <#if searchConstraintString.indexOf(currentSearchCategoryName) != -1> - <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if previousCategoryId?exists>&searchCategoryId=${previousCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a><#noescape> ${searchConstraintString}</#noescape></div> + <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if previousCategoryId??>&searchCategoryId=${previousCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a><#noescape> ${searchConstraintString}</#noescape></div> </#if> </#list> </#if> </#escape> <#list searchConstraintStrings as searchConstraintString> <#if searchConstraintString.indexOf("Category: ") = -1 && searchConstraintString != "Exclude Variants"> - <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> + <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if currentSearchCategory??>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> </#if> </#list> <#if showSubCats> @@ -41,8 +41,8 @@ under the License. <ul> <#list subCategoryList as category> <#assign subCategoryContentWrapper = category.categoryContentWrapper /> - <#assign categoryName = subCategoryContentWrapper.get("CATEGORY_NAME")?if_exists?string /> - <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?SEARCH_CATEGORY_ID${index}=${category.productCategoryId}&searchCategoryId=${category.productCategoryId}&clearSearch=N</@ofbizUrl>">${categoryName?if_exists} (${category.count})</li> + <#assign categoryName = subCategoryContentWrapper.get("CATEGORY_NAME")!?string /> + <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?SEARCH_CATEGORY_ID${index}=${category.productCategoryId}&searchCategoryId=${category.productCategoryId}&clearSearch=N</@ofbizUrl>">${categoryName!} (${category.count})</li> </#list> </ul> </div> @@ -52,7 +52,7 @@ under the License. <strong>${colorFeatureType.description}</strong> <ul> <#list colors as color> - <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?pft_${color.productFeatureTypeId}=${color.productFeatureId}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>">${color.description} (${color.featureCount})</li> + <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?pft_${color.productFeatureTypeId}=${color.productFeatureId}&clearSearch=N<#if currentSearchCategory??>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>">${color.description} (${color.featureCount})</li> </#list> </ul> </div> @@ -62,7 +62,7 @@ under the License. <strong>${uiLabelMap.EcommercePriceRange}</strong> <ul> <#list priceRangeList as priceRange> - <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?LIST_PRICE_LOW=${priceRange.low}&LIST_PRICE_HIGH=${priceRange.high}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>"><@ofbizCurrency amount=priceRange.low /> - <@ofbizCurrency amount=priceRange.high /> (${priceRange.count})</a><li> + <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?LIST_PRICE_LOW=${priceRange.low}&LIST_PRICE_HIGH=${priceRange.high}&clearSearch=N<#if currentSearchCategory??>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>"><@ofbizCurrency amount=priceRange.low /> - <@ofbizCurrency amount=priceRange.high /> (${priceRange.count})</a><li> </#list> </ul> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl Mon Aug 18 07:42:27 2014 @@ -29,7 +29,7 @@ jQuery(window).load(createTree()); <#-- creating the JSON Data --> var rawdata = [ - <#if (requestAttributes.topLevelList)?exists> + <#if (requestAttributes.topLevelList)??> <#assign topLevelList = requestAttributes.topLevelList> </#if> <#if (topLevelList?has_content)> @@ -40,7 +40,7 @@ var rawdata = [ <#if (rootCat?has_content)> <#list rootCat?sort_by("productCategoryId") as root> { - "data": {"title" : unescapeHtmlText("<#if root.categoryName?exists>${root.categoryName?js_string}<#elseif root.categoryDescription?exists>${root.categoryDescription?js_string}<#else>${root.productCategoryId?js_string}</#if>"), "attr": { "href":"javascript: void(0);", "onClick":"callDocument('${root.productCategoryId}', '${root.parentCategoryId}')" , "class" : "${root.cssClass?if_exists}"}}, + "data": {"title" : unescapeHtmlText("<#if root.categoryName??>${root.categoryName?js_string}<#elseif root.categoryDescription??>${root.categoryDescription?js_string}<#else>${root.productCategoryId?js_string}</#if>"), "attr": { "href":"javascript: void(0);", "onClick":"callDocument('${root.productCategoryId}', '${root.parentCategoryId}')" , "class" : "${root.cssClass!}"}}, "attr": {"id" : "${root.productCategoryId}"} <#if root.child?has_content> ,"children": [ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl Mon Aug 18 07:42:27 2014 @@ -17,26 +17,26 @@ specific language governing permissions under the License. --> -<#assign productCategoryLink = requestAttributes.productCategoryLink?if_exists/> +<#assign productCategoryLink = requestAttributes.productCategoryLink!/> <#if productCategoryLink?has_content> <#if productCategoryLink.detailSubScreen?has_content> ${screens.render(productCategoryLink.detailSubScreen)} <#else> - <#assign titleText = productCategoryLink.titleText?if_exists/> - <#assign imageUrl = productCategoryLink.imageUrl?if_exists/> - <#assign detailText = productCategoryLink.detailText?if_exists/> + <#assign titleText = productCategoryLink.titleText!/> + <#assign imageUrl = productCategoryLink.imageUrl!/> + <#assign detailText = productCategoryLink.detailText!/> <#if productCategoryLink.linkTypeEnumId == "PCLT_SEARCH_PARAM"> <#assign linkUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, "keywordsearch?" + productCategoryLink.linkInfo)/> <#elseif productCategoryLink.linkTypeEnumId == "PCLT_ABS_URL"> - <#assign linkUrl = productCategoryLink.linkInfo?if_exists/> + <#assign linkUrl = productCategoryLink.linkInfo!/> <#elseif productCategoryLink.linkTypeEnumId == "PCLT_CAT_ID"> <#assign linkUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, "category/~category_id=" + productCategoryLink.linkInfo) + "/~pcategory=" + productCategoryId/> <#assign linkProductCategory = delegator.findOne("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", productCategoryLink.linkInfo), true)/> <#assign linkCategoryContentWrapper = Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(linkProductCategory, request)/> - <#assign titleText = productCategoryLink.titleText?default(linkCategoryContentWrapper.get("CATEGORY_NAME"))?if_exists/> - <#assign imageUrl = productCategoryLink.imageUrl?default(linkCategoryContentWrapper.get("CATEGORY_IMAGE_URL"))?if_exists/> - <#assign detailText = productCategoryLink.detailText?default(linkCategoryContentWrapper.get("DESCRIPTION"))?if_exists/> + <#assign titleText = productCategoryLink.titleText?default(linkCategoryContentWrapper.get("CATEGORY_NAME"))!/> + <#assign imageUrl = productCategoryLink.imageUrl?default(linkCategoryContentWrapper.get("CATEGORY_IMAGE_URL"))!/> + <#assign detailText = productCategoryLink.detailText?default(linkCategoryContentWrapper.get("DESCRIPTION"))!/> </#if> <div class="productcategorylink"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl Mon Aug 18 07:42:27 2014 @@ -55,7 +55,7 @@ under the License. </div> <div class="productinfo"> <ul> - <#if productCategoryMembers?exists> + <#if productCategoryMembers??> <#assign i = 0/> <#list productCategoryMembers as productCategoryMember> <#if (i > 2)> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Mon Aug 18 07:42:27 2014 @@ -25,10 +25,10 @@ under the License. <table> <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" /> <#if searchCategory?has_content> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}"/> <tr valign="middle"> <td>${uiLabelMap.ProductCategory}</td> - <td>${(searchCategory.description)?if_exists}</td> + <td>${(searchCategory.description)!}</td> </tr> <tr valign="middle"> <td>${uiLabelMap.ProductIncludeSubCategories}</td> @@ -41,7 +41,7 @@ under the License. <tr valign="middle"> <td>${uiLabelMap.ProductKeywords}</td> <td> - <input type="text" name="SEARCH_STRING" size="32" value="${requestParameters.SEARCH_STRING?if_exists}" /> + <input type="text" name="SEARCH_STRING" size="32" value="${requestParameters.SEARCH_STRING!}" /> <br /> ${uiLabelMap.CommonAny} <input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /> ${uiLabelMap.CommonAll} <input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /> @@ -52,7 +52,7 @@ under the License. <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)> <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr valign="middle"> - <td>${(productFeatureType.get("description",locale))?if_exists}</td> + <td>${(productFeatureType.get("description",locale))!}</td> <td> <select name="pft_${productFeatureTypeId}"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> @@ -74,7 +74,7 @@ under the License. <option value="SortProductField:averageCustomerRating">${uiLabelMap.ProductCustomerRating}</option> <option value="SortProductPrice:LIST_PRICE">${uiLabelMap.ProductListPrice}</option> <option value="SortProductPrice:DEFAULT_PRICE">${uiLabelMap.ProductDefaultPrice}</option> - <#if productFeatureTypes?exists && productFeatureTypes?has_content> + <#if productFeatureTypes?? && productFeatureTypes?has_content> <#list productFeatureTypes as productFeatureType> <option value="SortProductFeature:${productFeatureType.productFeatureTypeId}">${productFeatureType.description?default(productFeatureType.productFeatureTypeId)}</option> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl Mon Aug 18 07:42:27 2014 @@ -28,12 +28,12 @@ under the License. </li> </#if> <#-- Show the category branch --> - <#if productCategoryTrail?exists> + <#if productCategoryTrail??> <#list productCategoryTrail as trail> <#if !isDefaultTheme> <li> <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext"> - <#if trail.title?exists> + <#if trail.title??> ${trail.title} <#else> ${trail.productCategoryId} @@ -42,7 +42,7 @@ under the License. </li> <#else> <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext"> - <#if trail.title?exists> + <#if trail.title??> ${trail.title} > <#else> ${trail.productCategoryId} > @@ -54,9 +54,9 @@ under the License. <#if !isDefaultTheme> <li> <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId previousCategoryId=parameters.parentCategoryStr/>" class="linktext"> - <#if currentCategoryName?exists> + <#if currentCategoryName??> ${currentCategoryName} - <#elseif currentCategoryDescription?exists> + <#elseif currentCategoryDescription??> ${currentCategoryDescription} <#else> ${currentCategoryId} @@ -65,9 +65,9 @@ under the License. </li> <#else> <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId previousCategoryId=parameters.parentCategoryStr/>" class="linktext"> - <#if currentCategoryName?exists> + <#if currentCategoryName??> ${currentCategoryName} - <#elseif currentCategoryDescription?exists> + <#elseif currentCategoryDescription??> ${currentCategoryDescription} <#else> ${currentCategoryId} Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl Mon Aug 18 07:42:27 2014 @@ -16,9 +16,9 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign catalogCol = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogIdsAvailable(request)?if_exists> -<#assign currentCatalogId = Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)?if_exists> -<#assign currentCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, currentCatalogId)?if_exists> +<#assign catalogCol = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogIdsAvailable(request)!> +<#assign currentCatalogId = Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)!> +<#assign currentCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, currentCatalogId)!> <#-- Only show if there is more than 1 (one) catalog, no sense selecting when there is only one option... --> <#if (catalogCol?size > 1)> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Mon Aug 18 07:42:27 2014 @@ -17,12 +17,12 @@ specific language governing permissions under the License. --> <#-- variable setup --> -<#assign productContentWrapper = productContentWrapper?if_exists> -<#assign price = priceMap?if_exists> +<#assign productContentWrapper = productContentWrapper!> +<#assign price = priceMap!> <#-- end variable setup --> <#-- virtual product javascript --> -${virtualJavaScript?if_exists} +${virtualJavaScript!} <script language="JavaScript" type="text/javascript"> <!-- var detailImageUrl = null; @@ -37,7 +37,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; @@ -165,15 +165,15 @@ function getConfigDetails(event) { <table> <#-- 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="buttontext">${(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="buttontext">${(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> @@ -184,19 +184,19 @@ function getConfigDetails(event) { <#-- 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='cssImgXLarge' align='left' alt="" /></a> + <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix!}${productLargeImageUrl!}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' class='cssImgXLarge' align='left' 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> @@ -219,30 +219,30 @@ function getConfigDetails(event) { - if price < defaultPrice and defaultPrice < listPrice, show default - if isSale show price with salePrice style and print "On Sale!" --> - <#if totalPrice?exists> + <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span id='totalPrice' class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> - <#if price.competitivePrice?exists && price.price?exists && price.price < price.competitivePrice> + <#if price.competitivePrice?? && price.price?? && price.price < price.competitivePrice> <div>${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.listPrice?exists && price.price?exists && price.price < price.listPrice> + <#if price.listPrice?? && price.price?? && price.price < price.listPrice> <div>${uiLabelMap.ProductListPrice}: <span class='basePrice'><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price < price.defaultPrice && price.defaultPrice < price.listPrice> + <#if price.listPrice?? && price.defaultPrice?? && price.price?? && price.price < price.defaultPrice && price.defaultPrice < price.listPrice> <div>${uiLabelMap.ProductRegularPrice}: <span class='basePrice'><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div> </#if> <div> - <#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> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> + ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> </div> - <#if price.listPrice?exists && price.price?exists && price.price < price.listPrice> + <#if price.listPrice?? && price.price?? && price.price < price.listPrice> <#assign priceSaved = price.listPrice - price.price> <#assign percentSaved = (priceSaved / price.listPrice) * 100> <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div> @@ -250,18 +250,18 @@ function getConfigDetails(event) { </#if> <#-- Included quantities/pieces --> - <#if product.quantityIncluded?exists && product.quantityIncluded != 0> + <#if product.quantityIncluded?? && product.quantityIncluded != 0> <div>${uiLabelMap.OrderIncludes}: - ${product.quantityIncluded?if_exists} - ${product.quantityUomId?if_exists} + ${product.quantityIncluded!} + ${product.quantityUomId!} </div> </#if> - <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> + <#if product.piecesIncluded?? && product.piecesIncluded?long != 0> <div>${uiLabelMap.OrderPieces}: ${product.piecesIncluded} </div> </#if> - <#if daysToShip?exists> + <#if daysToShip??> <div>${uiLabelMap.ProductUsuallyShipsIn} ${daysToShip} ${uiLabelMap.CommonDays}</div> </#if> @@ -271,7 +271,7 @@ function getConfigDetails(event) { <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a> </div> - <#if disFeatureList?exists && 0 < disFeatureList.size()> + <#if disFeatureList?? && 0 < disFeatureList.size()> <p> </p> <#list disFeatureList as currentFeature> <div> @@ -281,11 +281,11 @@ function getConfigDetails(event) { <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;'> <#assign inStock = true> <#-- Variant Selection --> - <#if product.isVirtual?exists && product.isVirtual?upper_case == "Y"> - <#if variantTree?exists && 0 < variantTree.size()> + <#if product.isVirtual?? && product.isVirtual?upper_case == "Y"> + <#if variantTree?? && 0 < variantTree.size()> <#list featureSet as currentType> <div> <select name="FT${currentType}" onchange="javascript:getList(this.name, (this.selectedIndex-1), 1);"> @@ -304,13 +304,13 @@ function getConfigDetails(event) { <#else> <input type='hidden' name="product_id" value='${product.productId}' /> <input type='hidden' name="add_product_id" value='${product.productId}' /> - <#if productNotAvailable?exists> + <#if productNotAvailable??> <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)> <#if isStoreInventoryRequired> <div class='tabletext'><b>${uiLabelMap.ProductItemOutOfStock}.</b></div> <#assign inStock = false> <#else> - <div class='tabletext'><b>${product.inventoryMessage?if_exists}</b></div> + <div class='tabletext'><b>${product.inventoryMessage!}</b></div> </#if> </#if> </#if> @@ -318,11 +318,11 @@ function getConfigDetails(event) { </td></tr><tr><td colspan="2" align="right"> <#-- check to see if introductionDate hasn't passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <p> </p> <div class='tabletext' 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 class='tabletext' style='color: red;'>${uiLabelMap.ProductProductNoLongerAvailable}.</div> <#-- check to see if the product requires inventory check and has inventory --> <#else> @@ -342,12 +342,12 @@ function getConfigDetails(event) { <#else> <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a> <input type="text" size="5" name="quantity" value="1" /> - <#if minimumQuantity?exists && minimumQuantity > 0> + <#if minimumQuantity?? && minimumQuantity > 0> Minimum order quantity is ${minimumQuantity}. </#if> </#if> </#if> - <#if requestParameters.category_id?exists> + <#if requestParameters.category_id??> <input type='hidden' name='category_id' value='${requestParameters.category_id}' /> </#if> </#if> @@ -355,10 +355,10 @@ function getConfigDetails(event) { <div> <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> - <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="configId" value="${configId?if_exists}" /> + <input type="hidden" name="configId" value="${configId!}" /> <select name="shoppingListId"> <#if shoppingLists?has_content> <#list shoppingLists as shoppingList> @@ -378,12 +378,12 @@ function getConfigDetails(event) { </#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> @@ -394,15 +394,15 @@ function getConfigDetails(event) { <#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="buttontext">${key}</a> </td> @@ -423,7 +423,7 @@ function getConfigDetails(event) { <#-- Long description of product --> <tr> <td colspan="2"> - <div>${productContentWrapper.get("LONG_DESCRIPTION")?if_exists}</div> + <div>${productContentWrapper.get("LONG_DESCRIPTION")!}</div> </td> </tr> @@ -433,7 +433,7 @@ function getConfigDetails(event) { <#-- Product Configurator --> <tr> <td colspan="2"> - <form name="configform" id="configFormId" method="post" action="<@ofbizUrl>product<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> + <form name="configform" id="configFormId" method="post" action="<@ofbizUrl>product<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> <input type='hidden' name='add_product_id' value='${product.productId}' /> <input type='hidden' name='add_category_id' value='' /> <input type='hidden' name='quantity' value='1' /> @@ -456,14 +456,14 @@ function getConfigDetails(event) { <div>${question.question}</div> <#if question.isFirst()> <a name='#${question.getConfigItem().getString("configItemId")}'></a> - <div>${question.description?if_exists}</div> - <#assign instructions = question.content.get("INSTRUCTIONS")?if_exists> + <div>${question.description!}</div> + <#assign instructions = question.content.get("INSTRUCTIONS")!> <#if instructions?has_content> <a href="javascript:showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${instructions}");" class="buttontext">Instructions</a> </#if> - <#assign image = question.content.get("IMAGE_URL")?if_exists> + <#assign image = question.content.get("IMAGE_URL")!> <#if image?string?has_content> - <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' class='cssImgXLarge' align='left' alt="" /> + <img src='<@ofbizContentUrl>${contentPathPrefix!}${image!}</@ofbizContentUrl>' vspace='5' hspace='5' class='cssImgXLarge' align='left' alt="" /> </#if> <#else> <div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div> @@ -482,13 +482,13 @@ function getConfigDetails(event) { <#if question.isSingleChoice()> <#-- Single choice question --> <#assign options = question.options> - <#assign selectedOption = question.getSelected()?if_exists> + <#assign selectedOption = question.getSelected()!> <#assign selectedPrice = 0.0> <#if selectedOption?has_content> <#assign selectedPrice = selectedOption.getPrice()> </#if> <#-- The single choice input can be implemented with radio buttons or a select field --> - <#if renderSingleChoiceWithRadioButtons?exists && "Y" == renderSingleChoiceWithRadioButtons> + <#if renderSingleChoiceWithRadioButtons?? && "Y" == renderSingleChoiceWithRadioButtons> <#-- This is the radio button implementation --> <#if !question.isMandatory()> <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>' /> No option</div> @@ -496,7 +496,7 @@ function getConfigDetails(event) { <#assign optionCounter = 0> <#list options as option> <#assign componentCounter = 0> - <#if showOffsetPrice?exists && "Y" == showOffsetPrice> + <#if showOffsetPrice?? && "Y" == showOffsetPrice> <#assign shownPrice = option.price - selectedPrice> <#else> <#assign shownPrice = option.price> @@ -537,7 +537,7 @@ function getConfigDetails(event) { <#assign options = question.options> <#assign optionCounter = 0> <#list options as option> - <#if showOffsetPrice?exists && "Y" == showOffsetPrice> + <#if showOffsetPrice?? && "Y" == showOffsetPrice> <#assign shownPrice = option.price - selectedPrice> <#else> <#assign shownPrice = option.price> @@ -602,8 +602,8 @@ function getConfigDetails(event) { <tr> <td colspan="2"> <div>${uiLabelMap.OrderCustomerReviews}:</div> - <#if averageRating?exists && (averageRating > 0) && numRatings?exists && (numRatings > 1)> - <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div> + <#if averageRating?? && (averageRating > 0) && numRatings?? && (numRatings > 1)> + <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings??>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div> </#if> </td> </tr> @@ -611,7 +611,7 @@ function getConfigDetails(event) { <#if productReviews?has_content> <#list productReviews as productReview> <#assign postedUserLogin = productReview.getRelatedOne("UserLogin", false)> - <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)?if_exists> + <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)!> <tr> <td colspan="2"> <table border="0" cellpadding="0" cellspacing='0'> @@ -620,10 +620,10 @@ function getConfigDetails(event) { <div>${uiLabelMap.CommonBy}: <#if productReview.postedAnonymous?default("N") == "Y">${uiLabelMap.OrderAnonymous}<#else>${postedPerson.firstName} ${postedPerson.lastName}</#if></div> </td> <td> - <div>${uiLabelMap.CommonOn}: ${productReview.postedDateTime?if_exists}</div> + <div>${uiLabelMap.CommonOn}: ${productReview.postedDateTime!}</div> </td> <td> - <div>${uiLabelMap.OrderRanking}: ${productReview.productRating?if_exists?string}</div> + <div>${uiLabelMap.OrderRanking}: ${productReview.productRating!?string}</div> </td> </tr> <tr> @@ -633,7 +633,7 @@ function getConfigDetails(event) { </tr> <tr> <td colspan="3"> - <div>${productReview.productReview?if_exists}</div> + <div>${productReview.productReview!}</div> </td> </tr> @@ -643,7 +643,7 @@ function getConfigDetails(event) { </#list> <tr> <td colspan="2"> - <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReviewThisProduct}!</a> + <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId!}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReviewThisProduct}!</a> </td> </tr> <#else> @@ -654,7 +654,7 @@ function getConfigDetails(event) { </tr> <tr> <td colspan="2"> - <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a> + <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId!}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a> </td> </tr> </table> @@ -668,15 +668,15 @@ function getConfigDetails(event) { </#if> <#if assocProducts?has_content> <tr><td> </td></tr> - <tr><td colspan="2"><h2>${beforeName?if_exists}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</#if>${afterName?if_exists}</h2></td></tr> + <tr><td colspan="2"><h2>${beforeName!}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME")!}</#if>${afterName!}</h2></td></tr> <#list assocProducts as productAssoc> <tr><td> <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> - - ${productAssoc.reason?if_exists} + - ${productAssoc.reason!} </div> </td></tr> ${setRequestAttribute("optProductId", productAssoc.productIdTo)} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |