svn commit: r1618313 [1/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
Locked
svn commit: r1618313 [1/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
 
|
Author: ashish
Date: Sat Aug 16 08:40:28 2014 New Revision: 1618313 URL: http://svn.apache.org/r1618313 Log: Applied the patch OFBIZ-4902_specialpurpose.patch from OFBIZ-4902 - Replace in Freemarker templates the deprecated built-ins: default, exists, if_exists. Thanks http://ofbiz.us team for providing the patch work. Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListEmailTemplate.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactUsEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/giftcardpurchase.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/returnaccept.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/survey/miniresult.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/survey/minisurvey.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/minipromotext.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ShowBestSellingCategory.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniassocprods.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedproducts.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productreview.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_categories.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_topic.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/factoids.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/minipoll.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/AnonContactus.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/SerializedInventorySummary.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl ofbiz/trunk/specialpurpose/example/webapp/appheader.ftl ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/merchantCalculations.ftl ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/shippingMethods.ftl ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/simpleFlow.ftl ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/taxTables.ftl ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/templates/shoppingCart/items.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl ofbiz/trunk/specialpurpose/lucene/webapp/content/AdminSearch.ftl ofbiz/trunk/specialpurpose/myportal/widget/RegisterPerson.ftl ofbiz/trunk/specialpurpose/myportal/widget/login.ftl ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl ofbiz/trunk/specialpurpose/projectmgr/main.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl ofbiz/trunk/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl ofbiz/trunk/specialpurpose/scrum/templates/ActiveSprintNotification.ftl ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl ofbiz/trunk/specialpurpose/scrum/templates/ClosedSprintNotification.ftl ofbiz/trunk/specialpurpose/scrum/templates/CompletedBacklogNotification.ftl ofbiz/trunk/specialpurpose/scrum/templates/ReviewedBacklogNotification.ftl ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/revision.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl ofbiz/trunk/themes/bizznesstime/includes/header.ftl ofbiz/trunk/themes/bizznesstime/includes/messages.ftl ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl ofbiz/trunk/themes/bluelight/includes/header.ftl ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl ofbiz/trunk/themes/flatgrey/includes/appbar.ftl ofbiz/trunk/themes/flatgrey/includes/header.ftl ofbiz/trunk/themes/multiflex/includes/header.ftl ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl ofbiz/trunk/themes/tomahawk/includes/header.ftl Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl (original) +++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl Sat Aug 16 08:40:28 2014 @@ -41,25 +41,25 @@ under the License. <#if fixedAsset.fixedAssetName?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetName}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${fixedAsset.fixedAssetName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${fixedAsset.fixedAssetName!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if fixedAsset.serialNumber?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_serialNumber}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${fixedAsset.serialNumber?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${fixedAsset.serialNumber!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if fixedAsset.locatedAtFacilityId?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_locatedAtFacilityId}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${maintenance.facilityName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${maintenance.facilityName!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if fixedAssetIdentValue?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetIdents}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${fixedAssetIdentValue?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${fixedAssetIdentValue!}</fo:block></fo:table-cell> </fo:table-row> </#if> </#if> @@ -87,23 +87,23 @@ under the License. <#if productMaintName?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonName}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${productMaintName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${productMaintName!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if productMaintTypeDesc?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetMaintType}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${productMaintTypeDesc?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${productMaintTypeDesc!}</fo:block></fo:table-cell> </fo:table-row> </#if> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${fixedAssetMaint.intervalQuantity?if_exists} ${intervalUomDesc?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${fixedAssetMaint.intervalQuantity!} ${intervalUomDesc!}</fo:block></fo:table-cell> </fo:table-row> <#if productMeterTypeDesc?has_content> <fo:table-row> <fo:table-cell><fo:block>Meter type</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${productMeterTypeDesc?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${productMeterTypeDesc!}</fo:block></fo:table-cell> </fo:table-row> </#if> </#if> @@ -138,7 +138,7 @@ under the License. <fo:table-cell><fo:block></fo:block></fo:table-cell> </#if> </fo:table-row> - <#assign workEffortPurposeType = scheduleWorkEffort.getRelatedOne("WorkEffortPurposeType", false)?if_exists> + <#assign workEffortPurposeType = scheduleWorkEffort.getRelatedOne("WorkEffortPurposeType", false)!> <#if workEffortPurposeType?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_workEffortPurposeTypeId}</fo:block></fo:table-cell> @@ -147,11 +147,11 @@ under the License. </#if> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonName}</fo:block></fo:table-cell> - <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.workEffortName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.workEffortName!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonDescription}</fo:block></fo:table-cell> - <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.description?if_exists}</fo:block></fo:table-cell> + <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.description!}</fo:block></fo:table-cell> </fo:table-row> </#if> </fo:table-body> @@ -170,13 +170,13 @@ under the License. </fo:table-header> <fo:table-body> <#list itemIssuanceList as itemIssuance> - <#assign productId = itemIssuance.productId?if_exists> + <#assign productId = itemIssuance.productId!> <#assign quantity = itemIssuance.quantity?default(0)> <fo:table-row> <fo:table-cell> <fo:block> - <#if productId?exists> - ${itemIssuance.productId?default("N/A")} - ${itemIssuance.internalName?if_exists} - ${itemIssuance.description?if_exists} - ${itemIssuance.comments?if_exists} + <#if productId??> + ${itemIssuance.productId?default("N/A")} - ${itemIssuance.internalName!} - ${itemIssuance.description!} - ${itemIssuance.comments!} </#if> </fo:block> </fo:table-cell> @@ -202,7 +202,7 @@ under the License. <fo:block>Author : ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</fo:block> <fo:block>Date : ${note.noteDateTime?string.short}</fo:block> <#escape x as x?html> - <fo:block>${note.noteInfo?if_exists}</fo:block> + <fo:block>${note.noteInfo!}</fo:block> </#escape> </fo:table-cell> </fo:table-row> Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original) +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Sat Aug 16 08:40:28 2014 @@ -18,7 +18,7 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"> -<#if locale?exists> +<#if locale??> <#assign initialLocale = locale.toString()> <#else> <#assign initialLocale = "en"> Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl (original) +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl Sat Aug 16 08:40:28 2014 @@ -17,9 +17,9 @@ specific language governing permissions under the License. --> -${(decoratedContent.subcontent.htmlHead)?default((thisContent.subcontent.htmlHead)?if_exists)} -${(decoratedContent.subcontent.header)?default((thisContent.subcontent.header)?if_exists)} +${(decoratedContent.subcontent.htmlHead)?default((thisContent.subcontent.htmlHead)!)} +${(decoratedContent.subcontent.header)?default((thisContent.subcontent.header)!)} ${decoratedContent} -${(decoratedContent.subcontent.footer)?default((thisContent.subcontent.footer)?if_exists)} +${(decoratedContent.subcontent.footer)?default((thisContent.subcontent.footer)!)} Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl Sat Aug 16 08:40:28 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" /> @@ -155,7 +155,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> @@ -165,7 +165,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> @@ -175,7 +175,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> @@ -187,19 +187,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" /> @@ -212,19 +212,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" /> @@ -237,19 +237,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" /> @@ -262,8 +262,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> @@ -273,7 +273,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> @@ -296,7 +296,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> @@ -331,7 +331,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> @@ -342,7 +342,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> @@ -352,7 +352,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/trunk/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl Sat Aug 16 08:40:28 2014 @@ -25,7 +25,7 @@ under the License. <div><a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>${searchConstraintString}</div> </#list> <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString} - <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> + <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> <#if !productIds?has_content> <div><h2>${uiLabelMap.ProductNoResultsFound}.</h2></div> @@ -76,8 +76,8 @@ under the License. <@paginationPanel /> <form method="post" name="products" action=""> <fieldset> - <input type="hidden" name="productStoreId" value="${parameters.productStoreId?if_exists}" /> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}" /> + <input type="hidden" name="productStoreId" value="${parameters.productStoreId!}" /> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${(requestParameters.SEARCH_CATEGORY_ID)!}" /> <table class="basic-table border-top border-bottom"> <#assign listIndex = lowIndex /> <#assign altRow = false /> @@ -87,7 +87,7 @@ under the License. <tr <#if altRow> class="alternate-row"</#if>> <td> <input type="checkbox" name="selectResult" value="${productId}"/> - <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)?if_exists}</a> + <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)!}</a> </td> </tr> </#list> Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl Sat Aug 16 08:40:28 2014 @@ -19,7 +19,7 @@ under the License. <script language="JavaScript" type="text/javascript"> function exportToEbay() { - <#if toEbayStore?exists> + <#if toEbayStore??> document.products.action="<@ofbizUrl>prepareProductListing</@ofbizUrl>"; <#else> document.products.action="<@ofbizUrl>ProductsExportToEbay</@ofbizUrl>"; Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl Sat Aug 16 08:40:28 2014 @@ -42,18 +42,18 @@ under the License. </script> <div> <form id="ProductsExportToEbay" method="post" action="<@ofbizUrl>PostProductsToEbay</@ofbizUrl>" name="ProductsExportToEbay"> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <table border="0" cellpadding="2" cellspacing="0"> <tr> <td align="right" class="label">${uiLabelMap.FormFieldTitle_ebayCategory}</td> <td> </td> <td> - <input type="hidden" name="selectResult" value="${selectResult?if_exists}"/> + <input type="hidden" name="selectResult" value="${selectResult!}"/> <select name="ebayCategory" onchange="changeEbayCategory(this.value)"> <option value=""> </option> - <#if categories?exists> + <#if categories??> <#list categories as category> - <option value="${category.CategoryCode}" <#if categoryCode?exists && categoryCode == category.CategoryCode>selected="selected"</#if>>${category.CategoryName}</option> + <option value="${category.CategoryCode}" <#if categoryCode?? && categoryCode == category.CategoryCode>selected="selected"</#if>>${category.CategoryName}</option> </#list> </#if> </select> @@ -65,9 +65,9 @@ under the License. <td> </td> <td> <select name="country"> - <#if countries?exists> + <#if countries??> <#list countries as country> - <option value="${country.geoCode}" <#if countryCode?exists && countryCode == country.geoCode>selected="selected"</#if>>${country.get("geoName",locale)}</option> + <option value="${country.geoCode}" <#if countryCode?? && countryCode == country.geoCode>selected="selected"</#if>>${country.get("geoName",locale)}</option> </#list> </#if> </select> @@ -77,7 +77,7 @@ under the License. <td align="right" class="label">${uiLabelMap.FormFieldTitle_location}</td> <td> </td> <td> - <input type="text" name="location" size="50" maxlength="50" value="${parameters.location?if_exists}" /> + <input type="text" name="location" size="50" maxlength="50" value="${parameters.location!}" /> </td> </tr> <tr> @@ -95,14 +95,14 @@ under the License. <td align="right" class="label">${uiLabelMap.FormFieldTitle_startPrice}</td> <td> </td> <td> - <input type="text" name="startPrice" size="12" maxlength="12" value="${parameters.startPrice?if_exists}" /> + <input type="text" name="startPrice" size="12" maxlength="12" value="${parameters.startPrice!}" /> </td> </tr> <tr> <td align="right" class="label">${uiLabelMap.CommonQuantity}</td> <td> </td> <td> - <input type="text" name="quantity" size="12" maxlength="12" value="<#if parameters.quantity?exists>${parameters.quantity?if_exists}<#else>1</#if>" /> + <input type="text" name="quantity" size="12" maxlength="12" value="<#if parameters.quantity??>${parameters.quantity!}<#else>1</#if>" /> </td> </tr> <tr> @@ -115,7 +115,7 @@ under the License. <#if (18 < displayDesc?length)> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> - <option value="${webSite.webSiteId}" <#if selectedWebSiteId?if_exists == webSite.webSiteId> selected="selected"</#if>>${displayDesc} [${webSite.webSiteId}]</option> + <option value="${webSite.webSiteId}" <#if selectedWebSiteId! == webSite.webSiteId> selected="selected"</#if>>${displayDesc} [${webSite.webSiteId}]</option> </#list> </select> </td> @@ -124,7 +124,7 @@ under the License. <td align="right" class="label">${uiLabelMap.FormFieldTitle_webSiteUrl}</td> <td> </td> <td> - <input type="text" name="webSiteUrl" size="100" value="${webSiteUrl?if_exists}"/> + <input type="text" name="webSiteUrl" size="100" value="${webSiteUrl!}"/> </td> </tr> <tr> @@ -138,33 +138,33 @@ under the License. <table class="basic-table" cellspacing="0"> <tr> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentPayPal}</td> - <td width="2%"><input type="checkbox" name="paymentPayPal" <#if parameters.paymentPayPal?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentPayPal" <#if parameters.paymentPayPal??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentVisaMC}</td> - <td width="2%"><input type="checkbox" name="paymentVisaMC" <#if parameters.paymentVisaMC?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentVisaMC" <#if parameters.paymentVisaMC??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentAmEx}</td> - <td width="2%"><input type="checkbox" name="paymentAmEx" <#if parameters.paymentAmEx?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentAmEx" <#if parameters.paymentAmEx??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentDiscover}</td> - <td width="2%"><input type="checkbox" name="paymentDiscover" <#if parameters.paymentDiscover?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentDiscover" <#if parameters.paymentDiscover??>checked="checked"</#if> /></td> </tr> <tr> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentMOCC}</td> - <td width="2%"><input type="checkbox" name="paymentMOCC" <#if parameters.paymentMOCC?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentMOCC" <#if parameters.paymentMOCC??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentPersonalCheck}</td> - <td width="2%"><input type="checkbox" name="paymentPersonalCheck" <#if parameters.paymentPersonalCheck?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentPersonalCheck" <#if parameters.paymentPersonalCheck??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCCAccepted}</td> - <td width="2%"><input type="checkbox" name="paymentCCAccepted" <#if parameters.paymentCCAccepted?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentCCAccepted" <#if parameters.paymentCCAccepted??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCashInPerson}</td> - <td width="2%"><input type="checkbox" name="paymentCashInPerson" <#if parameters.paymentCashInPerson?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentCashInPerson" <#if parameters.paymentCashInPerson??>checked="checked"</#if> /></td> </tr> <tr> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCashOnPickup}</td> - <td width="2%"><input type="checkbox" name="paymentCashOnPickup" <#if parameters.paymentCashOnPickup?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentCashOnPickup" <#if parameters.paymentCashOnPickup??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCOD}</td> - <td width="2%"><input type="checkbox" name="paymentCOD" <#if parameters.paymentCOD?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentCOD" <#if parameters.paymentCOD??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCODPrePayDelivery}</td> - <td width="2%"><input type="checkbox" name="paymentCODPrePayDelivery" <#if parameters.paymentCODPrePayDelivery?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentCODPrePayDelivery" <#if parameters.paymentCODPrePayDelivery??>checked="checked"</#if> /></td> <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentMoneyXferAccepted}</td> - <td width="2%"><input type="checkbox" name="paymentMoneyXferAccepted" <#if parameters.paymentMoneyXferAccepted?exists>checked="checked"</#if> /></td> + <td width="2%"><input type="checkbox" name="paymentMoneyXferAccepted" <#if parameters.paymentMoneyXferAccepted??>checked="checked"</#if> /></td> </tr> </table> </td> @@ -173,14 +173,14 @@ under the License. <td align="right" class="label">${uiLabelMap.FormFieldTitle_payPalEmail}</td> <td> </td> <td> - <input type="text" name="payPalEmail" size="50" maxlength="50" value="${parameters.payPalEmail?if_exists}" /> + <input type="text" name="payPalEmail" size="50" maxlength="50" value="${parameters.payPalEmail!}" /> </td> </tr> <tr> <td align="right" class="label">${uiLabelMap.FormFieldTitle_customXml}</td> <td> </td> <td> - <textarea cols="60" rows="6" wrap="soft" name="customXml">${customXml?if_exists}</textarea> + <textarea cols="60" rows="6" wrap="soft" name="customXml">${customXml!}</textarea> </td> </tr> <tr> Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl (original) +++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl Sat Aug 16 08:40:28 2014 @@ -124,20 +124,20 @@ under the License. </script> <#if parameters.ebayStore?has_content> - <#assign ebayStore = parameters.ebayStore?if_exists> + <#assign ebayStore = parameters.ebayStore!> <#--${ebayStore}--> <form name="StoreSettingForm" id="StoreSettingForm" method="post" action="<@ofbizUrl>editEbayStoreDetail</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="themeType" value="${themeType?if_exists}"/> - <input type="hidden" name="storeUrl" value="${ebayStore.storeUrl?if_exists}"/> - <input type="hidden" name="storeLogoId" value="${ebayStore.storeLogoId?if_exists}"/> - <input type="hidden" name="storeLogoName" value="${ebayStore.storeLogoName?if_exists}"/> - <input type="hidden" name="productStoreId" value="${parameters.productStoreId?if_exists}"/> + <input type="hidden" name="themeType" value="${themeType!}"/> + <input type="hidden" name="storeUrl" value="${ebayStore.storeUrl!}"/> + <input type="hidden" name="storeLogoId" value="${ebayStore.storeLogoId!}"/> + <input type="hidden" name="storeLogoName" value="${ebayStore.storeLogoName!}"/> + <input type="hidden" name="productStoreId" value="${parameters.productStoreId!}"/> <fieldset> <table cellspacing="0" class="basic-table"> <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreName} :</td> <td valign="middle"> - <input type="text" name="storeName" value="${ebayStore.storeName?if_exists}" onKeyDown="countAreaChars(document.StoreSettingForm.storeName,35,document.getElementById('charsleft1'));" + <input type="text" name="storeName" value="${ebayStore.storeName!}" onKeyDown="countAreaChars(document.StoreSettingForm.storeName,35,document.getElementById('charsleft1'));" onKeyUp="countAreaChars(document.StoreSettingForm.storeName,35,document.getElementById('charsleft1'));" /> <div id="charsleft1"></div> </td> @@ -147,28 +147,28 @@ under the License. <td valign="middle"> <textarea rows="4" cols="80" name="storeDesc" onKeyDown="countAreaChars(document.StoreSettingForm.storeDesc,300,document.getElementById('charsleft2'));" - onKeyUp="countAreaChars(document.StoreSettingForm.storeDesc,300,document.getElementById('charsleft2'));">${ebayStore.storeDesc?if_exists}</textarea> + onKeyUp="countAreaChars(document.StoreSettingForm.storeDesc,300,document.getElementById('charsleft2'));">${ebayStore.storeDesc!}</textarea> <div id="charsleft2"></div> </td> </tr> <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreURL} :</td> <td valign="middle"> - <a href="${ebayStore.storeUrl?if_exists}" target="_blank">${ebayStore.storeUrl?if_exists}</a> + <a href="${ebayStore.storeUrl!}" target="_blank">${ebayStore.storeUrl!}</a> </td> </tr> <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreLogoURL} :</td> <td valign="middle"> - <input type="text" name="storeLogoURL" size="50" value="${ebayStore.storeLogoURL?if_exists}"/> + <input type="text" name="storeLogoURL" size="50" value="${ebayStore.storeLogoURL!}"/> </td> </tr> <tr> <td class="label" align="right" valign="middle"></td> <td valign="middle"> <div onclick="javascript:switchTheme();"> - <input type="radio" name="storeThemeType" <#if themeType?if_exists == "Basic">checked="checked"</#if> value="Basic" default="default" /> Basic Theme - <input type="radio" name="storeThemeType" <#if themeType?if_exists == "Advanced">checked="checked"</#if> value="Advanced" /> Advanced Theme + <input type="radio" name="storeThemeType" <#if themeType! == "Basic">checked="checked"</#if> value="Basic" default="default" /> Basic Theme + <input type="radio" name="storeThemeType" <#if themeType! == "Advanced">checked="checked"</#if> value="Advanced" /> Advanced Theme </div> </td> </tr> @@ -179,9 +179,9 @@ under the License. <select id="storeAdvancedTheme" name="storeAdvancedTheme" > <#if storeAdvanceThemeOptList?has_content> <#list storeAdvanceThemeOptList as storeAdvanceThemeOpt> - <option value="${storeAdvanceThemeOpt.storeThemeId?if_exists}" - <#if ebayStore.storeThemeId.equals(storeAdvanceThemeOpt.storeThemeId?if_exists)>selected="selected"</#if>> - ${storeAdvanceThemeOpt.storeThemeName?if_exists}</option> + <option value="${storeAdvanceThemeOpt.storeThemeId!}" + <#if ebayStore.storeThemeId.equals(storeAdvanceThemeOpt.storeThemeId!)>selected="selected"</#if>> + ${storeAdvanceThemeOpt.storeThemeName!}</option> </#list> </#if> </select> @@ -193,9 +193,9 @@ under the License. <td valign="middle"> <select name="storeAdvancedThemeColor"> <#list storeAdvancedThemeColorOptList as storeAdvancedThemeColorOpt> - <option value="${storeAdvancedThemeColorOpt.storeColorSchemeId?if_exists}" - <#if ebayStore.storeColorSchemeId.equals(storeAdvancedThemeColorOpt.storeColorSchemeId?if_exists)>selected="selected"</#if>> - ${storeAdvancedThemeColorOpt.storeColorName?if_exists}</option> + <option value="${storeAdvancedThemeColorOpt.storeColorSchemeId!}" + <#if ebayStore.storeColorSchemeId.equals(storeAdvancedThemeColorOpt.storeColorSchemeId!)>selected="selected"</#if>> + ${storeAdvancedThemeColorOpt.storeColorName!}</option> </#list> </select> </td> @@ -206,13 +206,13 @@ under the License. <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreBasicTheme} :</td> <td valign="middle"> <#assign currentStoreThemeIdAndSchemeId = ebayStore.storeThemeId?string+"-"+ebayStore.storeColorSchemeId?string> - <select id="storeBasicTheme" name="storeBasicTheme" onchange="javascript:retrieveThemeColorSchemeByThemeId('<@ofbizUrl>retrieveThemeColorSchemeByThemeId</@ofbizUrl>',this.value,'${parameters.productStoreId?if_exists}');"> + <select id="storeBasicTheme" name="storeBasicTheme" onchange="javascript:retrieveThemeColorSchemeByThemeId('<@ofbizUrl>retrieveThemeColorSchemeByThemeId</@ofbizUrl>',this.value,'${parameters.productStoreId!}');"> <#if storeThemeOptList?has_content> <#list storeThemeOptList as storeThemeOpt> <#assign storeThemeIdAndSchemeId = storeThemeOpt.storeThemeId+"-"+storeThemeOpt.storeColorSchemeId> - <option value="${storeThemeIdAndSchemeId?if_exists}" - <#if currentStoreThemeIdAndSchemeId == storeThemeIdAndSchemeId?if_exists>selected="selected"</#if>> - ${storeThemeOpt.storeColorSchemeName?if_exists} + <option value="${storeThemeIdAndSchemeId!}" + <#if currentStoreThemeIdAndSchemeId == storeThemeIdAndSchemeId!>selected="selected"</#if>> + ${storeThemeOpt.storeColorSchemeName!} </option> </#list> </#if> @@ -228,19 +228,19 @@ under the License. <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStorePrimaryColor} :</td> <td valign="middle"> - ${uiLabelMap.CommonNbr}<input type="text" id="storePrimaryColor" name="storePrimaryColor" size="10" value="${ebayStore.storeColorPrimary?if_exists}"/> + ${uiLabelMap.CommonNbr}<input type="text" id="storePrimaryColor" name="storePrimaryColor" size="10" value="${ebayStore.storeColorPrimary!}"/> </td> </tr> <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreSecondColor} :</td> <td valign="middle"> - ${uiLabelMap.CommonNbr}<input type="text" id="storeSecondaryColor" name="storeSecondaryColor" size="10" value="${ebayStore.storeColorSecondary?if_exists}"/> + ${uiLabelMap.CommonNbr}<input type="text" id="storeSecondaryColor" name="storeSecondaryColor" size="10" value="${ebayStore.storeColorSecondary!}"/> </td> </tr> <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreAccentColor} :</td> <td valign="middle"> - ${uiLabelMap.CommonNbr}<input type="text" id="storeAccentColor" name="storeAccentColor" size="10" value="${ebayStore.storeColorAccent?if_exists}"/> + ${uiLabelMap.CommonNbr}<input type="text" id="storeAccentColor" name="storeAccentColor" size="10" value="${ebayStore.storeColorAccent!}"/> </td> </tr> <tr> @@ -263,30 +263,30 @@ under the License. <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreName} :</td> <td valign="middle"> - <#if storeFontTheme?exists> - <#if ebayStore.storeNameColor?exists> - <#assign storeFontColor = ebayStore.storeNameColor?if_exists> + <#if storeFontTheme??> + <#if ebayStore.storeNameColor??> + <#assign storeFontColor = ebayStore.storeNameColor!> <#else> - <#assign storeFontColor = storeFontTheme.storeFontTypeNameFaceColor?if_exists> + <#assign storeFontColor = storeFontTheme.storeFontTypeNameFaceColor!> </#if> <table width="450"> <tr> <td> <select id="storeNameFont" name="storeNameFont"> <#list storeFontTheme.storeFontTypeFontFaceList as storeFontTypeFontFace> - <option <#if storeFontTypeFontFace.storeFontValue?if_exists.equals(ebayStore.storeNameFontFace?if_exists) >selected="selected"</#if> value="${storeFontTypeFontFace.storeFontName?if_exists}">${storeFontTypeFontFace.storeFontName?if_exists}</option> + <option <#if storeFontTypeFontFace.storeFontValue.equals(ebayStore.storeNameFontFace) >selected="selected"</#if> value="${storeFontTypeFontFace.storeFontName!}">${storeFontTypeFontFace.storeFontName!}</option> </#list> </select> </td> <td> <select id="storeNameFontSize" name="storeNameFontSize"> <#list storeFontTheme.storeFontTypeSizeFaceList as storeFontTypeSizeFace> - <option <#if storeFontTypeSizeFace.storeFontSizeValue?if_exists.equals(ebayStore.storeNameFontFaceSize?if_exists) >selected="selected"</#if> value="${storeFontTypeSizeFace.storeFontSizeName?if_exists}">${storeFontTypeSizeFace.storeFontSizeName?if_exists}</option> + <option <#if storeFontTypeSizeFace.storeFontSizeValue.equals(ebayStore.storeNameFontFaceSize) >selected="selected"</#if> value="${storeFontTypeSizeFace.storeFontSizeName!}">${storeFontTypeSizeFace.storeFontSizeName!}</option> </#list> </select> </td> <td> - ${uiLabelMap.CommonNbr}<input id="storeNameFontColor" type="text" size="10" name="storeNameFontColor" value="${storeFontColor?if_exists}"/> + ${uiLabelMap.CommonNbr}<input id="storeNameFontColor" type="text" size="10" name="storeNameFontColor" value="${storeFontColor!}"/> </td> </tr> </table> @@ -296,30 +296,30 @@ under the License. <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreSectionTitle} :</td> <td valign="middle"> - <#if storeFontTheme?exists> - <#if ebayStore.storeTitleColor?exists> - <#assign storeTitleColor = ebayStore.storeTitleColor?if_exists> + <#if storeFontTheme??> + <#if ebayStore.storeTitleColor??> + <#assign storeTitleColor = ebayStore.storeTitleColor!> <#else> - <#assign storeTitleColor = storeFontTheme.storeFontTypeTitleColor?if_exists> + <#assign storeTitleColor = storeFontTheme.storeFontTypeTitleColor!> </#if> <table width="450"> <tr> <td> <select id="storeTitleFont" name="storeTitleFont"> <#list storeFontTheme.storeFontTypeFontTitleList as storeFontTypeFontTitle> - <option <#if storeFontTypeFontTitle.storeFontValue?if_exists.equals(ebayStore.storeTitleFontFace?if_exists) >selected="selected"</#if> value="${storeFontTypeFontTitle.storeFontName?if_exists}">${storeFontTypeFontTitle.storeFontName?if_exists}</option> + <option <#if storeFontTypeFontTitle.storeFontValue.equals(ebayStore.storeTitleFontFace) >selected="selected"</#if> value="${storeFontTypeFontTitle.storeFontName!}">${storeFontTypeFontTitle.storeFontName!}</option> </#list> </select> </td> <td> <select id="storeTitleFontSize" name="storeTitleFontSize"> <#list storeFontTheme.storeFontSizeTitleList as storeFontSizeTitle> - <option <#if storeFontSizeTitle.storeFontSizeValue?if_exists.equals(ebayStore.storeTitleFontFaceSize?if_exists) >selected="selected"</#if> value="${storeFontSizeTitle.storeFontSizeName?if_exists}">${storeFontSizeTitle.storeFontSizeName?if_exists}</option> + <option <#if storeFontSizeTitle.storeFontSizeValue.equals(ebayStore.storeTitleFontFaceSize) >selected="selected"</#if> value="${storeFontSizeTitle.storeFontSizeName!}">${storeFontSizeTitle.storeFontSizeName!}</option> </#list> </select> </td> <td> - ${uiLabelMap.CommonNbr}<input id="storeTitleFontColor" type="text" size="10" name="storeTitleFontColor" value="${storeTitleColor?if_exists}"/> + ${uiLabelMap.CommonNbr}<input id="storeTitleFontColor" type="text" size="10" name="storeTitleFontColor" value="${storeTitleColor!}"/> </td> </tr> </table> @@ -329,30 +329,30 @@ under the License. <tr> <td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreDesc} :</td> <td valign="middle"> - <#if storeFontTheme?exists> - <#if ebayStore.storeDescColor?exists> - <#assign storeDescColor = ebayStore.storeDescColor?if_exists> + <#if storeFontTheme??> + <#if ebayStore.storeDescColor??> + <#assign storeDescColor = ebayStore.storeDescColor!> <#else> - <#assign storeDescColor = storeFontTheme.storeFontTypeDescColor?if_exists> + <#assign storeDescColor = storeFontTheme.storeFontTypeDescColor!> </#if> <table width="450"> <tr> <td> <select id="storeDescFont" name="storeDescFont"> <#list storeFontTheme.storeFontTypeFontDescList as storeFontTypeFontDesc> - <option <#if storeFontTypeFontDesc.storeFontValue?if_exists.equals(ebayStore.storeDescFontFace?if_exists) >selected="selected"</#if> value="${storeFontTypeFontDesc.storeFontName?if_exists}">${storeFontTypeFontDesc.storeFontName?if_exists}</option> + <option <#if storeFontTypeFontDesc.storeFontValue.equals(ebayStore.storeDescFontFace!) >selected="selected"</#if> value="${storeFontTypeFontDesc.storeFontName!}">${storeFontTypeFontDesc.storeFontName!}</option> </#list> </select> </td> <td> <select id="storeDescFontSize" name="storeDescFontSize"> <#list storeFontTheme.storeDescSizeList as storeDescSize> - <option <#if storeDescSize.storeFontSizeValue?if_exists.equals(ebayStore.storeDescSizeCode?if_exists) >selected="selected"</#if> value="${storeDescSize.storeFontSizeName?if_exists}">${storeDescSize.storeFontSizeName?if_exists}</option> + <option <#if storeDescSize.storeFontSizeValue.equals(ebayStore.storeDescSizeCode) >selected="selected"</#if> value="${storeDescSize.storeFontSizeName!}">${storeDescSize.storeFontSizeName!}</option> </#list> </select> </td> <td> - ${uiLabelMap.CommonNbr}<input id="storeDescFontColor" type="text" size="10" name="storeDescFontColor" value="${storeDescColor?if_exists}"/> + ${uiLabelMap.CommonNbr}<input id="storeDescFontColor" type="text" size="10" name="storeDescFontColor" value="${storeDescColor!}"/> </td> </tr> </table> @@ -364,7 +364,7 @@ under the License. <td valign="middle"> <select id="storeCustomHeaderLayout" name="storeCustomHeaderLayout"> <#list ebayStore.storeCustomHeaderLayoutList as storeCustomHeaderLayout> - <option <#if storeCustomHeaderLayout.storeCustomHeaderLayoutValue?if_exists.equals(ebayStore.storeCustomHeaderLayout?if_exists) >selected="selected"</#if> value="${storeCustomHeaderLayout.storeCustomHeaderLayoutName?if_exists}">${storeCustomHeaderLayout.storeCustomHeaderLayoutValue?if_exists}</option> + <option <#if storeCustomHeaderLayout.storeCustomHeaderLayoutValue.equals(ebayStore.storeCustomHeaderLayout) >selected="selected"</#if> value="${storeCustomHeaderLayout.storeCustomHeaderLayoutName!}">${storeCustomHeaderLayout.storeCustomHeaderLayoutValue!}</option> </#list> </select> </td> @@ -373,7 +373,7 @@ under the License. <td class="label" align="right" valign="middle"></td> <td valign="middle"> <textarea rows="8" cols="40" name="storeCustomHeader"> - ${ebayStore.storeCustomHeader?if_exists}</textarea> + ${ebayStore.storeCustomHeader!}</textarea> </td> </tr> <tr> @@ -381,7 +381,7 @@ under the License. <td valign="middle"> <select id="storeHeaderStyle" name="storeHeaderStyle"> <#list ebayStore.storeHeaderStyleList as storeHeaderStyle> - <option <#if storeHeaderStyle.storeHeaderStyleValue?if_exists.equals(ebayStore.storeHeaderStyle?if_exists) >selected="selected"</#if> value="${storeHeaderStyle.storeHeaderStyleName?if_exists}">${storeHeaderStyle.storeHeaderStyleValue?if_exists}</option> + <option <#if storeHeaderStyle.storeHeaderStyleValue.equals(ebayStore.storeHeaderStyle) >selected="selected"</#if> value="${storeHeaderStyle.storeHeaderStyleName!}">${storeHeaderStyle.storeHeaderStyleValue!}</option> </#list> </select> </td> @@ -389,7 +389,7 @@ under the License. <#--tr> <td class="label" align="right" valign="middle">Home Page :</td> <td valign="middle"> - <input type="text" id="homePage" name="homePage" value="${ebayStore.storeHomePage?if_exists}"/> + <input type="text" id="homePage" name="homePage" value="${ebayStore.storeHomePage!}"/> </td> </tr--> <tr> @@ -397,7 +397,7 @@ under the License. <td valign="middle"> <select id="storeItemLayout" name="storeItemLayout"> <#list ebayStore.storeItemLayoutList as storeItemLayout> - <option <#if storeItemLayout.storeItemLayoutValue?if_exists.equals(ebayStore.storeItemLayoutSelected?if_exists) >selected="selected"</#if> value="${storeItemLayout.storeItemLayoutName?if_exists}">${storeItemLayout.storeItemLayoutValue?if_exists}</option> + <option <#if storeItemLayout.storeItemLayoutValue.equals(ebayStore.storeItemLayoutSelected) >selected="selected"</#if> value="${storeItemLayout.storeItemLayoutName!}">${storeItemLayout.storeItemLayoutValue!}</option> </#list> </select> </td> @@ -407,7 +407,7 @@ under the License. <td valign="middle"> <select id="storeItemSortOrder" name="storeItemSortOrder"> <#list ebayStore.storeItemSortOrderList as storeItemSortOrder> - <option <#if storeItemSortOrder.storeItemSortLayoutValue?if_exists.equals(ebayStore.storeItemSortOrderSelected?if_exists) >selected="selected"</#if> value="${storeItemSortOrder.storeItemSortLayoutName?if_exists}">${storeItemSortOrder.storeItemSortLayoutValue?if_exists}</option> + <option <#if storeItemSortOrder.storeItemSortLayoutValue.equals(ebayStore.storeItemSortOrderSelected) >selected="selected"</#if> value="${storeItemSortOrder.storeItemSortLayoutName!}">${storeItemSortOrder.storeItemSortLayoutValue!}</option> </#list> </select> </td> @@ -417,7 +417,7 @@ under the License. <td valign="middle"> <select id="storeCustomListingHeaderDisplay" name="storeCustomListingHeaderDisplay"> <#list ebayStore.storeCustomListingHeaderDisplayList as storeCustomListingHeaderDisplay> - <option <#if storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue?if_exists.equals(ebayStore.storeCustomListingHeaderDisplayValue?if_exists) >selected="selected"</#if> value="${storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue?if_exists}">${storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue?if_exists}</option> + <option <#if storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue.equals(ebayStore.storeCustomListingHeaderDisplayValue) >selected="selected"</#if> value="${storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue!}">${storeCustomListingHeaderDisplay.storeCustomHeaderLayoutValue!}</option> </#list> </select> </td> @@ -427,7 +427,7 @@ under the License. <td valign="middle"> <select id="storeMerchDisplay" name="storeMerchDisplay"> <#list ebayStore.storeMerchDisplayList as storeMerchDisplay> - <option <#if storeMerchDisplay.merchDisplayCodeValue?if_exists.equals(ebayStore.storeMerchDisplay?if_exists) >selected="selected"</#if> value="${storeMerchDisplay.merchDisplayCodeName?if_exists}">${storeMerchDisplay.merchDisplayCodeValue?if_exists}</option> + <option <#if storeMerchDisplay.merchDisplayCodeValue.equals(ebayStore.storeMerchDisplay) >selected="selected"</#if> value="${storeMerchDisplay.merchDisplayCodeName!}">${storeMerchDisplay.merchDisplayCodeValue!}</option> </#list> </select> </td> @@ -437,7 +437,7 @@ under the License. <td valign="middle"> <select id="storeMerchDisplay" name="storeSubscriptionDisplay"> <#list ebayStore.storeSubscriptionLevelList as storeSubscriptionLevel> - <option <#if storeSubscriptionLevel.storeSubscriptionLevelCodeValue?if_exists.equals(ebayStore.storeSubscriptionLevel?if_exists) >selected="selected"</#if> value="${storeSubscriptionLevel.storeSubscriptionLevelCodeName?if_exists}">${storeSubscriptionLevel.storeSubscriptionLevelCodeValue?if_exists}</option> + <option <#if storeSubscriptionLevel.storeSubscriptionLevelCodeValue.equals(ebayStore.storeSubscriptionLevel) >selected="selected"</#if> value="${storeSubscriptionLevel.storeSubscriptionLevelCodeName!}">${storeSubscriptionLevel.storeSubscriptionLevelCodeValue!}</option> </#list> </select> </td> @@ -457,10 +457,10 @@ under the License. </form> </#if> <script language="Javascript" type="text/javascript"> - <#if themeType?if_exists == "Basic"> + <#if themeType! == "Basic"> document.StoreSettingForm.storeAdvancedTheme.disabled = true; document.StoreSettingForm.storeAdvancedThemeColor.disabled = true; - <#elseif themeType?if_exists == "Advanced"> + <#elseif themeType! == "Advanced"> document.StoreSettingForm.storeBasicTheme.disabled = true; document.StoreSettingForm.storePrimaryColor.disabled = true; document.StoreSettingForm.storeSecondaryColor.disabled = true; Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl Sat Aug 16 08:40:28 2014 @@ -48,7 +48,7 @@ under the License. </div> <div class="screenlet-body"> <form id="productSearchform" method="post" action="<@ofbizUrl>productsearch</@ofbizUrl>" style="margin: 0;" name="productSearchform"> - <input type="hidden" name="productStoreId" value="${parameters.productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${parameters.productStoreId!}" /> <fieldset> <input type="hidden" name="VIEW_SIZE" value="25"/> <input type="hidden" name="PAGING" value="Y"/> @@ -66,7 +66,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> @@ -92,7 +92,7 @@ under the License. </#list> </select> <#else> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="productSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="productSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> </#if> </div> </td> @@ -103,7 +103,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> @@ -113,7 +113,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> @@ -123,7 +123,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> Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl (original) +++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl Sat Aug 16 08:40:28 2014 @@ -66,9 +66,9 @@ function uploadTrackingCode(orderId, pro <#assign statusItem = orderHeader.getRelatedOne("StatusItem", true)> <#assign orderType = orderHeader.getRelatedOne("OrderType", true)> <#if orderType.orderTypeId == "PURCHASE_ORDER"> - <#assign displayParty = orh.getSupplierAgent()?if_exists> + <#assign displayParty = orh.getSupplierAgent()!> <#else> - <#assign displayParty = orh.getPlacingParty()?if_exists> + <#assign displayParty = orh.getPlacingParty()!> </#if> <#assign partyId = displayParty.partyId?default("_NA_")> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> @@ -120,7 +120,7 @@ function uploadTrackingCode(orderId, pro <td colspan='4'><h3>${uiLabelMap.EbayNoOrderImported}.</h3></td> </tr> </#if> - <#if lookupErrorMessage?exists> + <#if lookupErrorMessage??> <tr> <td colspan='4'><h3>${lookupErrorMessage}</h3></td> </tr> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |