svn commit: r1618554 [35/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [35/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Mon Aug 18 07:42:27 2014 @@ -79,16 +79,16 @@ function onClickShippingMethod(e) { <div> <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/> - <#if shoppingCart.getShippingContactMechId()?exists> + <#if shoppingCart.getShippingContactMechId()??> <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)> </#if> - <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists} + <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!} <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if> </div> </td> </tr> </#list> - <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> + <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> <tr> <td width="1%" valign="top"> <div><input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="Default" checked="checked"/>${uiLabelMap.OrderUseDefault}.</div> @@ -107,17 +107,17 @@ function onClickShippingMethod(e) { </tr> <tr> <td colspan="2"> - <textarea class='textAreaBox' cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea> + <textarea class='textAreaBox' cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea> </td> </tr> <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.OrderPoNumber}</h2> - <input type="text" class='inputBox' name="correspondingPoId" size="15" value='${shoppingCart.getPoNumber()?if_exists}'/> + <input type="text" class='inputBox' name="correspondingPoId" size="15" value='${shoppingCart.getPoNumber()!}'/> </td> </tr> - <#if productStore.showCheckoutGiftOptions?if_exists != "N"> + <#if productStore.showCheckoutGiftOptions! != "N"> <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> @@ -136,7 +136,7 @@ function onClickShippingMethod(e) { </tr> <tr> <td colspan="2"> - <textarea class='textAreaBox' cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea> + <textarea class='textAreaBox' cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea> </td> </tr> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Mon Aug 18 07:42:27 2014 @@ -19,7 +19,7 @@ under the License. <#-- NOTE: this template is used for the orderstatus screen in ecommerce AND for order notification emails through the OrderNoticeEmail.ftl file --> <#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context --> -<#if baseEcommerceSecureUrl?exists><#assign urlPrefix = baseEcommerceSecureUrl/></#if> +<#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> @@ -29,7 +29,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <div class="boxlink"> - <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)?if_exists == "ORDER_COMPLETED"> + <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)! == "ORDER_COMPLETED"> <a href="<@ofbizUrl>makeReturn?orderId=${orderHeader.orderId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a> </#if> </div> @@ -38,8 +38,8 @@ under the License. <div class="screenlet-body"> <table width="100%" border="0" cellpadding="1"> <#-- placing customer information --> - <#if localOrderReadHelper?exists && orderHeader?has_content> - <#assign displayParty = localOrderReadHelper.getPlacingParty()?if_exists/> + <#if localOrderReadHelper?? && orderHeader?has_content> + <#assign displayParty = localOrderReadHelper.getPlacingParty()!/> <#if displayParty?has_content> <#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> </#if> @@ -83,7 +83,7 @@ under the License. </td> </tr> </#if> - <#if distributorId?exists> + <#if distributorId??> <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> @@ -116,10 +116,10 @@ under the License. <#assign groupIdx = 0> <#list orderItemShipGroups as shipGroup> <#if orderHeader?has_content> - <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists> - <#assign groupNumber = shipGroup.shipGroupSeqId?if_exists> + <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)!> + <#assign groupNumber = shipGroup.shipGroupSeqId!> <#else> - <#assign shippingAddress = cart.getShippingAddress(groupIdx)?if_exists> + <#assign shippingAddress = cart.getShippingAddress(groupIdx)!> <#assign groupNumber = groupIdx + 1> </#if> @@ -137,8 +137,8 @@ under the License. ${shippingAddress.address1}<br /> <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> ${shippingAddress.city}<#if shippingAddress.stateProvinceGeoId?has_content>, ${shippingAddress.stateProvinceGeoId} </#if> - ${shippingAddress.postalCode?if_exists}<br /> - ${shippingAddress.countryGeoId?if_exists} + ${shippingAddress.postalCode!}<br /> + ${shippingAddress.countryGeoId!} </div> </td> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <#if requestParameters.paymentMethodTypeId?has_content> - <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId?if_exists}"> + <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId!}"> </#if> <script language="JavaScript" type="text/javascript"> @@ -116,11 +116,11 @@ function getPaymentInformation() { <input type="hidden" name="appendPayment" value="Y"/> </#if> <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/> - <input type="hidden" name="partyId" value="${partyId?if_exists}"/> - <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId?if_exists}"/> + <input type="hidden" name="partyId" value="${partyId!}"/> + <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId!}"/> <input type="hidden" name="createNew" value="Y"/> - <#if session.getAttribute("billingContactMechId")?exists> - <input type="hidden" name="contactMechId" value="${session.getAttribute("billingContactMechId")?if_exists}"/> + <#if session.getAttribute("billingContactMechId")??> + <input type="hidden" name="contactMechId" value="${session.getAttribute("billingContactMechId")!}"/> </#if> <table width="100%" border="0" cellpadding="1" cellspacing="0"> @@ -130,13 +130,13 @@ function getPaymentInformation() { <td colspan="2"> <select name="paymentMethodTypeOptionList" class="selectBox" onchange="javascript:getPaymentInformation();"> <option value="none">Select One</option> - <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> <option value="CREDIT_CARD" <#if (parameters.paymentMethodTypeId?default("") == "CREDIT_CARD")> selected="selected"</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option> </#if> - <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> <option value="EFT_ACCOUNT" <#if (parameters.paymentMethodTypeId?default("") == "EFT_ACCOUNT")> selected="selected"</#if>>${uiLabelMap.AccountingAHCElectronicCheck}</option> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??> <option value="EXT_OFFLINE" <#if (parameters.paymentMethodTypeId?default("") == "EXT_OFFLINE")> selected="selected"</#if>>${uiLabelMap.OrderPaymentOfflineCheckMoney}</option> </#if> </select> @@ -145,7 +145,7 @@ function getPaymentInformation() { <tr><td nowrap="nowrap" colspan="3"><div id="paymentInfoSection"></div></td></tr> <tr><td colspan="3"><hr /></td></tr> <#-- gift card fields --> - <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> <tr> <td width='26%' nowrap="nowrap" align="right"> <input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" onclick="javascript:getGCInfo();"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Mon Aug 18 07:42:27 2014 @@ -32,7 +32,7 @@ under the License. <input type="hidden" name="_useRowSubmit" value="Y"/> <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/> <input type="hidden" name="fromPartyId" value="${party.partyId}"/> - <input type="hidden" name="toPartyId" value="${toPartyId?if_exists}"/> + <input type="hidden" name="toPartyId" value="${toPartyId!}"/> <input type="hidden" name="orderId" value="${orderId}"/> <#if (orderHeader.currencyUom)?has_content> <input type="hidden" name="currencyUomId" value="${orderHeader.currencyUom}"/> @@ -60,7 +60,7 @@ under the License. <#if !orderItem.orderAdjustmentId?has_content> <#-- filter orderAdjustments --> <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/> <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/> - <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/> + <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription!}"/> <#-- <input type="hidden" name="returnItemType_o_${rowCount}" value="ITEM"/> --> <#assign returnItemType = returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey"))/> <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/> @@ -75,7 +75,7 @@ under the License. <tr> <td> <div> - <#if orderItem.productId?exists> + <#if orderItem.productId??> <a href="<@ofbizUrl>product?product_id=${orderItem.productId}</@ofbizUrl>" class="buttontext">${orderItem.productId}</a> <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}"/> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl Mon Aug 18 07:42:27 2014 @@ -16,30 +16,30 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign cart = sessionAttributes.shoppingCart?if_exists> +<#assign cart = sessionAttributes.shoppingCart!> <h3>${uiLabelMap.OrderShippingInformation}</h3> <div id="shippingFormServerError" class="errorMessage"></div> <form id="editShippingContact" method="post" action="<@ofbizUrl>processShipSettings</@ofbizUrl>" name="${parameters.formNameValue}"> <fieldset><legend>${uiLabelMap.OrderShippingInformation}</legend> - <input type="hidden" name="shippingContactMechId" value="${parameters.shippingContactMechId?if_exists}"/> + <input type="hidden" name="shippingContactMechId" value="${parameters.shippingContactMechId!}"/> <input type="hidden" name="partyId" value="${cart.getPartyId()?default("_NA_")}"/> <div> <label for="address1">${uiLabelMap.PartyAddressLine1}*</label> - <input id="address1" name="address1" class="required" type="text" value="${address1?if_exists}"/> + <input id="address1" name="address1" class="required" type="text" value="${address1!}"/> <span id="advice-required-address1" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span> </div> <div> <label for="address2">${uiLabelMap.PartyAddressLine2}</label> - <input id="address2" name="address2" type="text" value="${address2?if_exists}"/> + <input id="address2" name="address2" type="text" value="${address2!}"/> </div> <div> <label for="city">${uiLabelMap.CommonCity}*</label> - <input id="city" name="city" class="required" type="text" value="${city?if_exists}"/> + <input id="city" name="city" class="required" type="text" value="${city!}"/> <span id="advice-required-city" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span> </div> <div> <label for="postalCode">${uiLabelMap.PartyZipCode}*</label> - <input id="postalCode" name="postalCode" class="required" type="text" value="${postalCode?if_exists}" size="12" maxlength="10"/> + <input id="postalCode" name="postalCode" class="required" type="text" value="${postalCode!}" size="12" maxlength="10"/> <span id="advice-required-postalCode" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span> </div> <div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Mon Aug 18 07:42:27 2014 @@ -83,7 +83,7 @@ function submitForm(form, mode, value) { </#list> </select> </div> - <#if cart.getShipmentMethodTypeId(groupIdx)?exists> + <#if cart.getShipmentMethodTypeId(groupIdx)??> <#assign selectedShippingMethod = cart.getShipmentMethodTypeId(groupIdx) + "@" + cart.getCarrierPartyId(groupIdx)> <#else> <#assign selectedShippingMethod = ""> @@ -95,9 +95,9 @@ function submitForm(form, mode, value) { <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <option value="${shippingMethod}" <#if (shippingMethod == selectedShippingMethod)>selected="selected"</#if>> <#if carrierShipmentMethod.partyId != "_NA_"> - ${carrierShipmentMethod.partyId?if_exists} + ${carrierShipmentMethod.partyId!} </#if> - ${carrierShipmentMethod.description?if_exists} + ${carrierShipmentMethod.description!} <#if shippingEst?has_content> - <#if (shippingEst > -1)> @@ -111,7 +111,7 @@ function submitForm(form, mode, value) { </select> <h2>${uiLabelMap.OrderSpecialInstructions}</h2> - <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)?if_exists}</textarea> + <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea> </td> <td> <div> @@ -132,7 +132,7 @@ function submitForm(form, mode, value) { </div> <h2>${uiLabelMap.OrderGiftMessage}</h2> - <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)?if_exists}</textarea> + <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea> </td> <td><input type="button" class="smallSubmit" value="${uiLabelMap.CommonSave}" onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV', null);"/></td> </tr> @@ -173,19 +173,19 @@ function submitForm(form, mode, value) { <input type="hidden" name="itemIndex" value="${cartLineIndex}"/> <td> <div> - <#if cartLine.getProductId()?exists> + <#if cartLine.getProductId()??> <#-- product item --> <#-- start code to display a small image of the product --> - <#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="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>"> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /> </a> </#if> <#-- end code to display a small image of the product --> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>" class="buttontext">${cartLine.getProductId()} - - ${cartLine.getName()?if_exists}</a> : ${cartLine.getDescription()?if_exists} + ${cartLine.getName()!}</a> : ${cartLine.getDescription()!} <#-- display the registered ship groups and quantity --> <#assign itemShipGroups = cart.getShipGroups(cartLine)> @@ -205,7 +205,7 @@ function submitForm(form, mode, value) { <#else> <#-- this is a non-product item --> - <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists} + <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!} </#if> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#assign shoppingCart = sessionAttributes.shoppingCart!> <#if shoppingCart?has_content> <#assign shoppingCartSize = shoppingCart.size()> <#else> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <div> - <#if quote?exists> + <#if quote??> <#if quote.statusId == "QUO_APPROVED"> <a href="<@ofbizUrl>loadCartFromQuote?quoteId=${quote.quoteId}&finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateOrder}</a> <#else/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Mon Aug 18 07:42:27 2014 @@ -55,11 +55,11 @@ under the License. </td> <td width="10"> </td> <td> - <div>${quote.quoteName?if_exists}</div> + <div>${quote.quoteName!}</div> </td> <td width="10"> </td> <td> - <div>${quote.description?if_exists}</div> + <div>${quote.description!}</div> </td> <td width="10"> </td> <td> @@ -67,9 +67,9 @@ under the License. </td> <td width="10"> </td> <td> - <div><span style="white-space: nowrap;">${quote.issueDate?if_exists}</span></div> - <div><span style="white-space: nowrap;">${quote.validFromDate?if_exists}</span></div> - <div><span style="white-space: nowrap;">${quote.validThruDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${quote.issueDate!}</span></div> + <div><span style="white-space: nowrap;">${quote.validFromDate!}</span></div> + <div><span style="white-space: nowrap;">${quote.validThruDate!}</span></div> </td> <td width="10"> </td> <td align="right"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl Mon Aug 18 07:42:27 2014 @@ -60,15 +60,15 @@ under the License. </td> <td width="10"> </td> <td> - <div>${type.get("description",locale)?if_exists}</div> + <div>${type.get("description",locale)!}</div> </td> <td width="10"> </td> <td> - <div>${custRequest.custRequestName?if_exists}</div> + <div>${custRequest.custRequestName!}</div> </td> <td width="10"> </td> <td> - <div>${custRequest.description?if_exists}</div> + <div>${custRequest.description!}</div> </td> <td width="10"> </td> <td> @@ -76,9 +76,9 @@ under the License. </td> <td width="10"> </td> <td> - <div><span style="white-space: nowrap;">${custRequest.custRequestDate?if_exists}</span></div> - <div><span style="white-space: nowrap;">${custRequest.createdDate?if_exists}</span></div> - <div><span style="white-space: nowrap;">${custRequest.lastModifiedDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${custRequest.custRequestDate!}</span></div> + <div><span style="white-space: nowrap;">${custRequest.createdDate!}</span></div> + <div><span style="white-space: nowrap;">${custRequest.lastModifiedDate!}</span></div> </td> <td width="10"> </td> <td align="right"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl Mon Aug 18 07:42:27 2014 @@ -29,7 +29,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId?if_exists)} + ${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId!)} </td> </tr> <tr><td colspan="7"><hr /></td></tr> @@ -40,7 +40,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(statusItem.get("description", locale))?default(custRequest.statusId?if_exists)} + ${(statusItem.get("description", locale))?default(custRequest.statusId!)} </td> </tr> <#-- party --> @@ -51,7 +51,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${custRequest.fromPartyId?if_exists} + ${custRequest.fromPartyId!} </td> </tr> <#-- request name --> @@ -62,7 +62,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${custRequest.custRequestName?if_exists} + ${custRequest.custRequestName!} </td> </tr> <#-- request description --> @@ -73,7 +73,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${custRequest.description?if_exists} + ${custRequest.description!} </td> </tr> <#-- request currency --> @@ -84,7 +84,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - <#if currency?exists>${currency.get("description", locale)?default(custRequest.maximumAmountUomId?if_exists)}</#if> + <#if currency??>${currency.get("description", locale)?default(custRequest.maximumAmountUomId!)}</#if> </td> </tr> <#-- request currency --> @@ -95,7 +95,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - <#if store?exists>${store.storeName?default(custRequest.productStoreId?if_exists)}</#if> + <#if store??>${store.storeName?default(custRequest.productStoreId!)}</#if> </td> </tr> <#-- request comment --> @@ -106,7 +106,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${custRequest.internalComment?if_exists} + ${custRequest.internalComment!} </td> </tr> <#-- request reason --> @@ -117,7 +117,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${custRequest.reason?if_exists} + ${custRequest.reason!} </td> </tr> </table> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl Mon Aug 18 07:42:27 2014 @@ -28,7 +28,7 @@ under the License. <#assign party = requestParty.getRelatedOne("Party", false)> <tr> <td align="right" valign="top" width="15%" class="label"> - ${roleType.get("description", locale)?if_exists} + ${roleType.get("description", locale)!} </td> <td width="5%"> </td> <td valign="top" width="80%"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Mon Aug 18 07:42:27 2014 @@ -62,20 +62,20 @@ under the License. <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax}</option> <#if (viewIndex?int > 1)> <#list 0..viewIndexMax as curViewNum> - <option value="${shoppingListId?if_exists}~${viewSize}~${curViewNum?int + 1}">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option> + <option value="${shoppingListId!}~${viewSize}~${curViewNum?int + 1}">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option> </#list> </#if> </select> <#-- End Page Select Drop-Down --> <#if (viewIndex?int > 1)> - <a href="javascript: void(0);" onclick="callDocumentByPaginate('${shoppingListId?if_exists}~${viewSize}~${viewIndex?int - 1}');" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + <a href="javascript: void(0);" onclick="callDocumentByPaginate('${shoppingListId!}~${viewSize}~${viewIndex?int - 1}');" class="buttontext">${uiLabelMap.CommonPrevious}</a> | </#if> <#if ((listSize?int - viewSize?int) > 0)> <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> </#if> <#if highIndex?int < listSize?int> - | <a href="javascript: void(0);" onclick="callDocumentByPaginate('${shoppingListId?if_exists}~${viewSize}~${viewIndex?int + 1}');" class="buttontext">${uiLabelMap.CommonNext}</a> + | <a href="javascript: void(0);" onclick="callDocumentByPaginate('${shoppingListId!}~${viewSize}~${viewIndex?int + 1}');" class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </div> </#if> @@ -129,7 +129,7 @@ under the License. <div class="screenlet-body"> <form name="updateList" method="post" action="<@ofbizUrl>updateShoppingList</@ofbizUrl>"> <input type="hidden" class="inputBox" name="shoppingListId" value="${shoppingList.shoppingListId}"/> - <input type="hidden" class="inputBox" name="partyId" value="${shoppingList.partyId?if_exists}"/> + <input type="hidden" class="inputBox" name="partyId" value="${shoppingList.partyId!}"/> <table border="0" width="100%" cellspacing="0" cellpadding="0"> <tr> <td><div class="tableheadtext">${uiLabelMap.EcommerceListName}</div></td> @@ -137,13 +137,13 @@ under the License. </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td> - <td><input type="text" class="inputBox" size="70" name="description" value="${shoppingList.description?if_exists}" /> + <td><input type="text" class="inputBox" size="70" name="description" value="${shoppingList.description!}" /> </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.OrderListType}</div></td> <td> <select name="shoppingListTypeId" class="selectBox"> - <#if shoppingListType?exists> + <#if shoppingListType??> <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option> <option value="${shoppingListType.shoppingListTypeId}">--</option> </#if> @@ -181,7 +181,7 @@ under the License. <td><div class="tableheadtext">${uiLabelMap.EcommerceParentList}</div></td> <td> <select name="parentShoppingListId" class="selectBox"> - <#if parentShoppingList?exists> + <#if parentShoppingList??> <option value="${parentShoppingList.shoppingListId}">${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}</option> </#if> <option value="">${uiLabelMap.EcommerceNoParent}</option> @@ -189,7 +189,7 @@ under the License. <option value="${newParShoppingList.shoppingListId}">${newParShoppingList.listName?default(newParShoppingList.shoppingListId)}</option> </#list> </select> - <#if parentShoppingList?exists> + <#if parentShoppingList??> <a href="<@ofbizUrl>editShoppingList?shoppingListId=${parentShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGotoParent} (${parentShoppingList.listName?default(parentShoppingList.shoppingListId)})</a> </#if> </td> @@ -205,7 +205,7 @@ under the License. </div> </div> -<#if shoppingListType?exists && shoppingListType.shoppingListTypeId == "SLT_AUTO_REODR"> +<#if shoppingListType?? && shoppingListType.shoppingListTypeId == "SLT_AUTO_REODR"> <#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].monthBegin()> <div class="screenlet"> <div class="screenlet-title-bar"> @@ -227,7 +227,7 @@ under the License. <td><div class="tableheadtext">${uiLabelMap.EcommerceRecurrence}</div></td> <td> <#if recurrenceInfo?has_content> - <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule", false)?if_exists> + <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule", false)!> </#if> <select name="intervalNumber" class="selectBox"> <option value="">${uiLabelMap.EcommerceSelectInterval}</option> @@ -249,12 +249,12 @@ under the License. <td> </td> <td><div class="tableheadtext">${uiLabelMap.CommonStartDate}</div></td> <td> - <@htmlTemplate.renderDateTimeField name="startDateTime" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)?if_exists}" size="25" maxlength="30" id="startDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="startDateTime" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)!}" size="25" maxlength="30" id="startDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td> </td> <td><div class="tableheadtext">${uiLabelMap.CommonEndDate}</div></td> <td> - <@htmlTemplate.renderDateTimeField name="endDateTime" className="textBox" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)?if_exists}" size="25" maxlength="30" id="endDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="endDateTime" className="textBox" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)!}" size="25" maxlength="30" id="endDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td> </td> </tr> @@ -285,9 +285,9 @@ under the License. <#assign shippingMethod = shipMeth.shipmentMethodTypeId + "@" + shipMeth.partyId> <option value="${shippingMethod}"<#if shippingMethod == chosenShippingMethod> selected="selected"</#if>> <#if shipMeth.partyId != "_NA_"> - ${shipMeth.partyId?if_exists} + ${shipMeth.partyId!} </#if> - ${shipMeth.description?if_exists} + ${shipMeth.description!} <#if shippingEst?has_content> - <#if (shippingEst > -1)> @@ -314,7 +314,7 @@ under the License. <option value="${paymentMethod.paymentMethodId}" <#if (shoppingList.paymentMethodId)?default("") == paymentMethod.paymentMethodId>selected="selected"</#if>>CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option> <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT"> <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> - <option value="${paymentMethod.paymentMethodId}">EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</option> + <option value="${paymentMethod.paymentMethodId}">EFT: ${eftAccount.bankName!}: ${eftAccount.accountNumber!}</option> </#if> </#list> </select> @@ -336,15 +336,15 @@ under the License. <tr><td colspan="9"><hr /></td></tr> <tr> <td colspan="9"> - <#assign nextTime = recInfo.next(lastSlOrderTime)?if_exists> + <#assign nextTime = recInfo.next(lastSlOrderTime)!> <#if nextTime?has_content> - <#assign nextTimeStamp = Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(nextTime)?if_exists> + <#assign nextTimeStamp = Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(nextTime)!> <#if nextTimeStamp?has_content> - <#assign nextTimeString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(nextTimeStamp)?if_exists> + <#assign nextTimeString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(nextTimeStamp)!> </#if> </#if> <#if lastSlOrderDate?has_content> - <#assign lastOrderedString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)?if_exists> + <#assign lastOrderedString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)!> </#if> <div> <table cellspacing="2" cellpadding="2" border="0"> @@ -441,13 +441,13 @@ under the License. <#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)/> <#assign unitPrice = shoppingListItemData.unitPrice/> <#assign totalPrice = shoppingListItemData.totalPrice/> - <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs?if_exists/> - <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")/> + <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs!/> + <#assign isVirtual = product.isVirtual?? && product.isVirtual.equals("Y")/> <tr> <td> <div> <a href="<@ofbizUrl>product?product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${shoppingListItem.productId} - - ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists} + ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")!} </div> </td> <td nowrap="nowrap" align="center"> @@ -460,13 +460,13 @@ under the License. <table border="0" width="100%"> <tr> <td width="1%"> </td> - <td><@htmlTemplate.renderDateTimeField event="" action="" name="reservStartStr" className="inputBox" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${shoppingListItem.reservStart?if_exists}" size="15" maxlength="30" id="reservStartStr_${shoppingListItem.shoppingListItemSeqId}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/></td> - <td><input type="text" class="inputBox" size="2" name="reservLength" value="${shoppingListItem.reservLength?if_exists}"/></td> + <td><@htmlTemplate.renderDateTimeField event="" action="" name="reservStartStr" className="inputBox" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${shoppingListItem.reservStart!}" size="15" maxlength="30" id="reservStartStr_${shoppingListItem.shoppingListItemSeqId}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/></td> + <td><input type="text" class="inputBox" size="2" name="reservLength" value="${shoppingListItem.reservLength!}"/></td> </tr> <tr> <#if product.productTypeId == "ASSET_USAGE"> <td> </td> - <td><input type="text" class="inputBox" size="3" name="reservPersons" value="${shoppingListItem.reservPersons?if_exists}"/></td> + <td><input type="text" class="inputBox" size="3" name="reservPersons" value="${shoppingListItem.reservPersons!}"/></td> <#else> <td> </td> <td> </td> @@ -502,8 +502,8 @@ under the License. <a href="#" onclick="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});" class="buttontext">${uiLabelMap.CommonUpdate}</a> <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> <#if isVirtual && productVariantAssocs?has_content> - <#assign replaceItemAction = "/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_?if_exists> - <#assign addToCartAction = "/additem/" + requestAttributes._CURRENT_VIEW_?if_exists> + <#assign replaceItemAction = "/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_!> + <#assign addToCartAction = "/additem/" + requestAttributes._CURRENT_VIEW_!> <br /> <form method="post" action="<@ofbizUrl>${addToCartAction}</@ofbizUrl>" name="listreplform_${shoppingListItem.shoppingListItemSeqId}" style="margin: 0;"> <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"/> @@ -512,7 +512,7 @@ under the License. <select name="add_product_id" class="selectBox"> <#list productVariantAssocs as productVariantAssoc> <#assign variantProduct = productVariantAssoc.getRelatedOne("AssocProduct", true)> - <#if variantProduct?exists> + <#if variantProduct??> <#assign variantProductContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(variantProduct, request)> <option value="${variantProduct.productId}">${variantProductContentWrapper.get("PRODUCT_NAME")?default("No Name")} [${variantProduct.productId}]</option> </#if> @@ -524,7 +524,7 @@ under the License. <a href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${addToCartAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();" class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.EcommerceVariationToCart}</a> </form> <#else> - <a href="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if>?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}&quantity=${shoppingListItem.quantity}&reservStart=${shoppingListItem.reservStart?if_exists}&reservPersons=${shoppingListItem.reservPersons?if_exists}&reservLength=${shoppingListItem.reservLength?if_exists}&configId=${shoppingListItem.configId?if_exists}&add_product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart}</a> + <a href="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if>?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}&quantity=${shoppingListItem.quantity}&reservStart=${shoppingListItem.reservStart!}&reservPersons=${shoppingListItem.reservPersons!}&reservLength=${shoppingListItem.reservLength!}&configId=${shoppingListItem.configId!}&add_product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart}</a> </#if> </td> </tr> @@ -591,8 +591,8 @@ under the License. <div class="screenlet-body"> <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList</@ofbizUrl>"> <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"/> - <input type="text" class="inputBox" name="productId" value="${requestParameters.add_product_id?if_exists}"/> - <#if reservStart?exists></td><td>${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /></td><td> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /></td></tr><tr><td> </td><td> </td><td>${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" /></td><td nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /></td><td> + <input type="text" class="inputBox" name="productId" value="${requestParameters.add_product_id!}"/> + <#if reservStart??></td><td>${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /></td><td> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /></td></tr><tr><td> </td><td> </td><td>${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" /></td><td nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /></td><td> <!-- <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" />--> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToShoppingList}"/> </form> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml Mon Aug 18 07:42:27 2014 @@ -25,6 +25,8 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/giftcardpurchase.ftl"/></html></platform-specific> @@ -35,6 +37,7 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/giftcardreload.ftl"/></html></platform-specific> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml Mon Aug 18 07:42:27 2014 @@ -26,6 +26,7 @@ under the License. <actions> <!-- <set field="title" value="Order Confirmation Notice"/> --> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <!-- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> --> </actions> <widgets> @@ -37,6 +38,7 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/returncancel.ftl"/></html></platform-specific> @@ -47,6 +49,7 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/returncomplete.ftl"/></html></platform-specific> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/appheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/appheader.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/appheader.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/appheader.ftl Mon Aug 18 07:42:27 2014 @@ -31,7 +31,7 @@ under the License. <#if portalPages?has_content> <#list portalPages as page> <#if page.portalPageName?has_content> - <li<#if selected = "${page.portalPageId}"> class="selected"</#if>><a href="<@ofbizUrl>showPortalPage?portalPageId=${page.portalPageId}</@ofbizUrl>"><#if page.portalPageName?exists>${page.portalPageName}<#else>?</#if></a></li> + <li<#if selected = "${page.portalPageId}"> class="selected"</#if>><a href="<@ofbizUrl>showPortalPage?portalPageId=${page.portalPageId}</@ofbizUrl>"><#if page.portalPageName??>${page.portalPageName}<#else>?</#if></a></li> </#if> </#list> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl Mon Aug 18 07:42:27 2014 @@ -65,14 +65,14 @@ under the License. <input type="hidden" name="noConditionFind" value="Y"/> <table cellspacing="0" class="basic-table"> <#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> <td class="label" align="right" valign="middle"> ${uiLabelMap.ProductCategory}: </td> <td valign="middle"> <div> - <b>"${(searchCategory.description)?if_exists}" [${(searchCategory.productCategoryId)?if_exists}]</b> ${uiLabelMap.ProductIncludeSubCategories} + <b>"${(searchCategory.description)!}" [${(searchCategory.productCategoryId)!}]</b> ${uiLabelMap.ProductIncludeSubCategories} ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/> ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/> </div> @@ -92,7 +92,7 @@ under the License. <#if (18 < displayDesc?length)> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> - <option value="${productStore.productStoreId}" <#if productStoreId?if_exists == productStore.productStoreId> selected="selected"</#if>>${displayDesc} [${productStore.productStoreId}]</option> + <option value="${productStore.productStoreId}" <#if productStoreId! == productStore.productStoreId> selected="selected"</#if>>${displayDesc} [${productStore.productStoreId}]</option> </#list> </#if> </select> @@ -111,7 +111,7 @@ under the License. <#if (18 < displayDesc?length)> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> - <option value="${prodCatalog.prodCatalogId}" <#if searchCatalogId?if_exists == prodCatalog.prodCatalogId> selected="selected"</#if>>${displayDesc} [${prodCatalog.prodCatalogId}]</option> + <option value="${prodCatalog.prodCatalogId}" <#if searchCatalogId! == prodCatalog.prodCatalogId> selected="selected"</#if>>${displayDesc} [${prodCatalog.prodCatalogId}]</option> </#list> </select> <span id="catalogErrorMessage" style="display:none;" class="errorMessage">${uiLabelMap.CommonRequired}</span> @@ -137,7 +137,7 @@ under the License. </#list> </select> <#else> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advToKeywordSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="advToKeywordSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> </#if> ${uiLabelMap.ProductIncludeSubCategories} ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /> @@ -177,7 +177,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PRODUCT_NAME" size="20" value="${requestParameters.SEARCH_PRODUCT_NAME?if_exists}" /> + <input type="text" name="SEARCH_PRODUCT_NAME" size="20" value="${requestParameters.SEARCH_PRODUCT_NAME!}" /> </div> </td> </tr> @@ -187,7 +187,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" value="${requestParameters.SEARCH_INTERNAL_PROD_NAME?if_exists}" /> + <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" value="${requestParameters.SEARCH_INTERNAL_PROD_NAME!}" /> </div> </td> </tr> @@ -197,7 +197,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}" /> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" /> ${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> /> </div> @@ -209,19 +209,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="N" /> @@ -234,19 +234,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="N" /> @@ -259,19 +259,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1?if_exists}" /> + <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="N" /> </div> <div> - <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2?if_exists}" /> + <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="N" /> </div> <div> - <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3?if_exists}" /> + <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="N" /> @@ -284,8 +284,8 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW?if_exists}" /> - <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH?if_exists}" /> + <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW!}" /> + <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH!}" /> </div> </td> </tr> @@ -295,7 +295,7 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId] /> <tr> <td class="label" align="right" valign="middle"> - ${(productFeatureType.get("description",locale))?if_exists}: + ${(productFeatureType.get("description",locale))!}: </td> <td valign="middle"> <div> @@ -318,7 +318,7 @@ under the License. <select name="SEARCH_SUPPLIER_ID"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail> - <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option> + <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}]</option> </#list> </select> </div> @@ -353,7 +353,7 @@ under the License. ${uiLabelMap.ProductPrioritizeProductsInCategory}: </td> <td valign="middle"> - <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID?if_exists}" formName="advToKeywordSearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID!}" formName="advToKeywordSearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/> </td> </tr> <tr> @@ -364,7 +364,7 @@ under the License. <select name="SEARCH_GOOD_IDENTIFICATION_TYPE"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list goodIdentificationTypes as goodIdentificationType> - <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")?if_exists}</option> + <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")!}</option> </#list> </select> </td> @@ -374,7 +374,7 @@ under the License. ${uiLabelMap.ProductGoodIdentificationValue}: </td> <td> - <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE?if_exists}" /> + <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N" /> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if parameters.redirect?exists> +<#if parameters.redirect??> <html> <head> <meta HTTP-EQUIV="REFRESH" content="0; url=${parameters.redirect}"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/merchantCalculations.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/merchantCalculations.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/merchantCalculations.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/merchantCalculations.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if flowSupport.merchantCalculations?exists> +<#if flowSupport.merchantCalculations??> <merchant-calculations> <merchant-calculations-url>${flowSupport.merchantCalulations.url}</merchant-calculations-url> <accept-merchant-coupons>${flowSupport.merchantCalculations.acceptCoupons?default("false")}</accept-merchant-coupons> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/shippingMethods.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/shippingMethods.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/shippingMethods.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/shippingMethods.ftl Mon Aug 18 07:42:27 2014 @@ -19,16 +19,16 @@ under the License. <#--TODO: merchant-calculated-shipping cannot be mixed with flat-shipping or pickup, change accordingly --> -<#if flowSupport.shippingMethods?exists> +<#if flowSupport.shippingMethods??> <shipping-methods> <#list flowSupport.shippingMethods as shippingMethod> <#if shippingMethod.type="flatRate"> <flat-rate-shipping name="${shippingMethod.name}"> <price currency="USD">${shippingMethod.price}</price> - <#if shippingMethod.restrictions?exists> + <#if shippingMethod.restrictions??> <#list shippingMethod.restrictions as restriction> <shipping-restrictions> - <#if restriction.allowed?exists> + <#if restriction.allowed??> <allowed-areas> <#list resitriction.allowed as allow> <#if allow.type="state"> @@ -49,7 +49,7 @@ under the License. </#list> </allowed-areas> </#if> - <#if restriction.excluded?exists> + <#if restriction.excluded??> <excluded-areas> <#list resitriction.excluded as exclude> <#if exclude.type="state"> @@ -77,10 +77,10 @@ under the License. <#elseif shippingMethod.type="merchantCalculated"> <merchant-calculated-shipping name="${shippingMethod.name}"> <price currency="USD">${shippingMethod.price}</price> - <#if shippingMethod.restrictions?exists> + <#if shippingMethod.restrictions??> <#list shippingMethod.restrictions as restriction> <shipping-restrictions> - <#if restriction.allowed?exists> + <#if restriction.allowed??> <allowed-areas> <#list resitriction.allowed as allow> <#if allow.type="state"> @@ -101,7 +101,7 @@ under the License. </#list> </allowed-areas> </#if> - <#if restriction.excluded?exists> + <#if restriction.excluded??> <excluded-areas> <#list resitriction.excluded as exclude> <#if exclude.type="state"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/simpleFlow.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/simpleFlow.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/simpleFlow.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/simpleFlow.ftl Mon Aug 18 07:42:27 2014 @@ -17,9 +17,9 @@ specific language governing permissions under the License. --> -<#if flowSupport.editCartUrl?exists> +<#if flowSupport.editCartUrl??> <edit-cart-url>${flowSupport.editCartUrl}</edit-cart-url> </#if> -<#if flowSupport.continueShoppingUrl?exists> +<#if flowSupport.continueShoppingUrl??> <continue-shopping-url>${flowSupport.continueShoppingUrl}</continue-shopping-url> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |