svn commit: r1618313 [6/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
Locked
svn commit: r1618313 [6/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl Sat Aug 16 08:40:28 2014 @@ -26,20 +26,20 @@ under the License. <input type="hidden" name="roleTypeId" value="CUSTOMER" /> <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL" /> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <div> <label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName?if_exists}" maxlength="30" /> + <input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName!}" maxlength="30" /> </div> <div> <label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName?if_exists}" maxlength="30" /> + <input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName!}" maxlength="30" /> </div> <div> <label for="emailAddress">${uiLabelMap.CommonEmail}* <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span> </label> - <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${parameters.emailAddress?if_exists}" maxlength="255" /> + <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${parameters.emailAddress!}" maxlength="255" /> </div> <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span> </fieldset> @@ -47,16 +47,16 @@ under the License. <legend>${uiLabelMap.EcommerceAccountInformation}</legend> <div> <label for="username">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="username" id="username" class="required" value="${parameters.username?if_exists}" maxlength="255" /> + <input type="text" name="username" id="username" class="required" value="${parameters.username!}" maxlength="255" /> </div> <div> <label for="password">${uiLabelMap.CommonPassword}* <span id="advice-required-password" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="password" name="password" id="password" class="required validate-password" value="${parameters.password?if_exists}" maxlength="16" /> + <input type="password" name="password" id="password" class="required validate-password" value="${parameters.password!}" maxlength="16" /> <span id="advice-validate-password-password" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_may_not_equal_username"]}</span> </div> <div> <label for="passwordVerify">${uiLabelMap.PartyRepeatPassword}* <span id="advice-required-passwordVerify" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="password" name="passwordVerify" id="passwordVerify" class="required validate-passwordVerify" value="${parameters.passwordVerify?if_exists}" maxlength="16" /> + <input type="password" name="passwordVerify" id="passwordVerify" class="required validate-passwordVerify" value="${parameters.passwordVerify!}" maxlength="16" /> <span id="advice-validate-passwordVerify-passwordVerify" class="errorMessage" style="display:none">${uiLabelMap["loginservices.password_did_not_match_verify_password"]}</span> </div> </fieldset> @@ -64,19 +64,19 @@ under the License. <legend>${uiLabelMap.OrderShippingInformation}</legend> <div> <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="shipToAddress1" id="shipToAddress1" class="required" value="${parameters.shipToAddress1?if_exists}" /> + <input type="text" name="shipToAddress1" id="shipToAddress1" class="required" value="${parameters.shipToAddress1!}" /> </div> <div> <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2?if_exists}" /> + <input type="text" name="shipToAddress2" id="shipToAddress2" value="${parameters.shipToAddress2!}" /> </div> <div> <label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity?if_exists}" /> + <input type="text" name="shipToCity" id="shipToCity" class="required" value="${parameters.shipToCity!}" /> </div> <div> <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode?if_exists}" maxlength="10" /> + <input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode!}" maxlength="10" /> </div> <div> <label for="shipToCountryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> @@ -107,10 +107,10 @@ under the License. <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"></span> <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"></span> <span id="shipToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span> - <input type="text" name="shipToCountryCode" id="shipToCountryCode" value="${parameters.shipToCountryCode?if_exists}" size="3" maxlength="3" /> - - <input type="text" name="shipToAreaCode" id="shipToAreaCode" value="${parameters.shipToAreaCode?if_exists}" size="3" maxlength="3" /> - - <input type="text" name="shipToContactNumber" id="shipToContactNumber" value="${contactNumber?default("${parameters.shipToContactNumber?if_exists}")}" size="6" maxlength="7" /> - - <input type="text" name="shipToExtension" id="shipToExtension" value="${extension?default("${parameters.shipToExtension?if_exists}")}" size="3" maxlength="3" /> + <input type="text" name="shipToCountryCode" id="shipToCountryCode" value="${parameters.shipToCountryCode!}" size="3" maxlength="3" /> + - <input type="text" name="shipToAreaCode" id="shipToAreaCode" value="${parameters.shipToAreaCode!}" size="3" maxlength="3" /> + - <input type="text" name="shipToContactNumber" id="shipToContactNumber" value="${contactNumber?default("${parameters.shipToContactNumber!}")}" size="6" maxlength="7" /> + - <input type="text" name="shipToExtension" id="shipToExtension" value="${extension?default("${parameters.shipToExtension!}")}" size="3" maxlength="3" /> </div> <div class="inline"> <input type="checkbox" class="checkbox" name="useShippingAddressForBilling" id="useShippingAddressForBilling" value="Y" <#if parameters.useShippingAddressForBilling?has_content && parameters.useShippingAddressForBilling?default("")=="Y">checked="checked"</#if> /> @@ -121,19 +121,19 @@ under the License. <legend>${uiLabelMap.PageTitleBillingInformation}</legend> <div> <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="billToAddress1" id="billToAddress1" class="required" value="${parameters.billToAddress1?if_exists}" /> + <input type="text" name="billToAddress1" id="billToAddress1" class="required" value="${parameters.billToAddress1!}" /> </div> <div> <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2?if_exists}" /> + <input type="text" name="billToAddress2" id="billToAddress2" value="${parameters.billToAddress2!}" /> </div> <div> <label for="billToCity">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity?if_exists}" /> + <input type="text" name="billToCity" id="billToCity" class="required" value="${parameters.billToCity!}" /> </div> <div> <label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> - <input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode?if_exists}" maxlength="10" /> + <input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode!}" maxlength="10" /> </div> <div> <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label> @@ -162,10 +162,10 @@ under the License. <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"></span> <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"></span> <span id="billToPhoneRequired" style="display: none;" class="errorMessage">(${uiLabelMap.CommonRequired})</span> - <input type="text" name="billToCountryCode" id="billToCountryCode" value="${parameters.billToCountryCode?if_exists}" size="3" maxlength="3"/> - - <input type="text" name="billToAreaCode" id="billToAreaCode" value="${parameters.billToAreaCode?if_exists}" size="3" maxlength="3"/> - - <input type="text" name="billToContactNumber" id="billToContactNumber" value="${contactNumber?default("${parameters.billToContactNumber?if_exists}")}" size="6" maxlength="7"/> - - <input type="text" name="billToExtension" id="billToExtension" value="${extension?default("${parameters.billToExtension?if_exists}")}" size="3" maxlength="3"/> + <input type="text" name="billToCountryCode" id="billToCountryCode" value="${parameters.billToCountryCode!}" size="3" maxlength="3"/> + - <input type="text" name="billToAreaCode" id="billToAreaCode" value="${parameters.billToAreaCode!}" size="3" maxlength="3"/> + - <input type="text" name="billToContactNumber" id="billToContactNumber" value="${contactNumber?default("${parameters.billToContactNumber!}")}" size="6" maxlength="7"/> + - <input type="text" name="billToExtension" id="billToExtension" value="${extension?default("${parameters.billToExtension!}")}" size="3" maxlength="3"/> </div> </fieldset> <div><a id="submitNewUserForm" href="javascript:void(0);" class="button">${uiLabelMap.CommonSubmit}</a></div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Sat Aug 16 08:40:28 2014 @@ -23,14 +23,14 @@ under the License. <div> <a class="button" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.EcommerceEditProfile}</a> <h3>${uiLabelMap.PartyContactInformation}</h3> - <label>${firstName?if_exists} ${lastName?if_exists}</label> - <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId?if_exists}" /> - <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress?if_exists}" /> - <#if emailAddress?exists> - <label>${emailAddress?if_exists}</label> - <a href="mailto:${emailAddress?if_exists}" class="linktext">(${uiLabelMap.PartySendEmail})</a> + <label>${firstName!} ${lastName!}</label> + <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId!}" /> + <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress!}" /> + <#if emailAddress??> + <label>${emailAddress!}</label> + <a href="mailto:${emailAddress!}" class="linktext">(${uiLabelMap.PartySendEmail})</a> </#if> - <div id="serverError_${emailContactMechId?if_exists}" class="errorMessage"></div> + <div id="serverError_${emailContactMechId!}" class="errorMessage"></div> </div> <#-- Manage Addresses --> <div> @@ -39,27 +39,27 @@ under the License. <div class="left center"> <h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3> <ul> - <#if shipToContactMechId?exists> - <li>${shipToAddress1?if_exists}</li> - <#if shipToAddress2?has_content><li>${shipToAddress2?if_exists}</li></#if> + <#if shipToContactMechId??> + <li>${shipToAddress1!}</li> + <#if shipToAddress2?has_content><li>${shipToAddress2!}</li></#if> <li> <ul> <li> <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_"> ${shipToStateProvinceGeoId} </#if> - ${shipToCity?if_exists}, - ${shipToPostalCode?if_exists} + ${shipToCity!}, + ${shipToPostalCode!} </li> - <li>${shipToCountryGeoId?if_exists}</li> + <li>${shipToCountryGeoId!}</li> </ul> </li> <#if shipToTelecomNumber?has_content> <li> - ${shipToTelecomNumber.countryCode?if_exists}- - ${shipToTelecomNumber.areaCode?if_exists}- - ${shipToTelecomNumber.contactNumber?if_exists} - <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if> + ${shipToTelecomNumber.countryCode!}- + ${shipToTelecomNumber.areaCode!}- + ${shipToTelecomNumber.contactNumber!} + <#if shipToExtension??>-${shipToExtension!}</#if> </li> </#if> <#else> @@ -70,27 +70,27 @@ under the License. <div class="right center"> <h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3> <ul> - <#if billToContactMechId?exists> - <li>${billToAddress1?if_exists}</li> - <#if billToAddress2?has_content><li>${billToAddress2?if_exists}</li></#if> + <#if billToContactMechId??> + <li>${billToAddress1!}</li> + <#if billToAddress2?has_content><li>${billToAddress2!}</li></#if> <li> <ul> <li> <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_"> ${billToStateProvinceGeoId} </#if> - ${billToCity?if_exists}, - ${billToPostalCode?if_exists} + ${billToCity!}, + ${billToPostalCode!} </li> - <li>${billToCountryGeoId?if_exists}</li> + <li>${billToCountryGeoId!}</li> </ul> </li> <#if billToTelecomNumber?has_content> <li> - ${billToTelecomNumber.countryCode?if_exists}- - ${billToTelecomNumber.areaCode?if_exists}- - ${billToTelecomNumber.contactNumber?if_exists} - <#if billToExtension?exists>-${billToExtension?if_exists}</#if> + ${billToTelecomNumber.countryCode!}- + ${billToTelecomNumber.areaCode!}- + ${billToTelecomNumber.contactNumber!} + <#if billToExtension??>-${billToExtension!}</#if> </li> </#if> <#else> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sat Aug 16 08:40:28 2014 @@ -17,18 +17,18 @@ specific language governing permissions under the License. --> -<#if party?exists> +<#if party??> <#-- Main Heading --> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> <td> <h2>${uiLabelMap.PartyTheProfileOf} - <#if person?exists> - ${person.personalTitle?if_exists} - ${person.firstName?if_exists} - ${person.middleName?if_exists} - ${person.lastName?if_exists} - ${person.suffix?if_exists} + <#if person??> + ${person.personalTitle!} + ${person.firstName!} + ${person.middleName!} + ${person.lastName!} + ${person.suffix!} <#else> "${uiLabelMap.PartyNewUser}" </#if> @@ -40,7 +40,7 @@ under the License. <#else> <a href="<@ofbizUrl>viewprofile?SHOW_OLD=true</@ofbizUrl>" class="button">${uiLabelMap.PartyShowOld}</a> </#if> - <#if (productStore.enableDigProdUpload)?if_exists == "Y"> + <#if (productStore.enableDigProdUpload)! == "Y"> <a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="button">${uiLabelMap.EcommerceDigitalProductUpload}</a> </#if> </td> @@ -50,34 +50,34 @@ under the License. <div class="screenlet"> <div class="boxlink"> <a href="<@ofbizUrl>editperson</@ofbizUrl>" class="submenutextright"> - <#if person?exists>${uiLabelMap.CommonUpdate}<#else>${uiLabelMap.CommonCreate}</#if></a> + <#if person??>${uiLabelMap.CommonUpdate}<#else>${uiLabelMap.CommonCreate}</#if></a> </div> <h3>${uiLabelMap.PartyPersonalInformation}</h3> <div class="screenlet-body"> - <#if person?exists> + <#if person??> <div> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td align="right">${uiLabelMap.PartyName}</td> <td> - ${person.personalTitle?if_exists} - ${person.firstName?if_exists} - ${person.middleName?if_exists} - ${person.lastName?if_exists} - ${person.suffix?if_exists} + ${person.personalTitle!} + ${person.firstName!} + ${person.middleName!} + ${person.lastName!} + ${person.suffix!} </td> </tr> <#if person.nickname?has_content><tr><td align="right">${uiLabelMap.PartyNickName}</td><td>${person.nickname}</td></tr></#if> <#if person.gender?has_content><tr><td align="right">${uiLabelMap.PartyGender}</td><td>${person.gender}</td></tr></#if> - <#if person.birthDate?exists><tr><td align="right">${uiLabelMap.PartyBirthDate}</td><td>${person.birthDate.toString()}</td></tr></#if> - <#if person.height?exists><tr><td align="right">${uiLabelMap.PartyHeight}</td><td>${person.height}</td></tr></#if> - <#if person.weight?exists><tr><td align="right">${uiLabelMap.PartyWeight}</td><td>${person.weight}</td></tr></#if> + <#if person.birthDate??><tr><td align="right">${uiLabelMap.PartyBirthDate}</td><td>${person.birthDate.toString()}</td></tr></#if> + <#if person.height??><tr><td align="right">${uiLabelMap.PartyHeight}</td><td>${person.height}</td></tr></#if> + <#if person.weight??><tr><td align="right">${uiLabelMap.PartyWeight}</td><td>${person.weight}</td></tr></#if> <#if person.mothersMaidenName?has_content><tr><td align="right">${uiLabelMap.PartyMaidenName}</td><td>${person.mothersMaidenName}</td></tr></#if> <#if person.maritalStatus?has_content><tr><td align="right">${uiLabelMap.PartyMaritalStatus}</td><td>${person.maritalStatus}</td></tr></#if> <#if person.socialSecurityNumber?has_content><tr><td align="right">${uiLabelMap.PartySocialSecurityNumber}</td><td>${person.socialSecurityNumber}</td></tr></#if> <#if person.passportNumber?has_content><tr><td align="right">${uiLabelMap.PartyPassportNumber}</td><td>${person.passportNumber}</td></tr></#if> - <#if person.passportExpireDate?exists><tr><td align="right">${uiLabelMap.PartyPassportExpireDate}</td><td>${person.passportExpireDate.toString()}</td></tr></#if> - <#if person.totalYearsWorkExperience?exists><tr><td align="right">${uiLabelMap.PartyYearsWork}</td><td>${person.totalYearsWorkExperience}</td></tr></#if> + <#if person.passportExpireDate??><tr><td align="right">${uiLabelMap.PartyPassportExpireDate}</td><td>${person.passportExpireDate.toString()}</td></tr></#if> + <#if person.totalYearsWorkExperience??><tr><td align="right">${uiLabelMap.PartyYearsWork}</td><td>${person.totalYearsWorkExperience}</td></tr></#if> <#if person.comments?has_content><tr><td align="right">${uiLabelMap.CommonComments}</td><td>${person.comments}</td></tr></#if> </table> </div> @@ -88,7 +88,7 @@ under the License. </div> <#-- ============================================================= --> -<#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists> +<#if monthsToInclude?? && totalSubRemainingAmount?? && totalOrders??> <div class="screenlet"> <h3>${uiLabelMap.EcommerceLoyaltyPoints}</h3> <div class="screenlet-body"> @@ -115,9 +115,9 @@ under the License. <th></th> </tr> <#list partyContactMechValueMaps as partyContactMechValueMap> - <#assign contactMech = partyContactMechValueMap.contactMech?if_exists /> - <#assign contactMechType = partyContactMechValueMap.contactMechType?if_exists /> - <#assign partyContactMech = partyContactMechValueMap.partyContactMech?if_exists /> + <#assign contactMech = partyContactMechValueMap.contactMech! /> + <#assign contactMechType = partyContactMechValueMap.contactMechType! /> + <#assign partyContactMech = partyContactMechValueMap.partyContactMech! /> <tr><td colspan="7"></td></tr> <tr> <td align="right" valign="top"> @@ -125,10 +125,10 @@ under the License. </td> <td> </td> <td valign="top"> - <#list partyContactMechValueMap.partyContactMechPurposes?if_exists as partyContactMechPurpose> + <#list partyContactMechValueMap.partyContactMechPurposes! as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) /> <div> - <#if contactMechPurposeType?exists> + <#if contactMechPurposeType??> ${contactMechPurposeType.get("description",locale)} <#if contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION" && (profiledefs.defaultShipAddr)?default("") == contactMech.contactMechId> <span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span> @@ -143,21 +143,21 @@ under the License. <#else> ${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}" </#if> - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate.toString()})</#if> + <#if partyContactMechPurpose.thruDate??>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate.toString()})</#if> </div> </#list> - <#if contactMech.contactMechTypeId?if_exists = "POSTAL_ADDRESS"> - <#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists /> + <#if contactMech.contactMechTypeId! = "POSTAL_ADDRESS"> + <#assign postalAddress = partyContactMechValueMap.postalAddress! /> <div> - <#if postalAddress?exists> + <#if postalAddress??> <#if postalAddress.toName?has_content>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if> ${postalAddress.address1}<br /> <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> - ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists} + ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!} <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if> - <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId?if_exists = "USA")> - <#assign addr1 = postalAddress.address1?if_exists /> + <#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId! = "USA")> + <#assign addr1 = postalAddress.address1! /> <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" ")) /> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1) /> @@ -168,12 +168,12 @@ under the License. ${uiLabelMap.PartyPostalInformationNotFound}. </#if> </div> - <#elseif contactMech.contactMechTypeId?if_exists = "TELECOM_NUMBER"> - <#assign telecomNumber = partyContactMechValueMap.telecomNumber?if_exists> + <#elseif contactMech.contactMechTypeId! = "TELECOM_NUMBER"> + <#assign telecomNumber = partyContactMechValueMap.telecomNumber!> <div> - <#if telecomNumber?exists> - ${telecomNumber.countryCode?if_exists} - <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists} + <#if telecomNumber??> + ${telecomNumber.countryCode!} + <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber!} <#if partyContactMech.extension?has_content>ext ${partyContactMech.extension}</#if> <#if (!telecomNumber.countryCode?has_content || telecomNumber.countryCode = "011")> <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="linktext">${uiLabelMap.CommonLookupAnywho}</a> @@ -183,23 +183,23 @@ under the License. ${uiLabelMap.PartyPhoneNumberInfoNotFound}. </#if> </div> - <#elseif contactMech.contactMechTypeId?if_exists = "EMAIL_ADDRESS"> + <#elseif contactMech.contactMechTypeId! = "EMAIL_ADDRESS"> ${contactMech.infoString} <a href="mailto:${contactMech.infoString}" class="linktext">(${uiLabelMap.PartySendEmail})</a> - <#elseif contactMech.contactMechTypeId?if_exists = "WEB_ADDRESS"> + <#elseif contactMech.contactMechTypeId! = "WEB_ADDRESS"> <div> ${contactMech.infoString} - <#assign openAddress = contactMech.infoString?if_exists /> + <#assign openAddress = contactMech.infoString! /> <#if !openAddress.startsWith("http") && !openAddress.startsWith("HTTP")><#assign openAddress = "http://" + openAddress /></#if> <a target="_blank" href="${openAddress}" class="linktext">(${uiLabelMap.CommonOpenNewWindow})</a> </div> <#else> - ${contactMech.infoString?if_exists} + ${contactMech.infoString!} </#if> <div>(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div> - <#if partyContactMech.thruDate?exists><div>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if> + <#if partyContactMech.thruDate??><div>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if> </td> - <td align="center" valign="top"><div>(${partyContactMech.allowSolicitation?if_exists})</div></td> + <td align="center" valign="top"><div>(${partyContactMech.allowSolicitation!})</div></td> <td> </td> <td align="right" valign="top"> <a href="<@ofbizUrl>editcontactmech?contactMechId=${contactMech.contactMechId}</@ofbizUrl>" class="button">${uiLabelMap.CommonUpdate}</a> @@ -235,12 +235,12 @@ under the License. <#if paymentMethodValueMaps?has_content> <table width="100%" cellpadding="2" cellspacing="0" border="0"> <#list paymentMethodValueMaps as paymentMethodValueMap> - <#assign paymentMethod = paymentMethodValueMap.paymentMethod?if_exists /> - <#assign creditCard = paymentMethodValueMap.creditCard?if_exists /> - <#assign giftCard = paymentMethodValueMap.giftCard?if_exists /> - <#assign eftAccount = paymentMethodValueMap.eftAccount?if_exists /> + <#assign paymentMethod = paymentMethodValueMap.paymentMethod! /> + <#assign creditCard = paymentMethodValueMap.creditCard! /> + <#assign giftCard = paymentMethodValueMap.giftCard! /> + <#assign eftAccount = paymentMethodValueMap.eftAccount! /> <tr> - <#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD"> + <#if paymentMethod.paymentMethodTypeId! == "CREDIT_CARD"> <td valign="top"> <div> ${uiLabelMap.AccountingCreditCard}: @@ -253,7 +253,7 @@ under the License. ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate.toString()})</#if> - <#if paymentMethod.thruDate?exists>(${uiLabelMap.CommonDelete}: ${paymentMethod.thruDate.toString()})</#if> + <#if paymentMethod.thruDate??>(${uiLabelMap.CommonDelete}: ${paymentMethod.thruDate.toString()})</#if> </div> </td> <td> </td> @@ -261,7 +261,7 @@ under the License. <a href="<@ofbizUrl>editcreditcard?paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>" class="button"> ${uiLabelMap.CommonUpdate}</a> </td> - <#elseif paymentMethod.paymentMethodTypeId?if_exists == "GIFT_CARD"> + <#elseif paymentMethod.paymentMethodTypeId! == "GIFT_CARD"> <#if giftCard?has_content && giftCard.cardNumber?has_content> <#assign giftCardNumber = "" /> <#assign pcardNumber = giftCard.cardNumber /> @@ -283,7 +283,7 @@ under the License. ${uiLabelMap.AccountingGiftCard}: ${giftCardNumber} <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate.toString()})</#if> - <#if paymentMethod.thruDate?exists>(${uiLabelMap.CommonDelete}: ${paymentMethod.thruDate.toString()})</#if> + <#if paymentMethod.thruDate??>(${uiLabelMap.CommonDelete}: ${paymentMethod.thruDate.toString()})</#if> </div> </td> <td > </td> @@ -291,13 +291,13 @@ under the License. <a href="<@ofbizUrl>editgiftcard?paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>" class="button"> ${uiLabelMap.CommonUpdate}</a> </td> - <#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT"> + <#elseif paymentMethod.paymentMethodTypeId! == "EFT_ACCOUNT"> <td valign="top"> <div> - ${uiLabelMap.AccountingEFTAccount}: ${eftAccount.nameOnAccount?if_exists} - <#if eftAccount.bankName?has_content>${uiLabelMap.AccountingBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.AccountingAccount} #: ${eftAccount.accountNumber}</#if> + ${uiLabelMap.AccountingEFTAccount}: ${eftAccount.nameOnAccount!} - <#if eftAccount.bankName?has_content>${uiLabelMap.AccountingBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.AccountingAccount} #: ${eftAccount.accountNumber}</#if> <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate.toString()})</#if> - <#if paymentMethod.thruDate?exists>(${uiLabelMap.CommonDelete}: ${paymentMethod.thruDate.toString()})</#if> + <#if paymentMethod.thruDate??>(${uiLabelMap.CommonDelete}: ${paymentMethod.thruDate.toString()})</#if> </div> </td> <td> </td> @@ -382,7 +382,7 @@ under the License. <tr> <td> </td> <td> - <div><span style="white-space:;"><#if shipMeth.partyId != "_NA_">${shipMeth.partyId?if_exists} </#if>${shipMeth.get("description",locale)?if_exists}</span></div> + <div><span style="white-space:;"><#if shipMeth.partyId != "_NA_">${shipMeth.partyId!} </#if>${shipMeth.get("description",locale)!}</span></div> </td> <td><input type="radio" name="defaultShipMeth" value="${shippingMethod}" <#if profiledefs.defaultShipMeth?default("") == shippingMethod>checked="checked"</#if> /></td> </tr> @@ -405,22 +405,22 @@ under the License. <#list partyContent as contentRole> <#assign content = contentRole.getRelatedOne("Content", false) /> <#assign contentType = content.getRelatedOne("ContentType", true) /> - <#assign mimeType = content.getRelatedOne("MimeType", true)?if_exists /> + <#assign mimeType = content.getRelatedOne("MimeType", true)! /> <#assign status = content.getRelatedOne("StatusItem", true) /> <tr> - <td><a href="<@ofbizUrl>img/${content.contentName?if_exists}?imgId=${content.dataResourceId?if_exists}</@ofbizUrl>" class="button">${content.contentId}</a></td> - <td>${content.contentName?if_exists}</td> - <td>${(contentType.get("description",locale))?if_exists}</td> - <td>${mimeType?if_exists.description?if_exists}</td> - <td>${(status.get("description",locale))?if_exists}</td> - <td>${contentRole.fromDate?if_exists}</td> + <td><a href="<@ofbizUrl>img/${content.contentName!}?imgId=${content.dataResourceId!}</@ofbizUrl>" class="button">${content.contentId}</a></td> + <td>${content.contentName!}</td> + <td>${(contentType.get("description",locale))!}</td> + <td>${(mimeType.description)!}</td> + <td>${(status.get("description",locale))!}</td> + <td>${contentRole.fromDate!}</td> <td align="right"> <form name="removeContent_${contentRole.contentId}" method="post" action="removePartyAsset"> <input name="partyId" type="hidden" value="${userLogin.partyId}"/> <input name="contentId" type="hidden" value="${contentRole.contentId}"/> <input name="roleTypeId" type="hidden" value="${contentRole.roleTypeId}"/> </form> - <a href="<@ofbizUrl>img/${content.contentName?if_exists}?imgId=${content.dataResourceId?if_exists}</@ofbizUrl>" class="button">${uiLabelMap.CommonView}</a> + <a href="<@ofbizUrl>img/${content.contentName!}?imgId=${content.dataResourceId!}</@ofbizUrl>" class="button">${uiLabelMap.CommonView}</a> <a href="javascript:document.removeContent_${contentRole.contentId}.submit();" class="button">${uiLabelMap.CommonRemove}</a> </td> </tr> @@ -475,25 +475,25 @@ under the License. <th> </th> </tr> <#list contactListPartyList as contactListParty> - <#assign contactList = contactListParty.getRelatedOne("ContactList", false)?if_exists /> - <#assign statusItem = contactListParty.getRelatedOne("StatusItem", true)?if_exists /> - <#assign emailAddress = contactListParty.getRelatedOne("PreferredContactMech", true)?if_exists /> + <#assign contactList = contactListParty.getRelatedOne("ContactList", false)! /> + <#assign statusItem = contactListParty.getRelatedOne("StatusItem", true)! /> + <#assign emailAddress = contactListParty.getRelatedOne("PreferredContactMech", true)! /> <#-- <#assign contactListType = contactList.getRelatedOne("ContactListType", true)/> --> <tr><td colspan="7"></td></tr> <tr> - <td>${contactList.contactListName?if_exists}<#if contactList.description?has_content> - ${contactList.description}</#if></td> - <#-- <td><div>${contactListType.get("description",locale)?if_exists}</div></td> --> - <td>${contactListParty.fromDate?if_exists}</td> - <td>${contactListParty.thruDate?if_exists}</td> - <td>${(statusItem.get("description",locale))?if_exists}</td> - <td>${emailAddress.infoString?if_exists}</td> + <td>${contactList.contactListName!}<#if contactList.description?has_content> - ${contactList.description}</#if></td> + <#-- <td><div>${contactListType.get("description",locale)!}</div></td> --> + <td>${contactListParty.fromDate!}</td> + <td>${contactListParty.thruDate!}</td> + <td>${(statusItem.get("description",locale))!}</td> + <td>${emailAddress.infoString!}</td> <td> </td> <td> - <#if (contactListParty.statusId?if_exists == "CLPT_ACCEPTED")> + <#if (contactListParty.statusId! == "CLPT_ACCEPTED")> <form method="post" action="<@ofbizUrl>updateContactListParty</@ofbizUrl>" name="clistRejectForm${contactListParty_index}"> <div> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <input type="hidden" name="partyId" value="${party.partyId}"/> <input type="hidden" name="contactListId" value="${contactListParty.contactListId}"/> <input type="hidden" name="preferredContactMechId" value="${contactListParty.preferredContactMechId}"/> @@ -502,7 +502,7 @@ under the License. <input type="submit" value="${uiLabelMap.EcommerceUnsubscribe}" class="smallSubmit"/> </div> </form> - <#elseif (contactListParty.statusId?if_exists == "CLPT_PENDING")> + <#elseif (contactListParty.statusId! == "CLPT_PENDING")> <form method="post" action="<@ofbizUrl>updateContactListParty</@ofbizUrl>" name="clistAcceptForm${contactListParty_index}"> <div> <input type="hidden" name="partyId" value="${party.partyId}"/> @@ -514,7 +514,7 @@ under the License. <input type="submit" value="${uiLabelMap.EcommerceVerifySubscription}" class="smallSubmit"/> </div> </form> - <#elseif (contactListParty.statusId?if_exists == "CLPT_REJECTED")> + <#elseif (contactListParty.statusId! == "CLPT_REJECTED")> <form method="post" action="<@ofbizUrl>updateContactListParty</@ofbizUrl>" name="clistPendForm${contactListParty_index}"> <div> <input type="hidden" name="partyId" value="${party.partyId}"/> @@ -539,14 +539,14 @@ under the License. <select name="contactListId" class="selectBox"> <#list publicContactLists as publicContactList> <#-- <#assign publicContactListType = publicContactList.getRelatedOne("ContactListType", true)> --> - <#assign publicContactMechType = publicContactList.getRelatedOne("ContactMechType", true)?if_exists /> - <option value="${publicContactList.contactListId}">${publicContactList.contactListName?if_exists} <#-- ${publicContactListType.get("description",locale)} --> <#if publicContactMechType?has_content>[${publicContactMechType.get("description",locale)}]</#if></option> + <#assign publicContactMechType = publicContactList.getRelatedOne("ContactMechType", true)! /> + <option value="${publicContactList.contactListId}">${publicContactList.contactListName!} <#-- ${publicContactListType.get("description",locale)} --> <#if publicContactMechType?has_content>[${publicContactMechType.get("description",locale)}]</#if></option> </#list> </select> <select name="preferredContactMechId" class="selectBox"> <#-- <option></option> --> <#list partyAndContactMechList as partyAndContactMech> - <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option> + <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode!}-${partyAndContactMech.tnAreaCode!}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2!}, ${partyAndContactMech.paCity!}, ${partyAndContactMech.paStateProvinceGeoId!}, ${partyAndContactMech.paPostalCode!}, ${partyAndContactMech.paPostalCodeExt!} ${partyAndContactMech.paCountryGeoId!}</#if></option> </#list> </select> <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/> @@ -567,7 +567,7 @@ under the License. <#assign survey = surveyAppl.getRelatedOne("Survey", false) /> <tr> <td> </td> - <td valign="top"><div>${survey.surveyName?if_exists} - ${survey.description?if_exists}</div></td> + <td valign="top"><div>${survey.surveyName!} - ${survey.description!}</div></td> <td> </td> <td valign="top"> <#assign responses = Static["org.ofbiz.product.store.ProductStoreWorker"].checkSurveyResponse(request, survey.surveyId)?default(0)> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl Sat Aug 16 08:40:28 2014 @@ -17,10 +17,10 @@ specific language governing permissions under the License. --> -<#if requestAttributes._ERROR_MESSAGE_?exists> +<#if requestAttributes._ERROR_MESSAGE_??> <br /><div class='errorMessage'>${requestAttributes._ERROR_MESSAGE_}</div><br /> <#else> - <#if trailList?exists> + <#if trailList??> <#assign indent = ""> <#assign csv = ""> <#assign counter = 1> @@ -29,20 +29,20 @@ under the License. <#if 0 < csv?length > <#assign csv = csv + ","/> </#if> - <#assign csv = csv + pair[0]?if_exists/> + <#assign csv = csv + pair[0]!/> <#if counter < len> ${indent} - ${pair[0]?if_exists} - ${pair[1]?if_exists} - <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${pair[0]?if_exists}&nodeTrailCsv=${csv?if_exists}"></@ofbizUrl>${uiLabelMap.CommonView}</a> <br /> + ${pair[0]!} - ${pair[1]!} + <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${pair[0]!}&nodeTrailCsv=${csv!}"></@ofbizUrl>${uiLabelMap.CommonView}</a> <br /> <#assign indent = indent + " "> <#else> - <u>${uiLabelMap.EcommerceAddResponseFor}${pair[0]?if_exists} - ${pair[1]?if_exists}:</u><br /> + <u>${uiLabelMap.EcommerceAddResponseFor}${pair[0]!} - ${pair[1]!}:</u><br /> </#if> <#assign counter = counter + 1> </#list> - <#if dataResourceId?exists> + <#if dataResourceId??> <br /> <img src="<@ofbizUrl>img?imgId=${dataResourceId}</@ofbizUrl>" alt=""/> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl Sat Aug 16 08:40:28 2014 @@ -23,11 +23,11 @@ under the License. </#if> <#assign viewIdx = "" /> <#if requestParameters.viewIndex?has_content> -<#assign viewIdx = requestParameters.viewIndex?if_exists /> +<#assign viewIdx = requestParameters.viewIndex! /> </#if> <#assign viewSz = "" /> <#if requestParameters.viewSize?has_content> -<#assign viewSz = requestParameters.viewSize?if_exists /> +<#assign viewSz = requestParameters.viewSize! /> </#if> <#assign sz=0/> @@ -36,50 +36,50 @@ under the License. pickWhen="purposes.contains(\"ARTICLE\") && \"CTNT_PUBLISHED\".equals(content.get(\"statusId\"))" returnAfterPickWhen="purposes.contains(\"ARTICLE\")" followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"never follow\")"> - <#assign thisNodeTrailCsv=nodeTrailCsv?if_exists/> - <#assign thisSubContentId=subContentId?if_exists/> + <#assign thisNodeTrailCsv=nodeTrailCsv!/> + <#assign thisSubContentId=subContentId!/> <#assign thisNode=globalNodeTrail?last/> <#if thisNode?has_content> - <#assign thisOwnerContentId=thisNode.value.ownerContentId?if_exists/> + <#assign thisOwnerContentId=thisNode.value.ownerContentId!/> </#if> <#assign userLoginId=""/> <#if content?has_content && content.createdByUserLogin?has_content> <#assign userLoginId=content.createdByUserLogin/> </#if> - <#assign authorName=Static["org.ofbiz.content.ContentManagementWorker"].getUserName(request,userLoginId?if_exists)/> + <#assign authorName=Static["org.ofbiz.content.ContentManagementWorker"].getUserName(request,userLoginId!)/> <tr> <td width="40px"> </td> <td class="blogtext" > <div> - by:<#if authorName?has_content>${authorName?if_exists} + by:<#if authorName?has_content>${authorName!} <#else> - <#if content?has_content>${content.createdByUserLogin?if_exists}</#if> + <#if content?has_content>${content.createdByUserLogin!}</#if> </#if> - <#if thisNode?exists && thisNode.fromDate?exists> + <#if thisNode?? && thisNode.fromDate??> <#assign nowTime = thisNode.fromDate?string /> <#assign shortTime = ""/> <#if nowTime?has_content> <#assign lastColon=nowTime?last_index_of(":") - 1/> <#assign shortTime=nowTime[0..lastColon]/> </#if> - ${shortTime?if_exists} + ${shortTime!} </#if> </div> </td> <td > - <#if content?has_content>${content.contentName?if_exists}</#if> + <#if content?has_content>${content.contentName!}</#if> -- - <#if content?has_content>${content.description?if_exists}</#if> + <#if content?has_content>${content.description!}</#if> </td> <td width="40px" valign="bottom"> -<a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${thisSubContentId}&nodeTrailCsv=${thisNodeTrailCsv?if_exists}&forumId=${contentIdx?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> +<a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${thisSubContentId}&nodeTrailCsv=${thisNodeTrailCsv!}&forumId=${contentIdx!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> </td> <@checkPermission mode="equals" entityOperation="_UPDATE" subContentId=content.contentId targetOperation="CONTENT_UPDATE" contentPurposeList="ARTICLE"> <td width="40px" valign="bottom"> -<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>editforumarticle?contentIdTo=${content.contentId}&nodeTrailCsv=${contentIdx?if_exists},${content.contentId}</@ofbizUrl>" >${uiLabelMap.CommonEdit}</a> +<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>editforumarticle?contentIdTo=${content.contentId}&nodeTrailCsv=${contentIdx!},${content.contentId}</@ofbizUrl>" >${uiLabelMap.CommonEdit}</a> </td> </@checkPermission> </tr> @@ -96,13 +96,13 @@ under the License. </table> <table border="0" class="summary"> <#assign targOp="HAS_USER_ROLE"/> -<#assign pageTargOp=targetOperation?if_exists/> +<#assign pageTargOp=targetOperation!/> <#if pageTargOp?has_content> <#assign targOp=pageTargOp/> </#if> <@checkPermission mode="equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> <tr><td align="right"> -<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>createforumarticle?forumId=${contentIdx?if_exists}&nodeTrailCsv=${contentIdx?if_exists}</@ofbizUrl>" >${uiLabelMap.ProductNewArticle}</a> +<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>createforumarticle?forumId=${contentIdx!}&nodeTrailCsv=${contentIdx!}</@ofbizUrl>" >${uiLabelMap.ProductNewArticle}</a> </td></tr> </@checkPermission> <@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> @@ -113,7 +113,7 @@ ${uiLabelMap.EcommerceLoggedToPost} </table> <#-- <@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentIdx statusId="CTNT_PUBLISHED" targetOperation="HAS_USER_ROLE" contentPurposeList="ARTICLE"> - ${permissionErrorMsg?if_exists} + ${permissionErrorMsg!} </@checkPermission> --> @@ -136,12 +136,12 @@ ${uiLabelMap.EcommerceLoggedToPost} <td > ${indent} <#if content.contentTypeId == "WEB_SITE_PUB_PT" > - <a class="tabButton" href="<@ofbizUrl>showforum?forumId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName?if_exists} + <a class="tabButton" href="<@ofbizUrl>showforum?forumId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName!} <#else> - <a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}to</a> ${content.contentName?if_exists} + <a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}to</a> ${content.contentName!} </#if> <#local indent = indent + " "> - [${content.contentId?if_exists}]</td> + [${content.contentId!}]</td> </#if> </tr> </#if> @@ -182,10 +182,10 @@ ${uiLabelMap.EcommerceLoggedToPost} <span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span> </#if> <#if 0 < listSz> - <span class="submenutextinfo">${lowIdxShow} - ${highIdx?if_exists} ${uiLabelMap.CommonOf} ${listSz?if_exists}</span> + <span class="submenutextinfo">${lowIdxShow} - ${highIdx!} ${uiLabelMap.CommonOf} ${listSz!}</span> </#if> - <#if highIdx?if_exists?number < listSz?if_exists?number> - <a href="${requestURL}?${queryString?if_exists}&viewSz=${viewSz?if_exists}&viewIdx=${viewIdx?if_exists?number+1}" class="submenutextright">${uiLabelMap.CommonNext}</a> + <#if highIdx!?number < listSz!?number> + <a href="${requestURL}?${queryString!}&viewSz=${viewSz!}&viewIdx=${viewIdx!?number+1}" class="submenutextright">${uiLabelMap.CommonNext}</a> <#else> <span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Sat Aug 16 08:40:28 2014 @@ -23,7 +23,7 @@ under the License. <table width='100%' cellpadding='0' cellspacing='0' border='0'> <tr> <td> - <h1>${contentIdTo?if_exists} + <h1>${contentIdTo!} </h1> </td> <td align="right"> @@ -36,15 +36,15 @@ under the License. <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editforuminfo?contentId=${contentId?if_exists}&nodeTrailCsv=${nodeTrailCsv?if_exists}&contentIdTo=${contentIdTo?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editforuminfo?contentId=${contentId!}&nodeTrailCsv=${nodeTrailCsv!}&contentIdTo=${contentIdTo!}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3>${uiLabelMap.EcommerceContentInformation}</h3> <div class="screenlet-body"> <table> - <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.ProductContentId}</b></div></td><td> </td><td><div class='tabletext'>${contentId?if_exists}</div></td></tr> - <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.EcommerceContentName}</b></div></td><td> </td><td><div class='tabletext'>${contentName?if_exists}</div></td></tr> - <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.CommonDescription}</b></div></td><td> </td><td><div class='tabletext'>${description?if_exists}<div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.ProductContentId}</b></div></td><td> </td><td><div class='tabletext'>${contentId!}</div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.EcommerceContentName}</b></div></td><td> </td><td><div class='tabletext'>${contentName!}</div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.CommonDescription}</b></div></td><td> </td><td><div class='tabletext'>${description!}<div></td></tr> </table> </div> </div> @@ -52,14 +52,14 @@ under the License. <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editaddimage?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=IMAGE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editaddimage?contentIdTo=${contentId!}&dataResourceId=${txtDataResourceId!}&mapKey=IMAGE&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3>${uiLabelMap.EcommerceImageInformation}</h3> <div class="screenlet-body"> <table> <tr><td align="right" nowrap="nowrap"><div class='tabletext'>${uiLabelMap.EcommerceImage}</div></td><td> </td><td><div class='tabletext'> - <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" class='cssImgStandard' /> + <img src="<@ofbizUrl>img?imgId=${imgDataResourceId!}</@ofbizUrl>" alt="" class='cssImgStandard' /> <div></td></tr> </table> </div> @@ -67,13 +67,13 @@ under the License. <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=SUMMARY&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId!}&dataResourceId=${txtDataResourceId!}&mapKey=SUMMARY&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3>${uiLabelMap.EcommerceSummaryInformation}</h3> <div class="screenlet-body"> <table> <tr><td><div class='tabletext'>${uiLabelMap.ContentSummary}</div></td><td> </td><td><div class='tabletext'> -${summaryData?if_exists} +${summaryData!} <div></td></tr> </table> </div> @@ -81,13 +81,13 @@ ${summaryData?if_exists} <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=ARTICLE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId!}&dataResourceId=${txtDataResourceId!}&mapKey=ARTICLE&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3> ${uiLabelMap.EcommerceArticleInformation}</h3> <div class="screenlet-body"> <table width="100%" border="0" cellpadding="0" cellspacing='0'> <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Article</b></div></td><td> </td><td><div class='tabletext'> -${textData?if_exists} +${textData!} <div></td></tr> </table> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Sat Aug 16 08:40:28 2014 @@ -19,35 +19,35 @@ under the License. <#-- Thread content id equals contentId if contentAssocTypeId equals PUBLISH_LINK, else threadContentId = ownerContentId --> <#assign threadContentId = forumMessage.contentId/> <#if forumMessage.caContentAssocTypeId == "RESPONSE"> - <#assign threadContentId = forumMessage.ownerContentId?if_exists/> + <#assign threadContentId = forumMessage.ownerContentId!/> </#if> - <#if rsp?exists> + <#if rsp??> <#assign contentId = rsp.contentId> <#else> <#assign contentId = forumMessage.contentId> </#if> <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${forumMessage.contentName?if_exists} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin?if_exists} ${uiLabelMap.CommonAt}: ${forumMessage.createdDate?if_exists.toString().substring(0,16)} - <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId?if_exists}" class="buttontext">${uiLabelMap.CommonView}</a> + ${uiLabelMap.CommonTitle}: ${forumMessage.contentName!} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin!} ${uiLabelMap.CommonAt}: ${(forumMessage.createdDate.toString().substring(0,16))!} + <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId!}" class="buttontext">${uiLabelMap.CommonView}</a> </div> <div class="tableheadtext"> - ${forumMessage.description?if_exists} + ${forumMessage.description!} </div> <#-- <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId, "userLogin", userLogin))/> - <#if (result.resultData)?exists> + <#if (result.resultData)??> <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} - <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a> + ${uiLabelMap.CommonTitle}: ${result.resultData.content.description!} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} + <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView!}" class="buttontext">${uiLabelMap.PartyReply}</a> </div> <div> - <#if result.resultData.electronicText?exists> + <#if result.resultData.electronicText??> ${result.resultData.electronicText.textData} </#if> </div> <hr /> <#else> - <div> ${result.errorMessage?if_exists}</div> + <div> ${result.errorMessage!}</div> </#if> --> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl Sat Aug 16 08:40:28 2014 @@ -39,7 +39,7 @@ under the License. <td> ${uiLabelMap.CommonName}:${content.contentName} </td> <@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK"> <td> - <a class="tabButton" href="<@ofbizUrl>showforumresponse?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> + <a class="tabButton" href="<@ofbizUrl>showforumresponse?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> </td> <td> ${uiLabelMap.CommonSubmitted}: Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl Sat Aug 16 08:40:28 2014 @@ -23,24 +23,24 @@ under the License. <h1>${uiLabelMap.EcommerceFromSite}:</h1><br /> <div> <@renderSiteAncestryPath trail=siteAncestorList?default([])/> -<#if trailList?exists && 1 < trailList?size > +<#if trailList?? && 1 < trailList?size > <h1>${uiLabelMap.EcommerceFromParentArticle}:</h1><br /> </#if> <#if trailList?has_content> <@blog.renderAncestryPath trail=trailList startIndex=1 endIndexOffset=1 /> <#if 0 < trailList?size > <#assign pair=trailList[trailList?size - 1]/> - <#assign pair0 = pair[0]?if_exists> - <#assign pair1 = pair[1]?if_exists> + <#assign pair0 = pair[0]!> + <#assign pair1 = pair[1]!> <hr /> - <h1>${uiLabelMap.EcommerceContentFor} ${pair1?if_exists}[${pair0?if_exists}]:</h1><br /> + <h1>${uiLabelMap.EcommerceContentFor} ${pair1!}[${pair0!}]:</h1><br /> </#if> <#else> </#if> -<#assign thisContentId=subContentId?if_exists> +<#assign thisContentId=subContentId!> <#if !thisContentId?has_content> - <#assign thisContentId=contentId?if_exists> + <#assign thisContentId=contentId!> </#if> <table border="0" width="100%" class="blogtext"> <tr> @@ -50,7 +50,7 @@ under the License. </td> <td width="40" valign="bottom"> <@checkPermission subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" > -<a class="tabButton" href="<@ofbizUrl>AddResponse?contentIdTo=${subContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.EcommerceRespond}</a> +<a class="tabButton" href="<@ofbizUrl>AddResponse?contentIdTo=${subContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.EcommerceRespond}</a> </@checkPermission> <br /> @@ -60,7 +60,7 @@ under the License. <#-- <@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" > - ${permissionErrorMsg?if_exists} + ${permissionErrorMsg!} </@checkPermission> --> @@ -89,18 +89,18 @@ under the License. <#assign indentFill = indentFill + " " /> </#list> <#assign thisContentId = ""/> - <#if nodeTrailCsv?exists> + <#if nodeTrailCsv??> <#assign idList = nodeTrailCsv?split(",")/> <#if 0 < idList?size > <#assign thisContentId = idList?last> </#if> </#if> - <#if content?exists> + <#if content??> <tr> <td> ${indentFill} - <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> - ${content.contentId?if_exists}-${content.description?if_exists}<br /> + <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> + ${content.contentId!}-${content.description!}<br /> </td> </tr> </#if> @@ -117,11 +117,11 @@ under the License. <#-- not used, will be deleted --> <#macro getCurrentContent > <#assign globalNodeTrail=globalNodeTrail/> - <#if globalNodeTrail?exists> + <#if globalNodeTrail??> <#assign currentNode=globalNodeTrail?last/> - <#if currentNode?exists> + <#if currentNode??> <#assign currentValue=currentNode.value/> - <#if currentValue?exists> + <#if currentValue??> <@wrapSubContentCache subContentId=currentValue.contentId wrapTemplateId="WRAP_ARTICLE" > <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" pickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" @@ -130,8 +130,8 @@ under the License. wrapTemplateId="" > <#assign description=currentValue.description?default("No description")/> -${uiLabelMap.CommonDescription}[${currentValue.contentId?if_exists}]:${description} -<a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> +${uiLabelMap.CommonDescription}[${currentValue.contentId!}]:${description} +<a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> </@traverseSubContentCache > </@wrapSubContentCache> </#if> @@ -150,9 +150,9 @@ ${uiLabelMap.CommonDescription}[${curren <tr> <td > ${indent} - <a class="tabButton" href="<@ofbizUrl>main?pubPt=${webSitePublishPoint.contentId?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${webSitePublishPoint.templateTitle?if_exists} + <a class="tabButton" href="<@ofbizUrl>main?pubPt=${webSitePublishPoint.contentId!}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${webSitePublishPoint.templateTitle!} <#assign indent = indent + " "> - [${webSitePublishPoint.contentId?if_exists}]</td> + [${webSitePublishPoint.contentId!}]</td> </#if> </tr> <#assign counter = counter + 1> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl Sat Aug 16 08:40:28 2014 @@ -17,6 +17,6 @@ specific language governing permissions under the License. --> -<#list forumMessages?if_exists as forumMessage> +<#list forumMessages! as forumMessage> <#include "messageDisplay.ftl"> </#list> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl Sat Aug 16 08:40:28 2014 @@ -23,7 +23,7 @@ under the License. <div> <@blog.renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 /> <#-- Do this so that we don't have to find the content twice (again in renderSubContent) --> -<#assign lastNode = globalNodeTrail?if_exists?last/> +<#assign lastNode = globalNodeTrail!?last/> <#if lastNode?has_content> <#assign subContent=lastNode.value/> <#else> @@ -31,11 +31,11 @@ under the License. <#assign dummy = globalNodeTrail.add(lastNode)/> </#if> <br /> -<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName?if_exists} - ${subContent.description?if_exists}:</h1><br /> +<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName!} - ${subContent.description!}:</h1><br /> -<#assign thisContentId=subContentId?if_exists> +<#assign thisContentId=subContentId!> <#if !thisContentId?has_content> - <#assign thisContentId=contentId?if_exists> + <#assign thisContentId=contentId!> </#if> <table border="0" width="100%" class="blogtext"> <tr> @@ -45,7 +45,7 @@ under the License. </td> <td width="40" valign="bottom"> <@checkPermission subContentId=subContentId targetOperation="HAS_USER_ROLE" contentPurposeList="RESPONSE" > -<a class="tabButton" href="<@ofbizUrl>createforumresponse?contentIdTo=${subContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.EcommerceRespond}</a> +<a class="tabButton" href="<@ofbizUrl>createforumresponse?contentIdTo=${subContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.EcommerceRespond}</a> </@checkPermission> <br /> @@ -55,7 +55,7 @@ under the License. <hr /> <#-- <@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" > - ${permissionErrorMsg?if_exists} + ${permissionErrorMsg!} </@checkPermission> --> @@ -83,18 +83,18 @@ under the License. <#assign indentFill = indentFill + " " /> </#list> <#assign thisContentId = ""/> - <#if nodeTrailCsv?exists> + <#if nodeTrailCsv??> <#assign idList = nodeTrailCsv?split(",")/> <#if 0 < idList?size > <#assign thisContentId = idList?last> </#if> </#if> - <#if content?exists> + <#if content??> <tr> <td> ${indentFill} - <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> - ${content.contentId?if_exists}-${content.description?if_exists}<br /> + <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> + ${content.contentId!}-${content.description!}<br /> </td> </tr> </#if> @@ -115,11 +115,11 @@ under the License. <#-- not used, will be deleted --> <#macro getCurrentContent > <#assign globalNodeTrail=globalNodeTrail/> - <#if globalNodeTrail?exists> + <#if globalNodeTrail??> <#assign currentNode=globalNodeTrail?last/> - <#if currentNode?exists> + <#if currentNode??> <#assign currentValue=currentNode.value/> - <#if currentValue?exists> + <#if currentValue??> <@wrapSubContentCache subContentId=currentValue.contentId wrapTemplateId="WRAP_ARTICLE" > <@traverseSubContentCache contentAssocTypeId="SUB_CONTENT" pickWhen="mapKey != null && mapKey.equals(\"ARTICLE\")" @@ -128,8 +128,8 @@ under the License. wrapTemplateId="" > <#assign description=currentValue.description?default("No description")/> -${uiLabelMap.CommonDescription}[${currentValue.contentId?if_exists}]:${description} -<a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> +${uiLabelMap.CommonDescription}[${currentValue.contentId!}]:${description} +<a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> </@traverseSubContentCache > </@wrapSubContentCache> </#if> @@ -148,9 +148,9 @@ ${uiLabelMap.CommonDescription}[${curren <tr> <td > ${indent} - <a class="tabButton" href="<@ofbizUrl>main?pubPt=${webSitePublishPoint.contentId?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${webSitePublishPoint.templateTitle?if_exists} + <a class="tabButton" href="<@ofbizUrl>main?pubPt=${webSitePublishPoint.contentId!}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${webSitePublishPoint.templateTitle!} <#assign indent = indent + " "> - [${webSitePublishPoint.contentId?if_exists}]</td> + [${webSitePublishPoint.contentId!}]</td> </#if> </tr> <#assign counter = counter + 1> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl Sat Aug 16 08:40:28 2014 @@ -20,9 +20,9 @@ under the License. <div id="ecom-header"> <div id="left"> - <#if sessionAttributes.overrideLogo?exists> + <#if sessionAttributes.overrideLogo??> <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/> - <#elseif catalogHeaderLogo?exists> + <#elseif catalogHeaderLogo??> <img src="<@ofbizContentUrl>${catalogHeaderLogo}</@ofbizContentUrl>" alt="Logo"/> <#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content> <img src="<@ofbizContentUrl>${layoutSettings.VT_HDR_IMAGE_URL.get(0)}</@ofbizContentUrl>" alt="Logo"/> @@ -32,11 +32,11 @@ under the License. ${screens.render("component://ecommerce/widget/CartScreens.xml#microcart")} </div> <div id="middle"> - <#if !productStore?exists> + <#if !productStore??> <h2>${uiLabelMap.EcommerceNoProductStore}</h2> </#if> - <#if (productStore.title)?exists><div id="company-name">${productStore.title}</div></#if> - <#if (productStore.subtitle)?exists><div id="company-subtitle">${productStore.subtitle}</div></#if> + <#if (productStore.title)??><div id="company-name">${productStore.title}</div></#if> + <#if (productStore.subtitle)??><div id="company-subtitle">${productStore.subtitle}</div></#if> <div id="welcome-message"> <#if sessionAttributes.autoName?has_content> ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName?html}! @@ -66,7 +66,7 @@ under the License. </ul> <ul id="right-links"> <!-- NOTE: these are in reverse order because they are stacked right to left instead of left to right --> - <#if !userLogin?has_content || (userLogin.userLoginId)?if_exists != "anonymous"> + <#if !userLogin?has_content || (userLogin.userLoginId)! != "anonymous"> <li id="header-bar-viewprofile"><a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a></li> <li id="header-bar-ListMessages"><a href="<@ofbizUrl>messagelist</@ofbizUrl>">${uiLabelMap.CommonMessages}</a></li> <li id="header-bar-ListQuotes"><a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a></li> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Sat Aug 16 08:40:28 2014 @@ -24,7 +24,7 @@ under the License. <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title> + <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)!}</title> <#if layoutSettings.VT_SHORTCUT_ICON?has_content> <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/> <#elseif layoutSettings.shortcutIcon?has_content> @@ -56,11 +56,11 @@ under the License. </#list> </#if> <#-- Append CSS for catalog --> - <#if catalogStyleSheet?exists> + <#if catalogStyleSheet??> <link rel="stylesheet" href="${StringUtil.wrapString(catalogStyleSheet)}" type="text/css"/> </#if> <#-- Append CSS for tracking codes --> - <#if sessionAttributes.overrideCss?exists> + <#if sessionAttributes.overrideCss??> <link rel="stylesheet" href="${StringUtil.wrapString(sessionAttributes.overrideCss)}" type="text/css"/> </#if> <#if layoutSettings.javaScripts?has_content> @@ -79,7 +79,7 @@ under the License. <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script> </#list> </#if> - ${layoutSettings.extraHead?if_exists} + ${layoutSettings.extraHead!} <#if layoutSettings.VT_EXTRA_HEAD?has_content> <#list layoutSettings.VT_EXTRA_HEAD as extraHead> ${extraHead} @@ -88,17 +88,17 @@ under the License. <#-- Meta tags if defined by the page action --> <meta name="generator" content="Apache OFBiz - eCommerce"/> - <#if metaDescription?exists> + <#if metaDescription??> <meta name="description" content="${metaDescription}"/> </#if> - <#if metaKeywords?exists> + <#if metaKeywords??> <meta name="keywords" content="${metaKeywords}"/> </#if> <#if webAnalyticsConfigs?has_content> <script language="JavaScript" type="text/javascript"> <#list webAnalyticsConfigs as webAnalyticsConfig> <#if webAnalyticsConfig.webAnalyticsTypeId != "BACKEND_ANALYTICS"> - ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)} + ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)} </#if> </#list> </script> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |