svn commit: r1618554 [36/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [36/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/taxTables.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/taxTables.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/taxTables.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/taxTables.ftl Mon Aug 18 07:42:27 2014 @@ -22,13 +22,13 @@ under the License. <tax-rules> <#list flowSupport.taxTables.default.rules as rule> <default-tax-rule> - <#if rule.shippingTaxed?exists> + <#if rule.shippingTaxed??> <shipping-taxed>${rule.shippingTaxed}</shipping-taxed> </#if> <rate>${rule.rate}</rate> <tax-area> <#if rule.areaType="states"> - <#if rule.allowedAreas?exists> + <#if rule.allowedAreas??> <allowed-areas> <us-state-area> <#list rule.allowedAreas as allowed> @@ -37,7 +37,7 @@ under the License. </us-state-area> </allowed-areas> </#if> - <#if rule.excludedAreas?exists> + <#if rule.excludedAreas??> <excluded-areas> <us-state-area> <#list rule.excludedAreas as excluded> @@ -47,7 +47,7 @@ under the License. </excluded-areas> </#if> <#elseif rule.areaType="zips"> - <#if rule.allowedAreas?exists> + <#if rule.allowedAreas??> <allowed-areas> <us-zip-area> <#list rule.allowedAreas as allowed> @@ -56,7 +56,7 @@ under the License. </us-zip-area> </allowed-areas> </#if> - <#if rule.excludedAreas?exists> + <#if rule.excludedAreas??> <excluded-areas> <us-zip-area> <#list rule.excludedAreas as excluded> @@ -73,7 +73,7 @@ under the License. </#list> </tax-rules> </default-tax-table> - <#if flowSupport.taxTables.alternateTaxTables?exists> + <#if flowSupport.taxTables.alternateTaxTables??> <alternate-tax-tables> <#list flowSupport.taxTables.alternateTaxTables as altTaxTable> <alternate-tax-table name="${altTaxTable.name}" standalone="${altTaxTable.standalone}"> @@ -83,7 +83,7 @@ under the License. <rate>${altRule.rate}</rate> <tax-area> <#if altRule.areaType="states"> - <#if altRule.allowedAreas?exists> + <#if altRule.allowedAreas??> <allowed-areas> <us-state-area> <#list altRule.allowedAreas as altAllowed> @@ -92,7 +92,7 @@ under the License. </us-state-area> </allowed-areas> </#if> - <#if altRule.excludedAreas?exists> + <#if altRule.excludedAreas??> <excluded-areas> <us-state-area> <#list altRule.excludedAreas as altExcluded> @@ -102,7 +102,7 @@ under the License. </excluded-areas> </#if> <#elseif rule.areaType="zips"> - <#if altRule.allowedAreas?exists> + <#if altRule.allowedAreas??> <allowed-areas> <us-zip-area> <#list altRule.allowedAreas as altAllowed> @@ -111,7 +111,7 @@ under the License. </us-zip-area> </allowed-areas> </#if> - <#if altRule.excludedAreas?exists> + <#if altRule.excludedAreas??> <excluded-areas> <us-zip-area> <#list altRule.excludedAreas as altExcluded> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/shoppingCart/items.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/shoppingCart/items.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/shoppingCart/items.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/templates/shoppingCart/items.ftl Mon Aug 18 07:42:27 2014 @@ -25,17 +25,17 @@ under the License. <unit-price currency="USD">${item.unitPrice}</unit-price> <quantity>${item.quantity}</quantity> - <#if item.merchantItemId?exists> + <#if item.merchantItemId??> <merchantItemId>${item.merchantItemId}</merchantItemId> </#if> - <#if item.merchantPrivateItemData?exists> + <#if item.merchantPrivateItemData??> <merchant-private-item-data> <#list item.merchantPrivateItemData as itemData> <${itemData.name}>${itemData.value}</${itemData.name}> </#list> </merchant-private-item-data> </#if> - <#if item.taxTable?exists> + <#if item.taxTable??> <tax-table-selector>${taxTable}</tax-table-selector> </#if> </item> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. <#-- Each entry will have a html form. Set action to null so previous link be used --> <form> <input type="hidden" name="facilityId" value="${facility.facilityId}"/> - <input type="submit" value="${facility.facilityName?if_exists}"/> + <input type="submit" value="${facility.facilityName!}"/> </form> </li> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. <head> <meta charset="utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>${applicationTitle?if_exists}</title> + <title>${applicationTitle!}</title> <#if layoutSettings.javaScripts?has_content> <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/> <#list layoutSettings.javaScripts as javaScript> @@ -43,6 +43,6 @@ under the License. </head> <body> <div data-role="header"> - <a href="<@ofbizUrl>/menu?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Main</a> - <h1>${title?if_exists}</h1> + <a href="<@ofbizUrl>/menu?facilityId=${parameters.facilityId!}</@ofbizUrl>">Main</a> + <h1>${title!}</h1> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl Mon Aug 18 07:42:27 2014 @@ -19,20 +19,20 @@ under the License. <#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if> <#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if> -<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> +<#if requestAttributes.serviceValidationException??><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> <#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <#if !errorMessage?has_content> - <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists> + <#assign errorMessage = requestAttributes._ERROR_MESSAGE_!> </#if> <#if !errorMessageList?has_content> - <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists> + <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_!> </#if> <#if !eventMessage?has_content> - <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists> + <#assign eventMessage = requestAttributes._EVENT_MESSAGE_!> </#if> <#if !eventMessageList?has_content> - <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists> + <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_!> </#if> <#-- display the error messages --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/login.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/login.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/login.ftl Mon Aug 18 07:42:27 2014 @@ -36,7 +36,7 @@ under the License. <#if ("Y" == useMultitenant)> <div data-role="fieldcontainer"> <label for="tenantId">${uiLabelMap.CommonTenantId}</label> - <input type="text" id="tenantId" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/> + <input type="text" id="tenantId" name="tenantId" value="${parameters.tenantId!}" size="20"/> </div> </#if> <input type="submit" value="${uiLabelMap.CommonLogin}" class="loginButton" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl Mon Aug 18 07:42:27 2014 @@ -19,11 +19,11 @@ under the License. <div data-role="content"> <ul data-role="listview"> -<li><a accesskey="1" href="<@ofbizUrl>/receipt?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Goods Receipt</a></li> -<li><a accesskey="2" href="<@ofbizUrl>/movement?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Inventory Movement</a></li> -<li><a accesskey="3" href="<@ofbizUrl>/picking?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Picking</a></li> -<li><a accesskey="4" href="<@ofbizUrl>/packing?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Packing</a></li> -<li><a accesskey="5" href="<@ofbizUrl>/stocktake?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Stocktake</a></li> +<li><a accesskey="1" href="<@ofbizUrl>/receipt?facilityId=${parameters.facilityId!}</@ofbizUrl>">Goods Receipt</a></li> +<li><a accesskey="2" href="<@ofbizUrl>/movement?facilityId=${parameters.facilityId!}</@ofbizUrl>">Inventory Movement</a></li> +<li><a accesskey="3" href="<@ofbizUrl>/picking?facilityId=${parameters.facilityId!}</@ofbizUrl>">Picking</a></li> +<li><a accesskey="4" href="<@ofbizUrl>/packing?facilityId=${parameters.facilityId!}</@ofbizUrl>">Packing</a></li> +<li><a accesskey="5" href="<@ofbizUrl>/stocktake?facilityId=${parameters.facilityId!}</@ofbizUrl>">Stocktake</a></li> </ul> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl Mon Aug 18 07:42:27 2014 @@ -21,9 +21,9 @@ under the License. <span> <#if negativeQOH?has_content> - <a href="<@ofbizUrl>/fixproductnegativeqoh?facilityId=${facility.facilityId?if_exists}&productId=${product.productId?if_exists}</@ofbizUrl>">Fix negative QOH</a> + <a href="<@ofbizUrl>/fixproductnegativeqoh?facilityId=${facility.facilityId!}&productId=${product.productId!}</@ofbizUrl>">Fix negative QOH</a> </#if> - <a href="<@ofbizUrl>/productstocktake?facilityId=${facility.facilityId?if_exists}&productId=${product.productId?if_exists}</@ofbizUrl>">Refresh</a> + <a href="<@ofbizUrl>/productstocktake?facilityId=${facility.facilityId!}&productId=${product.productId!}</@ofbizUrl>">Refresh</a> <#-- <ol> Display of edit box for barcode Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl Mon Aug 18 07:42:27 2014 @@ -21,7 +21,7 @@ under the License. <div data-role="content"> <ul data-role="listview"> - <li><a accesskey="1" href="<@ofbizUrl>/poreceipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">PO Receipt</a></li> - <li><a accesskey="2" href="<@ofbizUrl>/productreceipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Product Receipt</a></li> + <li><a accesskey="1" href="<@ofbizUrl>/poreceipt?facilityId=${facility.facilityId!}</@ofbizUrl>">PO Receipt</a></li> + <li><a accesskey="2" href="<@ofbizUrl>/productreceipt?facilityId=${facility.facilityId!}</@ofbizUrl>">Product Receipt</a></li> </ul> </div> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <#assign facility = parameters.facilityId> -<#if parameters.idValue?if_exists?has_content> +<#if parameters.idValue!?has_content> <#assign idValue = parameters.idValue?has_content> </#if> @@ -36,7 +36,7 @@ under the License. </td> <td> </td> <td> - <a href="<@ofbizUrl>productstocktake?facilityId=${facility.facilityId?if_exists}&productId=${product.productId}</@ofbizUrl>" class="buttontext">${(product.internalName)?if_exists}</a> + <a href="<@ofbizUrl>productstocktake?facilityId=${facility.facilityId!}&productId=${product.productId}</@ofbizUrl>" class="buttontext">${(product.internalName)!}</a> </td> </tr> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/AdminSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/AdminSearch.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/AdminSearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/AdminSearch.ftl Mon Aug 18 07:42:27 2014 @@ -66,9 +66,9 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" class="inputBox" name="SEARCH_FEAT" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> - <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> - <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> + <input type="text" class="inputBox" name="SEARCH_FEAT" size="15" value="${requestParameters.SEARCH_FEAT!}"/> + <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT!}"/> + <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT!}"/> </div> </td> </tr> @@ -79,7 +79,7 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr> <td align="right" valign="middle"> - <div>${(productFeatureType.description)?if_exists}:</div> + <div>${(productFeatureType.description)!}:</div> </td> <td valign="middle"> <div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/RegisterPerson.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/RegisterPerson.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/RegisterPerson.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/RegisterPerson.ftl Mon Aug 18 07:42:27 2014 @@ -35,33 +35,33 @@ under the License. <tr> <td class="label"> Salutation </td> <td class="no-required"> - <input type="text" autocomplete="off" id="RegisterPerson_salutation" maxlength="60" size="40" name="salutation" value="${requestParameters.salutation?if_exists}"/> + <input type="text" autocomplete="off" id="RegisterPerson_salutation" maxlength="60" size="40" name="salutation" value="${requestParameters.salutation!}"/> </td> </tr> <tr> <td class="label"> First name </td> <td> - <input type="text" autocomplete="off" id="RegisterPerson_firstName" maxlength="60" size="40" class="required false" name="firstName" value="${requestParameters.firstName?if_exists}"/> + <input type="text" autocomplete="off" id="RegisterPerson_firstName" maxlength="60" size="40" class="required false" name="firstName" value="${requestParameters.firstName!}"/> <span class="tooltip">Required</span> </td> </tr> <tr> <td class="label"> Middle Name </td> <td class="no-required"> - <input type="text" autocomplete="off" id="RegisterPerson_middleName" maxlength="60" size="40" name="middleName" value="${requestParameters.middleName?if_exists}"/> + <input type="text" autocomplete="off" id="RegisterPerson_middleName" maxlength="60" size="40" name="middleName" value="${requestParameters.middleName!}"/> </td> </tr> <tr> <td class="label"> Last name </td> <td> - <input type="text" autocomplete="off" id="RegisterPerson_lastName" maxlength="60" size="40" class="required false" name="lastName" value="${requestParameters.lastName?if_exists}"/> + <input type="text" autocomplete="off" id="RegisterPerson_lastName" maxlength="60" size="40" class="required false" name="lastName" value="${requestParameters.lastName!}"/> <span class="tooltip">Required</span> </td> </tr> <tr> <td class="label"> Email </td> <td> - <input type="text" autocomplete="off" id="RegisterPerson_USER_EMAIL" maxlength="250" size="60" class="required false" name="USER_EMAIL" value="${requestParameters.USER_EMAIL?if_exists}"/> + <input type="text" autocomplete="off" id="RegisterPerson_USER_EMAIL" maxlength="250" size="60" class="required false" name="USER_EMAIL" value="${requestParameters.USER_EMAIL!}"/> <span class="tooltip">Required</span> </td> </tr> @@ -72,21 +72,21 @@ under the License. <tr> <td class="label"> Username </td> <td> - <input type="text" autocomplete="off" id="RegisterPerson_USERNAME" maxlength="250" size="30" class="required false" name="USERNAME" value="${requestParameters.USERNAME?if_exists}"/> + <input type="text" autocomplete="off" id="RegisterPerson_USERNAME" maxlength="250" size="30" class="required false" name="USERNAME" value="${requestParameters.USERNAME!}"/> <span class="tooltip">Required</span> </td> </tr> <tr> <td class="label"> Password </td> <td> - <input type="password" id="RegisterPerson_PASSWORD" maxlength="250" size="15" name="PASSWORD" class="required false" value="${requestParameters.PASSWORD?if_exists}"/> + <input type="password" id="RegisterPerson_PASSWORD" maxlength="250" size="15" name="PASSWORD" class="required false" value="${requestParameters.PASSWORD!}"/> <span class="tooltip">Required</span> </td> </tr> <tr> <td class="label"> Password </td> <td> - <input type="password" id="RegisterPerson_CONFIRM_PASSWORD" maxlength="250" size="15" name="CONFIRM_PASSWORD" class="required false" value="${requestParameters.CONFIRM_PASSWORD?if_exists}"/> + <input type="password" id="RegisterPerson_CONFIRM_PASSWORD" maxlength="250" size="15" name="CONFIRM_PASSWORD" class="required false" value="${requestParameters.CONFIRM_PASSWORD!}"/> <span class="tooltip">* Confirm</span> </td> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/login.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/login.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/myportal/widget/login.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> +<#if requestAttributes.uiLabelMap??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")> <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))> @@ -43,13 +43,13 @@ under the License. <td><input type="password" name="PASSWORD" value="" size="20"/></td> </tr> <#if ("Y" == useMultitenant) > - <#if !requestAttributes.tenantId?exists> + <#if !requestAttributes.tenantId??> <tr> <td class="label">${uiLabelMap.CommonTenantId}</td> - <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td> + <td><input type="text" name="tenantId" value="${parameters.tenantId!}" size="20"/></td> </tr> <#else> - <input type="hidden" name="tenantId" value="${requestAttributes.tenantId?if_exists}"/> + <input type="hidden" name="tenantId" value="${requestAttributes.tenantId!}"/> </#if> </#if> <tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Mon Aug 18 07:42:27 2014 @@ -47,12 +47,12 @@ <#assign alt_row = false> <#list inventoryMapList as inventoryMap> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td valign="top"> ${inventoryMap.productId?if_exists}</td> - <td align="right" valign="top"> ${inventoryMap.timestamp?if_exists?if_exists}</td> - <td align="right" valign="top"> ${inventoryMap.statusId?if_exists?if_exists}</td> - <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal?if_exists?if_exists}</td> - <td align="center" valign="top"> ${inventoryMap.quantityFromMessage?if_exists?if_exists}</td> - <td align="right" valign="top"> ${inventoryMap.quantityDiff?if_exists?if_exists}</td> + <td valign="top"> ${inventoryMap.productId!}</td> + <td align="right" valign="top"> ${inventoryMap.timestamp!!}</td> + <td align="right" valign="top"> ${inventoryMap.statusId!!}</td> + <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal!!}</td> + <td align="center" valign="top"> ${inventoryMap.quantityFromMessage!!}</td> + <td align="right" valign="top"> ${inventoryMap.quantityDiff!!}</td> </tr> <#-- toggle the row color --> <#assign alt_row = !alt_row> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl Mon Aug 18 07:42:27 2014 @@ -36,28 +36,28 @@ <of:CONFIRMATION>1</of:CONFIRMATION> <of:LANGUAGE>ENG</of:LANGUAGE> <of:CODEPAGE>NONE</of:CODEPAGE> - <of:AUTHID>${authId?if_exists}</of:AUTHID> + <of:AUTHID>${authId!}</of:AUTHID> </os:SENDER> - <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> + <os:DATETIMEISO>${sentDate!}</os:DATETIMEISO> </os:CNTROLAREA> <n:DATAAREA> <n:CONFIRM_BOD> <n:CONFIRM> <os:CNTROLAREA> <os:SENDER> - <of:LOGICALID>${errorLogicalId?if_exists}</of:LOGICALID> - <of:COMPONENT>${errorComponent?if_exists}</of:COMPONENT> - <of:TASK>${errorTask?if_exists}</of:TASK> - <of:REFERENCEID>${errorReferenceId?if_exists}</of:REFERENCEID> + <of:LOGICALID>${errorLogicalId!}</of:LOGICALID> + <of:COMPONENT>${errorComponent!}</of:COMPONENT> + <of:TASK>${errorTask!}</of:TASK> + <of:REFERENCEID>${errorReferenceId!}</of:REFERENCEID> </os:SENDER> <os:DATETIMEISO></os:DATETIMEISO> </os:CNTROLAREA> - <of:ORIGREF>${origRef?if_exists}</of:ORIGREF> - <#if errorMapList?exists> + <of:ORIGREF>${origRef!}</of:ORIGREF> + <#if errorMapList??> <#list errorMapList as errorMap> <n:CONFIRMMSG> - <of:DESCRIPTN>${errorMap.description?if_exists?xml}</of:DESCRIPTN> - <of:REASONCODE>${errorMap.reasonCode?if_exists?xml}</of:REASONCODE> + <of:DESCRIPTN>${errorMap.description!?xml}</of:DESCRIPTN> + <of:REASONCODE>${errorMap.reasonCode!?xml}</of:REASONCODE> </n:CONFIRMMSG> </#list> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Mon Aug 18 07:42:27 2014 @@ -49,27 +49,27 @@ under the License. <of:CONFIRMATION>1</of:CONFIRMATION> <of:LANGUAGE>ENG</of:LANGUAGE> <of:CODEPAGE>NONE</of:CODEPAGE> - <of:AUTHID>${authId?if_exists}</of:AUTHID> + <of:AUTHID>${authId!}</of:AUTHID> </os:SENDER> - <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> + <os:DATETIMEISO>${sentDate!}</os:DATETIMEISO> </os:CNTROLAREA> <n:DATAAREA> <n:PROCESS_SHIPMENT> <n:SHIPMENT> - <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID> + <of:DOCUMENTID>${shipment.shipmentId!}</of:DOCUMENTID> <#if shipperId?has_content> <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate --> <#-- this we will also only send if there is a SHIPPERID, normally fulfillment partner will select based on TRANSMETHD, address, weight, etc --> - <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER> + <of:CARRIER>${orderItemShipGroup.carrierPartyId!}</of:CARRIER> </#if> <#if shipperId?has_content> <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS> <#else> <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS> </#if> - <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists?xml}</of:NOTES> - <of:SHIPNOTES>${shipnotes?if_exists?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank --> - <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId?if_exists}</of:TRANSMETHD> + <of:NOTES>${orderItemShipGroup.shippingInstructions!?xml}</of:NOTES> + <of:SHIPNOTES>${shipnotes!?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank --> + <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId!}</of:TRANSMETHD> <os:PARTNER> <#if address?has_content> <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if> @@ -77,42 +77,42 @@ under the License. <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if> <#-- NOTE: this is the to name --> - <#assign toName = (address.toName)?default(partyName)?if_exists/> - <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))?if_exists/></#if> - <of:NAME>${toName?if_exists?xml}</of:NAME> + <#assign toName = (address.toName)?default(partyName)!/> + <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))!/></#if> + <of:NAME>${toName!?xml}</of:NAME> <of:PARTNRTYPE>SHIPTO</of:PARTNRTYPE> <of:CURRENCY>USD</of:CURRENCY> <os:ADDRESS> - <#assign address1 = address.address1?if_exists/> - <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))?if_exists/></#if> - <of:ADDRLINE>${address1?if_exists?xml}</of:ADDRLINE> - <#if address.address2?exists> - <#assign address2 = address.address2?if_exists/> - <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))?if_exists/></#if> + <#assign address1 = address.address1!/> + <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))!/></#if> + <of:ADDRLINE>${address1!?xml}</of:ADDRLINE> + <#if address.address2??> + <#assign address2 = address.address2!/> + <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))!/></#if> <of:ADDRLINE>${address2?xml}</of:ADDRLINE> </#if> - <#assign city = address.city?if_exists/> - <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))?if_exists/></#if> - <of:CITY>${city?if_exists?xml}</of:CITY> - <#assign countryGeoId = address.countryGeoId?if_exists/> - <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))?if_exists/></#if> - <of:COUNTRY>${countryGeoId?if_exists}</of:COUNTRY> + <#assign city = address.city!/> + <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))!/></#if> + <of:CITY>${city!?xml}</of:CITY> + <#assign countryGeoId = address.countryGeoId!/> + <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))!/></#if> + <of:COUNTRY>${countryGeoId!}</of:COUNTRY> <#--<of:DESCRIPTN></of:DESCRIPTN> <of:FAX></of:FAX>--> - <of:POSTALCODE>${address.postalCode?if_exists?xml}</of:POSTALCODE> - <of:STATEPROVN>${address.stateProvinceGeoId?if_exists}</of:STATEPROVN> + <of:POSTALCODE>${address.postalCode!?xml}</of:POSTALCODE> + <of:STATEPROVN>${address.stateProvinceGeoId!}</of:STATEPROVN> <#if telecomNumber?has_content> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </#if> </os:ADDRESS> <os:CONTACT> <#-- NOTE: this is the attention name --> - <#assign attnName = (address.attnName)?default(partyName)?if_exists/> - <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))?if_exists/></#if> - <of:NAME>${attnName?if_exists?xml}</of:NAME> - <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL> + <#assign attnName = (address.attnName)?default(partyName)!/> + <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))!/></#if> + <of:NAME>${attnName!?xml}</of:NAME> + <of:EMAIL>${emailString!?xml}</of:EMAIL> <#--<of:FAX></of:FAX>--> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </os:CONTACT> </#if> </os:PARTNER> @@ -122,35 +122,35 @@ under the License. <#if productType.isPhysical == "Y" || productType.isPhysical == "y"> <n:SHIPITEM> <os:QUANTITY> - <of:VALUE>${shipmentItem.quantity?if_exists}</of:VALUE> + <of:VALUE>${shipmentItem.quantity!}</of:VALUE> <of:NUMOFDEC>0</of:NUMOFDEC> <of:SIGN>+</of:SIGN> <of:UOM>EACH</of:UOM> </os:QUANTITY> - <of:ITEM>${shipmentItem.productId?if_exists}</of:ITEM> + <of:ITEM>${shipmentItem.productId!}</of:ITEM> <of:DISPOSITN>FIFO</of:DISPOSITN><#-- TODO: figure out if this is a reviewer order, if so set this to LIFO --> <n:DOCUMNTREF> <of:DOCTYPE>SHIPMENT</of:DOCTYPE> - <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID> - <of:LINENUM>${shipmentItem.shipmentItemSeqId?if_exists}</of:LINENUM> + <of:DOCUMENTID>${shipment.shipmentId!}</of:DOCUMENTID> + <of:LINENUM>${shipmentItem.shipmentItemSeqId!}</of:LINENUM> </n:DOCUMNTREF> </n:SHIPITEM> </#if> </#list> - <#list externalIdSet?if_exists as externalId> + <#list externalIdSet! as externalId> <n:DOCUMNTREF> <of:DOCTYPE>PARTNER_SO</of:DOCTYPE> - <of:DOCUMENTID>${externalId?if_exists?xml}</of:DOCUMENTID> + <of:DOCUMENTID>${externalId!?xml}</of:DOCUMENTID> </n:DOCUMNTREF> </#list> - <#list correspondingPoIdSet?if_exists as correspondingPoId> + <#list correspondingPoIdSet! as correspondingPoId> <n:DOCUMNTREF> <of:DOCTYPE>CUST_PO</of:DOCTYPE> - <of:DOCUMENTID>${correspondingPoId?if_exists?xml}</of:DOCUMENTID> + <of:DOCUMENTID>${correspondingPoId!?xml}</of:DOCUMENTID> </n:DOCUMNTREF> </#list> <#-- data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order --> - <#if replacementReturnId?exists> + <#if replacementReturnId??> <n:DOCUMNTREF> <of:DOCTYPE>RMA</of:DOCTYPE> <of:DOCUMENTID>${replacementReturnId}</of:DOCUMENTID> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Mon Aug 18 07:42:27 2014 @@ -33,19 +33,19 @@ under the License. <of:LOGICALID>${logicalId}</of:LOGICALID> <of:COMPONENT>INVENTORY</of:COMPONENT> <of:TASK>RMA</of:TASK> - <of:REFERENCEID>${referenceId?if_exists}</of:REFERENCEID> + <of:REFERENCEID>${referenceId!}</of:REFERENCEID> <of:CONFIRMATION>1</of:CONFIRMATION> <of:LANGUAGE>ENG</of:LANGUAGE> <of:CODEPAGE>NONE</of:CODEPAGE> <of:AUTHID>${authId}</of:AUTHID> </os:SENDER> - <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> + <os:DATETIMEISO>${sentDate!}</os:DATETIMEISO> </os:CNTROLAREA> <n:DATAAREA> <n:RECEIVE_DELIVERY> <n:RECEIPTHDR> - <os:DATETIMEISO>${entryDate?if_exists}</os:DATETIMEISO> - <of:RECEIPTID>${returnId?if_exists}</of:RECEIPTID> + <os:DATETIMEISO>${entryDate!}</os:DATETIMEISO> + <of:RECEIPTID>${returnId!}</of:RECEIPTID> <of:CARRIER></of:CARRIER> <of:NOTES></of:NOTES> <of:RECEIPTYPE>RMA</of:RECEIPTYPE> @@ -54,55 +54,55 @@ under the License. <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if> <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if> <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if> - <of:NAME>${postalAddress.toName?default(partyName)?if_exists?xml}</of:NAME> + <of:NAME>${postalAddress.toName?default(partyName)!?xml}</of:NAME> <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE> <of:CURRENCY>USD</of:CURRENCY> <os:ADDRESS> - <of:ADDRLINE>${postalAddress.address1?if_exists?xml}</of:ADDRLINE> + <of:ADDRLINE>${postalAddress.address1!?xml}</of:ADDRLINE> <#if postalAddress.address2?has_content> - <of:ADDRLINE>${postalAddress.address2?if_exists?xml}</of:ADDRLINE> + <of:ADDRLINE>${postalAddress.address2!?xml}</of:ADDRLINE> </#if> - <of:CITY>${postalAddress.city?if_exists?xml}</of:CITY> - <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY> + <of:CITY>${postalAddress.city!?xml}</of:CITY> + <of:COUNTRY>${postalAddress.countryGeoId!}</of:COUNTRY> <#-- <of:FAX></of:FAX> --> - <of:POSTALCODE>${postalAddress.postalCode?if_exists?xml}</of:POSTALCODE> - <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:POSTALCODE>${postalAddress.postalCode!?xml}</of:POSTALCODE> + <of:STATEPROVN>${postalAddress.stateProvinceGeoId!}</of:STATEPROVN> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </os:ADDRESS> <os:CONTACT> - <of:NAME>${postalAddress.attnName?default(partyName)?if_exists?xml}</of:NAME> - <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL> + <of:NAME>${postalAddress.attnName?default(partyName)!?xml}</of:NAME> + <of:EMAIL>${emailString!?xml}</of:EMAIL> <#-- <of:FAX></of:FAX> --> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </os:CONTACT> </#if> </os:PARTNER> </n:RECEIPTHDR> <n:RECEIPTUNT> <os:QUANTITY> - <of:VALUE>${totalQty?if_exists}</of:VALUE> + <of:VALUE>${totalQty!}</of:VALUE> <of:NUMOFDEC>0</of:NUMOFDEC> <of:SIGN>+</of:SIGN> <of:UOM>EACH</of:UOM> </os:QUANTITY> <#list returnItems as returnItem> <#assign returnReason = returnItem.getRelatedOne("ReturnReason", false)/> - <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/> + <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)!/> <n:RECEIPTITM> <os:QUANTITY> - <of:VALUE>${returnItem.returnQuantity?if_exists}</of:VALUE> + <of:VALUE>${returnItem.returnQuantity!}</of:VALUE> <of:NUMOFDEC>0</of:NUMOFDEC> <of:SIGN>+</of:SIGN> <of:UOM>EACH</of:UOM> </os:QUANTITY> - <of:ITEM>${returnItem.productId?if_exists}</of:ITEM> - <of:NOTES>${returnReason.description?if_exists?xml}</of:NOTES> + <of:ITEM>${returnItem.productId!}</of:ITEM> + <of:NOTES>${returnReason.description!?xml}</of:NOTES> <os:DOCUMNTREF> <of:DOCTYPE>RMA</of:DOCTYPE> <of:DOCUMENTID>${returnItem.returnId}</of:DOCUMENTID> <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM> </os:DOCUMNTREF> - <#list serialNumberList?if_exists as serialNumber> + <#list serialNumberList! as serialNumber> <n:INVDETAIL> <of:SERIALNUM>${serialNumber?xml}</of:SERIALNUM> </n:INVDETAIL> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/main.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/main.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/main.ftl Mon Aug 18 07:42:27 2014 @@ -20,15 +20,15 @@ under the License. <br /> <h2>${text1}</h2> <br /> -<#if text2?exists> +<#if text2??> <h2>${text2}</h2> </#if><br /> -<#if link1?exists> +<#if link1??> <h2>1. <a href="${link1}" target="new1">${link1Text}</a></h2> </#if> -<#if link2?exists> +<#if link2??> <h2>2. <a href="${link2}" target="new2">${link2Text}</a></h2> </#if> -<#if link3?exists> +<#if link3??> <h2>3. <a href="${link3}" target="new3">${link3Text}</a></h2> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Mon Aug 18 07:42:27 2014 @@ -21,7 +21,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <#if task?has_content> - <li class="h3"> ${uiLabelMap.PageTitleEditTask} #${project.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li> + <li class="h3"> ${uiLabelMap.PageTitleEditTask} #${project.workEffortId!} ${uiLabelMap.CommonInformation}</li> <#else> <li class="h3"> ${uiLabelMap.PageTitleAddTask}</li> </#if> @@ -38,17 +38,17 @@ under the License. </#if> <table width="100%" cellpadding="2" cellspacing="0"> <tr> - <#if !(task?exists)> - <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td> + <#if !(task??)> + <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId!}"/></td> <#else> - <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId?if_exists}"/></td> - <td><input type="hidden" name="workEffortId" value="${task.workEffortId?if_exists}"/></td> - <td><input type="hidden" name="workEffortName" value="${task.workEffortName?if_exists}"/></td> + <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId!}"/></td> + <td><input type="hidden" name="workEffortId" value="${task.workEffortId!}"/></td> + <td><input type="hidden" name="workEffortName" value="${task.workEffortName!}"/></td> </#if> </tr> <tr> - <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/></td> - <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td> + <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom!}"/></td> + <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom!}"/></td> <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/> </tr> <tr> @@ -63,23 +63,23 @@ under the License. </td> </tr> <tr> - <#if task?exists> + <#if task??> <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td> - <td>${task.workEffortId?if_exists}</td> + <td>${task.workEffortId!}</td> </#if> </tr> <tr> <td class="label" >${uiLabelMap.CommonName}*</td> - <#if task?exists> - <td>${task.workEffortName?if_exists}<span class="tooltip">${uiLabelMap.CommonRequired}</span></td> + <#if task??> + <td>${task.workEffortName!}<span class="tooltip">${uiLabelMap.CommonRequired}</span></td> <#else> <td><input type="text" name="workEffortName" value=""/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td> </#if> </tr> <tr> <td class="label" >${uiLabelMap.CommonDescription}</td> - <#if task?exists> - <td><input type="text" name="description" value="${task.description?if_exists}"/></td> + <#if task??> + <td><input type="text" name="description" value="${task.description!}"/></td> <#else> <td><input type="text" name="description" value=""/></td> </#if> @@ -88,8 +88,8 @@ under the License. <td class="label" >${uiLabelMap.CommonStatus}</td> <td> <select name="currentStatusId"> - <#if task?exists> - <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists> + <#if task??> + <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")!> <option selected="selected" value="${currentStatus.currentStatusId}">${currentStatus.description}</option> <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId), null, false)> <#list statusValidChangeToDetailList as statusValidChangeToDetail> @@ -100,13 +100,13 @@ under the License. <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"), null, false)> <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"), null, false)> <#list statusItemGenrals as statusItem> - <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option> + <option value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option> </#list> <#list statusItemTasks as statusItem> - <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option> + <option value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option> </#list> <#list statusItemEvents as statusItem> - <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option> + <option value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option> </#list> </#if> </select> @@ -116,10 +116,10 @@ under the License. <td class="label">${uiLabelMap.CommonPriority}</td> <td> <#if task?has_content> - <#assign priority = task.priority?if_exists> + <#assign priority = task.priority!> </#if> <select name="priority" size="1"> - <#if priority?exists> + <#if priority??> <option selected="selected" value="${priority}">${priority}</option> <option></option> <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option> @@ -151,10 +151,10 @@ under the License. <td> <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"), null, false)> <select name="scopeEnumId"> - <#if task?exists> - <#assign scopeEnumId = task.scopeEnumId?if_exists> + <#if task??> + <#assign scopeEnumId = task.scopeEnumId!> <#list enumerations as enumeration> - <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option> + <option <#if "${enumeration.enumId}" == scopeEnumId!>selected="selected"</#if>>${enumeration.description}</option> </#list> <#else> <#list enumerations as enumeration> @@ -167,8 +167,8 @@ under the License. <tr> <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td> <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedStartDate?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedStartDate!}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> @@ -177,8 +177,8 @@ under the License. <tr> <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td> <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedCompletionDate?if_exists}" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedCompletionDate!}" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> @@ -189,8 +189,8 @@ under the License. <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualStartDate?if_exists}" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualStartDate!}" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> @@ -200,8 +200,8 @@ under the License. <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td> <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualCompletionDate?if_exists}" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualCompletionDate!}" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl Mon Aug 18 07:42:27 2014 @@ -30,13 +30,13 @@ g.setShowComp(1); // Show/Hide % Complet <#list phaseTaskList as t> <#if t.workEffortTypeId == "PHASE"> - g.AddTaskItem(new JSGantt.TaskItem(${t.phaseNr}, "${t.phaseSeqNum?if_exists}. ${t.phaseName}", "", "", "00ff00", "", 0, "", 0, 1, 0, 1)); + g.AddTaskItem(new JSGantt.TaskItem(${t.phaseNr}, "${t.phaseSeqNum!}. ${t.phaseName}", "", "", "00ff00", "", 0, "", 0, 1, 0, 1)); </#if> <#if t.workEffortTypeId == "TASK"> - g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum?if_exists}. ${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0, ${t.phaseNr}, 1<#if t.preDecessor?exists>, "${t.preDecessor}"</#if>)); + g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum!}. ${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource!}", ${t.completion!} , 0, ${t.phaseNr}, 1<#if t.preDecessor??>, "${t.preDecessor}"</#if>)); </#if> <#if t.workEffortTypeId == "MILESTONE"> - g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","00ff00", "", 1 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0,${t.phaseNr}, "", "" )); + g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","00ff00", "", 1 , "${t.resource!}", ${t.completion!} , 0,${t.phaseNr}, "", "" )); </#if> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl Mon Aug 18 07:42:27 2014 @@ -23,9 +23,9 @@ under the License. <ul> <li class="h3"> ${uiLabelMap.WorkEffortNotes}</li> <#--if project?has_content> - <li><a href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> + <li><a href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId!}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> <#else> - <li><a href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> + <li><a href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId!}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> </#if--> </ul> <br class="clear" /> @@ -40,26 +40,26 @@ under the License. <tr> <td valign="top" width="35%"> <div> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div> - <div> <b>${uiLabelMap.CommonAt}: </b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime?if_exists,"dd-MM-yyyy HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div> + <div> <b>${uiLabelMap.CommonAt}: </b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime!,"dd-MM-yyyy HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div> </td> <td valign="top" width="50%"> - <div>${note.noteInfo?if_exists}</div> + <div>${note.noteInfo!}</div> </td> <td align="right" valign="top" width="15%"> - <#if note.internalNote?if_exists == "N"> + <#if note.internalNote! == "N"> <div>${uiLabelMap.ProjectMgrPrintableNote}</div> <#if project?has_content> - <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> + <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId!}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> <#else> - <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> + <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId!}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> </#if> </#if> - <#if note.internalNote?if_exists == "Y"> + <#if note.internalNote! == "Y"> <div>${uiLabelMap.OrderNotPrintableNote}</div> <#if project?has_content> - <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> + <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId!}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> <#else> - <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> + <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId!}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> </#if> </#if> </td> @@ -80,7 +80,7 @@ under the License. </td> </tr> </table> - <#if parameters.showForm?exists> + <#if parameters.showForm??> <div class="screenlet-title-bar"> <ul> <li class="h3"> ${uiLabelMap.OrderAddNote}</li> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl Mon Aug 18 07:42:27 2014 @@ -81,7 +81,7 @@ under the License. <#else> <#assign row="alternate-row"> </#if> - <#assign partyNameView = delegator.findOne("PartyNameView", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", custRequestItemNoteViewList.partyId), false)?if_exists/> + <#assign partyNameView = delegator.findOne("PartyNameView", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", custRequestItemNoteViewList.partyId), false)!/> <tr class="${row}"> <td> </td> @@ -92,7 +92,7 @@ under the License. ${custRequestItemNoteViewList.noteInfo} </td> <td > - ${partyNameView.groupName?if_exists} ${partyNameView.firstName?if_exists} ${partyNameView.lastName?if_exists} + ${partyNameView.groupName!} ${partyNameView.firstName!} ${partyNameView.lastName!} </td> <td> ${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)} Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl Mon Aug 18 07:42:27 2014 @@ -41,23 +41,23 @@ under the License. <#assign survey = productStoreSurveyAppl.getRelatedOne("Survey", false)> <tr> <form method="post" action="<@ofbizUrl>updateWorkEffortSurveyAppl</@ofbizUrl>" name="editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}"> - <td><a href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId?if_exists}" class="buttontext">${workEffortSurveyAppl.surveyId?if_exists} - ${survey.surveyName?if_exists}</a></td> - <td>${workEffortSurveyAppl.fromDate?if_exists}</td> + <td><a href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId!}" class="buttontext">${workEffortSurveyAppl.surveyId!} - ${survey.surveyName!}</a></td> + <td>${workEffortSurveyAppl.fromDate!}</td> <td> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> - <td><a href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId?if_exists}&workEffortId=${workEffortSurveyAppl.workEffortId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td> - <#if !isReadable?exists> - <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId?if_exists}"/> - <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId?if_exists}"/> - <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate?if_exists}"/> + <td><a href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId!}&workEffortId=${workEffortSurveyAppl.workEffortId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td> + <#if !isReadable??> + <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId!}"/> + <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId!}"/> + <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate!}"/> <td><input type="submit" name="submitBtn" value='${uiLabelMap.CommonUpdate}' /> </td> </form> <td> <form id="deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}" method="post" action="<@ofbizUrl>deleteWorkEffortSurveyAppl</@ofbizUrl>"> - <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId?if_exists}" /> - <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId?if_exists}" /> - <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate?if_exists}" /> + <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId!}" /> + <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId!}" /> + <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate!}" /> <a href="javascript:document.getElementById('deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}').submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl Mon Aug 18 07:42:27 2014 @@ -22,15 +22,15 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your backlog: <b>${custRequest.description?if_exists} [${custRequest.custRequestId}] - <#if informationMap.workEffortId?has_content><br />in sprint: <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if> - <#if informationMap.productId?has_content><br />of the product: <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</b></#if> + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your backlog: <b>${custRequest.description!} [${custRequest.custRequestId}] + <#if informationMap.workEffortId?has_content><br />in sprint: <b>${informationMap.workEffortName!} [${informationMap.workEffortId!}]</b></#if> + <#if informationMap.productId?has_content><br />of the product: <b>${informationMap.internalName!} [${informationMap.productId!}]</b></#if> <#if removedFromSprint = true> has been removed from sprint. <#else> has been received.</#if> <br /> <br /> <#if custRequest.fromPartyId == partyIdTo> - The complete information of this backlog/request can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId?if_exists}">here.....</a> + The complete information of this backlog/request can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId!}">here.....</a> <br /><br /> </#if> Regards.<br /><br /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/ActiveSprintNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/ActiveSprintNotification.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/ActiveSprintNotification.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/ActiveSprintNotification.ftl Mon Aug 18 07:42:27 2014 @@ -22,12 +22,12 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Sprint <b>${sprint.workEffortName?if_exists} [${sprint.workEffortId?if_exists}]</b> in project <b>${project.workEffortName?if_exists} [${project.workEffortId?if_exists}]</b> - of the product <b>${prodcut.internalName?if_exists} [${prodcut.productId?if_exists}]</b> has been started. + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Sprint <b>${sprint.workEffortName!} [${sprint.workEffortId!}]</b> in project <b>${project.workEffortName!} [${project.workEffortId!}]</b> + of the product <b>${prodcut.internalName!} [${prodcut.productId!}]</b> has been started. <br /> <br /> - The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewSprint?sprintId=${sprint.workEffortId?if_exists}">here.....</a> + The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewSprint?sprintId=${sprint.workEffortId!}">here.....</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl Mon Aug 18 07:42:27 2014 @@ -22,14 +22,14 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request <b>${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] </b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if> - <#if informationMap.productId?has_content>of the product <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</#if></b> has been CANCELLED. - <p>Reason for Cancellation: ${custRequest.reason?if_exists}</p> + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Customer Request <b>${custRequest.custRequestName!} [${custRequest.custRequestId}] </b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName!} [${informationMap.workEffortId!}]</b></#if> + <#if informationMap.productId?has_content>of the product <b>${informationMap.internalName!} [${informationMap.productId!}]</#if></b> has been CANCELLED. + <p>Reason for Cancellation: ${custRequest.reason!}</p> <br /> <br /> <#if custRequest.fromPartyId == partyIdTo> - The complete information about this request can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId?if_exists}">here.....</a> + The complete information about this request can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId!}">here.....</a> <br /><br /> </#if> Regards.<br /><br /> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |