svn commit: r1618554 [26/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [26/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. <td> <select name="group"> <#list groups as group> - <option value="${group}" <#if selGroup?exists><#if group = selGroup>selected="selected"</#if></#if>>${group}</option> + <option value="${group}" <#if selGroup??><#if group = selGroup>selected="selected"</#if></#if>>${group}</option> </#list> </select> </td> @@ -35,7 +35,7 @@ under the License. ${uiLabelMap.WebtoolsSqlCommand} </td> <td> - <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand?if_exists}</textarea> + <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand!}</textarea> </td> </tr> <tr> @@ -80,7 +80,7 @@ under the License. <#list records as record> <tr <#if alt_row> class="alternate-row"</#if> > <#list record as field> - <td>${field?if_exists}</td> + <td>${field!}</td> </#list> </tr> <#assign alt_row = !alt_row> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/ListGeneric.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/ListGeneric.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/ListGeneric.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/ListGeneric.ftl Mon Aug 18 07:42:27 2014 @@ -38,7 +38,7 @@ under the License. </#if> </td> <#list fieldList as field> - <td>${record.fields.get(field.name)?if_exists?string}</td> + <td>${record.fields.get(field.name)!?string}</td> </#list> </tr> <#assign alt_row = !alt_row> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/xmldsdump.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/xmldsdump.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if tobrowser?exists && tobrowser> +<#if tobrowser?? && tobrowser> <h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1> <br /> <p>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</p> @@ -59,7 +59,7 @@ under the License. <table class="basic-table"> <tr> <td class="label">${uiLabelMap.WebtoolsOutputDirectory}</td> - <td><input type="text" size="60" name="outpath" value="${parameters.outpath?if_exists}"/></td> + <td><input type="text" size="60" name="outpath" value="${parameters.outpath!}"/></td> </tr> <tr> <td class="label">${uiLabelMap.WebtoolsMaxRecordsPerFile}</td> @@ -67,7 +67,7 @@ under the License. </tr> <tr> <td class="label">${uiLabelMap.WebtoolsSingleFilename}</td> - <td><input type="text" size="60" name="filename" value="${parameters.filename?if_exists}"/></td> + <td><input type="text" size="60" name="filename" value="${parameters.filename!}"/></td> </tr> <tr> <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedSince}</td> @@ -90,7 +90,7 @@ under the License. <p>${uiLabelMap.WebtoolsEntityNames}:</p> <@displayButtonBar/> <div>${uiLabelMap.WebtoolsEntitySyncDump}: - <input name="entitySyncId" size="30" value="${entitySyncId?if_exists}"/> + <input name="entitySyncId" size="30" value="${entitySyncId!}"/> </div> ${uiLabelMap.WebtoolsPreConfiguredSet}: <select name="preConfiguredSetName"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. ${uiLabelMap.WebtoolsLabelManagerKey} </td> <td> - <input type="text" name="labelKey" size="30" maxlength="70" value="${parameters.labelKey?if_exists}" /> + <input type="text" name="labelKey" size="30" maxlength="70" value="${parameters.labelKey!}" /> </td> <td class="label"> ${uiLabelMap.WebtoolsLabelManagerComponentName} @@ -34,7 +34,7 @@ under the License. <select name="labelComponentName"> <option value="">${uiLabelMap.WebtoolsLabelManagerAllComponents}</option> <#list componentNamesFound as componentNameFound> - <option <#if parameters.labelComponentName?exists && parameters.labelComponentName == componentNameFound>selected="selected"</#if> value="${componentNameFound}">${componentNameFound}</option> + <option <#if parameters.labelComponentName?? && parameters.labelComponentName == componentNameFound>selected="selected"</#if> value="${componentNameFound}">${componentNameFound}</option> </#list> </select> </td> @@ -48,7 +48,7 @@ under the License. <option value="">${uiLabelMap.WebtoolsLabelManagerAllFiles}</option> <#list filesFound as fileInfo> <#assign fileName = fileInfo.getFileName()/> - <option <#if parameters.labelFileName?exists && parameters.labelFileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option> + <option <#if parameters.labelFileName?? && parameters.labelFileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option> </#list> </select> </td> @@ -59,7 +59,7 @@ under the License. <select name="labelLocaleName"> <option value="">${uiLabelMap.WebtoolsLabelManagerAllLocales}</option> <#list localesFound as localeFound> - <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/> + <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/> <#assign langAttr = localeFound.toString()?replace("_", "-")> <#assign langDir = "ltr"> <#if 1 < langAttr?length> @@ -67,7 +67,7 @@ under the License. <#assign langDir = "rtl"> </#if> </#if> - <option <#if parameters.labelLocaleName?exists && parameters.labelLocaleName == localeFound>selected="selected"</#if> value="${localeFound}" lang="${langAttr}" dir="${langDir}"><#if locale?exists && locale?has_content>${locale.getDisplayName(locale)}<#else>${localeFound}</#if></option> + <option <#if parameters.labelLocaleName?? && parameters.labelLocaleName == localeFound>selected="selected"</#if> value="${localeFound}" lang="${langAttr}" dir="${langDir}"><#if locale?? && locale?has_content>${locale.getDisplayName(locale)}<#else>${localeFound}</#if></option> </#list> </select> </td> @@ -77,13 +77,13 @@ under the License. ${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels} </td> <td> - <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> /> + <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> /> </td> <td class="label"> ${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations} </td> <td> - <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> /> + <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> /> </td> </tr> <tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl Mon Aug 18 07:42:27 2014 @@ -31,7 +31,7 @@ under the License. <tr> <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td> <td> - <#if parameters.sourceKey?exists> + <#if parameters.sourceKey??> ${parameters.sourceKey} <input type="hidden" name="key" value="${parameters.sourceKey}" /> <input type="hidden" name="update_label" value="Y" /> @@ -44,20 +44,20 @@ under the License. <tr> <td class="label">${uiLabelMap.WebtoolsLabelManagerKeyComment}</td> <td> - <input type="text" name="keyComment" size="70" value="${parameters.sourceKeyComment?if_exists}" /> + <input type="text" name="keyComment" size="70" value="${parameters.sourceKeyComment!}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td> <td> - <#if parameters.sourceFileName?exists> + <#if parameters.sourceFileName??> ${parameters.sourceFileName} <input type="hidden" name="fileName" value="${parameters.sourceFileName}" /> <#else> <select name="fileName"> <#list filesFound as fileInfo> <#assign fileName = fileInfo.file.getName()/> - <option <#if parameters.fileName?exists && parameters.fileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option> + <option <#if parameters.fileName?? && parameters.fileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option> </#list> </select> </#if> @@ -66,7 +66,7 @@ under the License. <tr> <td colspan="2" align="center"> <input type="submit" value="${uiLabelMap.CommonBack}"/> - <#if parameters.sourceKey?exists> + <#if parameters.sourceKey??> <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/> <input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/> <#else> @@ -78,21 +78,21 @@ under the License. <#list localesFound as localeFound> <#assign labelValue = ""> <#assign labelComment = ""> - <#if parameters.sourceKey?exists> - <#assign value = (label.getLabelValue(localeFound))?if_exists> + <#if parameters.sourceKey??> + <#assign value = (label.getLabelValue(localeFound))!> <#if value?has_content> <#assign labelValue = value.getLabelValue()> <#assign labelComment = value.getLabelComment()> </#if> </#if> <#assign showLocale = true> - <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound> + <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound> <#assign showLocale = false> </#if> <#if showLocale == true> <tr> - <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/> - <#if locale?exists && locale?has_content> + <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/> + <#if locale?? && locale?has_content> <#assign langAttr = localeFound.toString()?replace("_", "-")> <#assign langDir = "ltr"> <#if "ar.iw"?contains(langAttr?substring(0, 2))> @@ -106,8 +106,8 @@ under the License. </#if> <td> <input type="hidden" name="localeNames" value="${localeFound}" /> - <input type="text" name="localeValues" size="70" value="${labelValue?if_exists}" /> - <input type="text" name="localeComments" size="70" value="${labelComment?if_exists}" /> + <input type="text" name="localeValues" size="70" value="${labelValue!}" /> + <input type="text" name="localeComments" size="70" value="${labelComment!}" /> </td> </tr> </#if> @@ -115,7 +115,7 @@ under the License. <tr> <td colspan="2" align="center"> <input type="submit" value="${uiLabelMap.CommonBack}"/> - <#if parameters.sourceKey?exists> + <#if parameters.sourceKey??> <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/> <input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/> <#else> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl Mon Aug 18 07:42:27 2014 @@ -20,11 +20,11 @@ under the License. <table class="basic-table" cellspacing="3"> <tr> <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td> - <td>${parameters.sourceKey?if_exists}</td> + <td>${parameters.sourceKey!}</td> </tr> <tr> <td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td> - <td>${parameters.fileName?if_exists}</td> + <td>${parameters.fileName!}</td> </tr> <tr> <td colspan="2"> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <div class="screenlet-body"> - <#if parameters.searchLabels?exists> + <#if parameters.searchLabels??> <table class="basic-table hover-bar" cellspacing="3"> <tr class="header-row"> <td>${uiLabelMap.WebtoolsLabelManagerRow}</td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl Mon Aug 18 07:42:27 2014 @@ -25,12 +25,12 @@ under the License. <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td> <#list localesFound as localeFound> <#assign showLocale = true> - <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound> + <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound> <#assign showLocale = false> </#if> <#if showLocale == true> - <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/> - <#if locale?exists && locale?has_content> + <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/> + <#if locale?? && locale?has_content> <#assign langAttr = localeFound.toString()?replace("_", "-")> <#assign langDir = "ltr"> <#if "ar.iw"?contains(langAttr?substring(0, 2))> @@ -45,7 +45,7 @@ under the License. </#if> </#list> </tr> - <#if parameters.searchLabels?exists> + <#if parameters.searchLabels??> <#assign rowNum = "2"> <#assign rowNumber = 1> <#assign totalLabels = 0> @@ -56,43 +56,43 @@ under the License. <#assign label = labels.get(labelList)> <#assign labelKey = label.labelKey> <#assign totalLabels = totalLabels + 1> - <#if references?exists> + <#if references??> <#assign referenceNum = 0> - <#assign reference = references.get(labelKey)?if_exists> - <#if reference?exists && reference?has_content> + <#assign reference = references.get(labelKey)!> + <#if reference?? && reference?has_content> <#assign referenceNum = reference.size()> </#if> </#if> <#assign showLabel = true> - <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y" - && parameters.labelLocaleName?exists && parameters.labelLocaleName != ""> - <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)?if_exists> - <#if labelValue?exists && labelValue?has_content> - <#assign value = labelValue.getLabelValue()?if_exists> - <#if value?exists && value?has_content> + <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y" + && parameters.labelLocaleName?? && parameters.labelLocaleName != ""> + <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)!> + <#if labelValue?? && labelValue?has_content> + <#assign value = labelValue.getLabelValue()!> + <#if value?? && value?has_content> <#assign showLabel = false> </#if> </#if> </#if> - <#if showLabel && parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)> + <#if showLabel && parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)> <#assign showLabel = false> </#if> - <#if showLabel && parameters.labelKey?exists && parameters.labelKey != "" && parameters.labelKey != label.labelKey> + <#if showLabel && parameters.labelKey?? && parameters.labelKey != "" && parameters.labelKey != label.labelKey> <#assign showLabel = false> </#if> - <#if showLabel && parameters.labelFileName?exists && parameters.labelFileName != "" && parameters.labelFileName != label.fileName> + <#if showLabel && parameters.labelFileName?? && parameters.labelFileName != "" && parameters.labelFileName != label.fileName> <#assign showLabel = false> </#if> <#if showLabel == true> <tr <#if rowNum == "1">class="alternate-row"</#if>> <td>${rowNumber}</td> - <td><a href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&sourceFileName=${label.fileName}&sourceKeyComment=${label.labelKeyComment?if_exists}</@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td> + <td><a href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&sourceFileName=${label.fileName}&sourceKeyComment=${label.labelKeyComment!}</@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td> <td>${label.fileName}</td> <td><a href="<@ofbizUrl>ViewReferences?sourceKey=${labelKey}&labelFileName=${label.fileName}</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManagerReferences}</a></td> <#list localesFound as localeFound> - <#assign labelVal = label.getLabelValue(localeFound)?if_exists> + <#assign labelVal = label.getLabelValue(localeFound)!> <#assign showLocale = true> - <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound> + <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound> <#assign showLocale = false> </#if> <#if showLocale> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl Mon Aug 18 07:42:27 2014 @@ -20,7 +20,7 @@ under the License. <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td> - <td colspan="2">${parameters.sourceKey?if_exists}</td> + <td colspan="2">${parameters.sourceKey!}</td> </tr> <tr> <td colspan="3"> </td> @@ -30,17 +30,17 @@ under the License. <td>${uiLabelMap.WebtoolsLabelManagerFileName}</td> <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td> </tr> - <#if parameters.sourceKey?exists && parameters.sourceKey?has_content> + <#if parameters.sourceKey?? && parameters.sourceKey?has_content> <#assign rowNum = "2"> <#assign rowNumber = 1> <#assign totalRefs = 0/> - <#assign reference = references.get(parameters.sourceKey)?if_exists> - <#if reference?exists && reference?has_content> + <#assign reference = references.get(parameters.sourceKey)!> + <#if reference?? && reference?has_content> <#assign entries = reference.entrySet()> <#list entries as entry> <tr <#if rowNum == "1">class="alternate-row"</#if>> <td>${rowNumber}</td> - <td><a href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&sourceKey=${parameters.sourceKey?if_exists}</@ofbizUrl>">${entry.getKey()}</a></td> + <td><a href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&sourceKey=${parameters.sourceKey!}</@ofbizUrl>">${entry.getKey()}</a></td> <td>${entry.getValue()}</td> </tr> <#assign totalRefs = totalRefs + entry.getValue()/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/ping.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/ping.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/ping.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/ping.ftl Mon Aug 18 07:42:27 2014 @@ -17,5 +17,5 @@ specific language governing permissions under the License. --> -${requestAttributes._ERROR_MESSAGE_?if_exists} -${requestAttributes.message?if_exists} \ No newline at end of file +${requestAttributes._ERROR_MESSAGE_!} +${requestAttributes.message!} \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/availableservices.ftl Mon Aug 18 07:42:27 2014 @@ -23,8 +23,8 @@ under the License. <#assign popupUrl='serviceEcaDetail'> <#-- Selected Service is available --> -<#if selectedServiceMap?exists> - <#if showWsdl?exists && showWsdl = true> +<#if selectedServiceMap??> + <#if showWsdl?? && showWsdl = true> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.WebtoolsServiceWSDL} - ${uiLabelMap.WebtoolsService} ${selectedServiceMap.serviceName}</h3> @@ -134,7 +134,7 @@ under the License. </div> <#-- If service has ECA's --> - <#if ecaMapList?exists && ecaMapList?has_content> + <#if ecaMapList?? && ecaMapList?has_content> <#-- add the javascript for modalpopup's --> <script language='javascript' type='text/javascript'> function detailsPopup(viewName){ @@ -152,10 +152,10 @@ under the License. <table class="basic-table" cellspacing='0'> <tr class="header-row"> <td>${uiLabelMap.WebtoolsEventName}</td> - <#if ecaMapList.runOnError?exists> + <#if ecaMapList.runOnError??> <td>${uiLabelMap.WebtoolsRunOnError}</td> </#if> - <#if ecaMapList.runOnFailure?exists> + <#if ecaMapList.runOnFailure??> <td>${uiLabelMap.WebtoolsRunOnFailure}</td> </#if> <td>${uiLabelMap.WebtoolsActions}</td> @@ -164,11 +164,11 @@ under the License. </tr> <#list ecaMapList as ecaMap> <tr> - <td>${ecaMap.eventName?if_exists}</td> - <#if ecaMap.runOnError?exists> + <td>${ecaMap.eventName!}</td> + <#if ecaMap.runOnError??> <td>${ecaMap.runOnError}</div></td> </#if> - <#if ecaMap.runOnFailure?exists> + <#if ecaMap.runOnFailure??> <td>${ecaMap.runOnFailure}</div></td> </#if> <#if ecaMap.actions?has_content> @@ -271,7 +271,7 @@ under the License. </#if> <#-- End if service has ECA's --> - <#list selectedServiceMap.allParamsList?if_exists as paramList> + <#list selectedServiceMap.allParamsList! as paramList> <style type="text/css"> .param-table tr td { width: 12.5%; @@ -282,7 +282,7 @@ under the License. <div class="screenlet-title-bar"> <h3>${paramList.title}</h3> </div> - <#if paramList.paramList?exists && paramList.paramList?has_content> + <#if paramList.paramList?? && paramList.paramList?has_content> <table class="basic-table param-table" cellspacing='0'> <tr class="header-row"> <td>${uiLabelMap.WebtoolsParameterName}</td> @@ -297,19 +297,19 @@ under the License. </tr> <#list paramList.paramList as modelParam> <tr> - <td>${modelParam.name?if_exists}</td> - <td>${modelParam.description?if_exists}</td> - <td>${modelParam.optional?if_exists}</td> - <td>${modelParam.type?if_exists}</td> - <#-- <td>[${modelParam.defaultValue?if_exists}]</td> --> - <td>${modelParam.mode?if_exists}</td> - <td>${modelParam.internal?if_exists}</td> + <td>${modelParam.name!}</td> + <td>${modelParam.description!}</td> + <td>${modelParam.optional!}</td> + <td>${modelParam.type!}</td> + <#-- <td>[${modelParam.defaultValue!}]</td> --> + <td>${modelParam.mode!}</td> + <td>${modelParam.internal!}</td> <td> - <#if modelParam.entityName?exists> - <a href='<@ofbizUrl>${url}?constraint=default_entity_name@${modelParam.entityName}</@ofbizUrl>'>${modelParam.entityName?if_exists}</a> + <#if modelParam.entityName??> + <a href='<@ofbizUrl>${url}?constraint=default_entity_name@${modelParam.entityName}</@ofbizUrl>'>${modelParam.entityName!}</a> </#if> </td> - <td>${modelParam.fieldName?if_exists}</td> + <td>${modelParam.fieldName!}</td> </tr> </#list> </table> @@ -326,16 +326,16 @@ under the License. <form name="exportServiceEoModelBundle" method="post" action="<@ofbizUrl>exportServiceEoModelBundle</@ofbizUrl>" class="basic-form"> <input type="hidden" name="sel_service_name" value="${selectedServiceMap.serviceName}"/> <input type="hidden" name="serviceName" value="${selectedServiceMap.serviceName}"/> - Save eomodeld to Local Path: <input type="text" name="eomodeldFullPath" value="${parameters.eomodeldFullPath?if_exists}" size="60"/> + Save eomodeld to Local Path: <input type="text" name="eomodeldFullPath" value="${parameters.eomodeldFullPath!}" size="60"/> <input type="submit" name="submitButton" value="Export"/> </form> </div> </#if> <#-- No Service selected , we list all--> -<#elseif servicesList?exists && servicesList?has_content> +<#elseif servicesList?? && servicesList?has_content> <#-- Show alphabetical index --> - <#if serviceNamesAlphaList?exists && serviceNamesAlphaList?has_content> + <#if serviceNamesAlphaList?? && serviceNamesAlphaList?has_content> <div class="button-bar"> <#assign isfirst=true> <#list serviceNamesAlphaList as alpha> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl Mon Aug 18 07:42:27 2014 @@ -32,12 +32,12 @@ under the License. <#list serviceResultList as srl> <tr> <#if srl.hasChild=="Y"> - <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></td> + <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}">${srl.key!}</a></td> <#else> - <td>${srl.key?if_exists}</td> + <td>${srl.key!}</td> </#if> - <td>${srl.value?if_exists}</td> - <td><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></td> + <td>${srl.value!}</td> + <td><input type="checkbox" name="<#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}" /></td> </tr> </#list> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameter.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameter.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameter.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameter.ftl Mon Aug 18 07:42:27 2014 @@ -27,7 +27,7 @@ under the License. <tr> <td class="label">${serviceParameter.name} (${serviceParameter.type})</td> <td> - <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}" <#if serviceParameter.optional == "N">class="required"</#if>/> + <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value!}" <#if serviceParameter.optional == "N">class="required"</#if>/> <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if> <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue}</#if> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl Mon Aug 18 07:42:27 2014 @@ -27,7 +27,7 @@ under the License. <tr> <td class="label">${serviceParameter.name} (${serviceParameter.type})</td> <td> - <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value?if_exists>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/> + <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value??>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/> <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if> <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue?string}</#if> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/threads.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/threads.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/threads.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/threads.ftl Mon Aug 18 07:42:27 2014 @@ -31,19 +31,19 @@ under the License. </tr> <#assign alt_row = false> <#list allThreadList as javaThread> - <#if javaThread?exists> + <#if javaThread??> <#assign stackTraceArray = javaThread.getStackTrace()/> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td valign="top">${(javaThread.getThreadGroup().getName())?if_exists}</td> + <td valign="top">${(javaThread.getThreadGroup().getName())!}</td> <td valign="top">${javaThread.getId()?string}</td> <td valign="top"> - <b>${javaThread.getName()?if_exists}</b> + <b>${javaThread.getName()!}</b> <#list 1..maxElements as stackIdx> - <#assign stackElement = stackTraceArray[stackIdx]?if_exists/> + <#assign stackElement = stackTraceArray[stackIdx]!/> <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if> </#list> </td> - <td valign="top">${javaThread.getState().name()?if_exists} </td> + <td valign="top">${javaThread.getState().name()!} </td> <td valign="top">${javaThread.getPriority()}</td> <td valign="top">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl Mon Aug 18 07:42:27 2014 @@ -37,12 +37,12 @@ under the License. <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)> <tr> <td class="label">${uiLabelMap.CommonDescription}</td> - <td><input type="text" name="description" value="${temporalExpression.description?if_exists}" maxlength="60" size="20"/></td> + <td><input type="text" name="description" value="${temporalExpression.description!}" maxlength="60" size="20"/></td> </tr> <#else> <tr> <td class="label">${uiLabelMap.CommonDescription}</td> - <td>${temporalExpression.get("description",locale)?if_exists}</td> + <td>${temporalExpression.get("description",locale)!}</td> </tr> </#if> <#if temporalExpression.tempExprTypeId == "DATE_RANGE"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvFormMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#macro renderField text><#if text?exists>"${text?replace("\"", "\"\"")}"</#if></#macro> +<#macro renderField text><#if text??>"${text?replace("\"", "\"\"")}"</#if></#macro> <#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams=""> <@renderField description />,<#rt/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvScreenMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvScreenMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/csvScreenMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -40,7 +40,7 @@ under the License. <#macro renderHorizontalSeparator id style></#macro> <#macro renderLabel text id style> - <#if text?exists> + <#if text??> ${text}<#lt/> </#if> </#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/foFormMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -39,9 +39,9 @@ under the License. <#escape x as x?xml> -<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text?exists>${text}</#if></fo:block></#macro> +<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text??>${text}</#if></fo:block></#macro> -<#macro renderField text><#if text?exists>${text}</#if></#macro> +<#macro renderField text><#if text??>${text}</#if></#macro> <#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams=""> <@makeBlock class description /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <#macro renderField text> - <#if text?exists> + <#if text??> ${text}<#lt/> </#if> </#macro> @@ -125,34 +125,34 @@ under the License. if (Date.CultureInfo != undefined) { var initDate = <#if value?has_content>jQuery("#${id}_i18n").val()<#else>""</#if>; if (initDate != "") { - var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>; + var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>; <#-- bad hack because the JS date parser doesn't understand dots in the date / time string --> if (initDate.indexOf('.') != -1) { initDate = initDate.substring(0, initDate.indexOf('.')); } - var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; + var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; var dateObj = Date.parseExact(initDate, ofbizTime); var formatedObj = dateObj.toString(dateFormat); jQuery("#${id}_i18n").val(formatedObj); } jQuery("#${id}").change(function() { - var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; + var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; var newValue = "" if (this.value != "") { var dateObj = Date.parseExact(this.value, ofbizTime); - var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>; + var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>; newValue = dateObj.toString(dateFormat); } jQuery("#${id}_i18n").val(newValue); }); jQuery("#${id}_i18n").change(function() { - var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>, + var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>, newValue = "", dateObj = Date.parseExact(this.value, dateFormat), ofbizTime; if (this.value != "" && dateObj !== null) { - ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; + ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; newValue = dateObj.toString(ofbizTime); } else { // invalid input @@ -170,7 +170,7 @@ under the License. }); } - <#if shortDateInput?exists && shortDateInput> + <#if shortDateInput?? && shortDateInput> jQuery("#${id}").datepicker({ <#else> jQuery("#${id}").datetimepicker({ @@ -296,7 +296,7 @@ under the License. <#if confirmation?has_content>onclick="return confirm('${confirmation?js_string}');"</#if>/> <#else> <input type="<#if containerId?has_content>button<#else>submit</#if>" <@renderClass className alert /> - <#if name?exists> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if> + <#if name??> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if> <#if containerId?has_content> onclick="<#if confirmation?has_content>if (confirm('${confirmation?js_string}')) </#if>ajaxSubmitFormUpdateAreas('${containerId}', '${ajaxUrl}')" <#else><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}');"</#if> </#if>/> @@ -517,7 +517,7 @@ under the License. </span><#rt/> </#if> <#rt/> - <input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/> + <input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle??> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/> <#if dateType != "time"> <script type="text/javascript"> <#if dateType == "date"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -46,17 +46,17 @@ under the License. <#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && enableEditValue == "true"><div class=${editContainerStyle}></#if></#macro> <#macro renderContentBody></#macro> <#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue> -<#if editRequest?exists && enableEditValue == "true"> -<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if> -<#if editContainerStyle?exists></div><#rt/></#if> +<#if editRequest?? && enableEditValue == "true"> +<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if> +<#if editContainerStyle??></div><#rt/></#if> </#if> </#macro> -<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?exists && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro> +<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?? && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro> <#macro renderSubContentBody></#macro> <#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue> -<#if editRequest?exists && enableEditValue == "true"> -<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if> -<#if editContainerStyle?exists></div><#rt/></#if> +<#if editRequest?? && enableEditValue == "true"> +<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if> +<#if editContainerStyle??></div><#rt/></#if> </#if> </#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textFormMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#macro renderField text><#if text?exists>"${text}"</#if></#macro> +<#macro renderField text><#if text??>"${text}"</#if></#macro> <#macro renderDisplayField type imageLocation idName description class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams=""> <@renderField description /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textScreenMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textScreenMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/textScreenMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -40,7 +40,7 @@ under the License. <#macro renderHorizontalSeparator id style></#macro> <#macro renderLabel text id style> - <#if text?exists> + <#if text??> ${text}<#lt/> </#if> </#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/xmlFormMacroLibrary.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#macro renderField text><#if text?exists>${text?xml}</#if></#macro> +<#macro renderField text><#if text??>${text?xml}</#if></#macro> <#macro renderFormatListWrapperOpen formName style columnStyles><${formName}Export></#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl Mon Aug 18 07:42:27 2014 @@ -41,25 +41,25 @@ under the License. <#if fixedAsset.fixedAssetName?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetName}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${fixedAsset.fixedAssetName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${fixedAsset.fixedAssetName!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if fixedAsset.serialNumber?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_serialNumber}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${fixedAsset.serialNumber?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${fixedAsset.serialNumber!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if fixedAsset.locatedAtFacilityId?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_locatedAtFacilityId}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${maintenance.facilityName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${maintenance.facilityName!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if fixedAssetIdentValue?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetIdents}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${fixedAssetIdentValue?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${fixedAssetIdentValue!}</fo:block></fo:table-cell> </fo:table-row> </#if> </#if> @@ -87,23 +87,23 @@ under the License. <#if productMaintName?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonName}</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${productMaintName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${productMaintName!}</fo:block></fo:table-cell> </fo:table-row> </#if> <#if productMaintTypeDesc?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetMaintType}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${productMaintTypeDesc?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${productMaintTypeDesc!}</fo:block></fo:table-cell> </fo:table-row> </#if> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${fixedAssetMaint.intervalQuantity?if_exists} ${intervalUomDesc?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${fixedAssetMaint.intervalQuantity!} ${intervalUomDesc!}</fo:block></fo:table-cell> </fo:table-row> <#if productMeterTypeDesc?has_content> <fo:table-row> <fo:table-cell><fo:block>Meter type</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${productMeterTypeDesc?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${productMeterTypeDesc!}</fo:block></fo:table-cell> </fo:table-row> </#if> </#if> @@ -138,7 +138,7 @@ under the License. <fo:table-cell><fo:block></fo:block></fo:table-cell> </#if> </fo:table-row> - <#assign workEffortPurposeType = scheduleWorkEffort.getRelatedOne("WorkEffortPurposeType", false)?if_exists> + <#assign workEffortPurposeType = scheduleWorkEffort.getRelatedOne("WorkEffortPurposeType", false)!> <#if workEffortPurposeType?has_content> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_workEffortPurposeTypeId}</fo:block></fo:table-cell> @@ -147,11 +147,11 @@ under the License. </#if> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonName}</fo:block></fo:table-cell> - <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.workEffortName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.workEffortName!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonDescription}</fo:block></fo:table-cell> - <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.description?if_exists}</fo:block></fo:table-cell> + <fo:table-cell number-columns-spanned="3"><fo:block font-weight="bold">${scheduleWorkEffort.description!}</fo:block></fo:table-cell> </fo:table-row> </#if> </fo:table-body> @@ -170,13 +170,13 @@ under the License. </fo:table-header> <fo:table-body> <#list itemIssuanceList as itemIssuance> - <#assign productId = itemIssuance.productId?if_exists> + <#assign productId = itemIssuance.productId!> <#assign quantity = itemIssuance.quantity?default(0)> <fo:table-row> <fo:table-cell> <fo:block> - <#if productId?exists> - ${itemIssuance.productId?default("N/A")} - ${itemIssuance.internalName?if_exists} - ${itemIssuance.description?if_exists} - ${itemIssuance.comments?if_exists} + <#if productId??> + ${itemIssuance.productId?default("N/A")} - ${itemIssuance.internalName!} - ${itemIssuance.description!} - ${itemIssuance.comments!} </#if> </fo:block> </fo:table-cell> @@ -202,7 +202,7 @@ under the License. <fo:block>Author : ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</fo:block> <fo:block>Date : ${note.noteDateTime?string.short}</fo:block> <#escape x as x?html> - <fo:block>${note.noteInfo?if_exists}</fo:block> + <fo:block>${note.noteInfo!}</fo:block> </#escape> </fo:table-cell> </fo:table-row> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"> -<#if locale?exists> +<#if locale??> <#assign initialLocale = locale.toString()> <#else> <#assign initialLocale = "en"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/MainDecorator.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/MainDecorator.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/MainDecorator.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/MainDecorator.ftl Mon Aug 18 07:42:27 2014 @@ -17,9 +17,9 @@ specific language governing permissions under the License. --> -${(decoratedContent.subcontent.htmlHead)?default((thisContent.subcontent.htmlHead)?if_exists)} -${(decoratedContent.subcontent.header)?default((thisContent.subcontent.header)?if_exists)} +${(decoratedContent.subcontent.htmlHead)?default((thisContent.subcontent.htmlHead)!)} +${(decoratedContent.subcontent.header)?default((thisContent.subcontent.header)!)} ${decoratedContent} -${(decoratedContent.subcontent.footer)?default((thisContent.subcontent.footer)?if_exists)} +${(decoratedContent.subcontent.footer)?default((thisContent.subcontent.footer)!)} Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl Mon Aug 18 07:42:27 2014 @@ -65,14 +65,14 @@ under the License. <input type="hidden" name="noConditionFind" value="Y"/> <table cellspacing="0" class="basic-table"> <#if searchCategory?has_content> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}"/> <tr> <td class="label" align="right" valign="middle"> ${uiLabelMap.ProductCategory}: </td> <td valign="middle"> <div> - <b>"${(searchCategory.description)?if_exists}" [${(searchCategory.productCategoryId)?if_exists}]</b> ${uiLabelMap.ProductIncludeSubCategories} + <b>"${(searchCategory.description)!}" [${(searchCategory.productCategoryId)!}]</b> ${uiLabelMap.ProductIncludeSubCategories} ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/> ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/> </div> @@ -92,7 +92,7 @@ under the License. <#if (18 < displayDesc?length)> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> - <option value="${productStore.productStoreId}" <#if productStoreId?if_exists == productStore.productStoreId> selected="selected"</#if>>${displayDesc} [${productStore.productStoreId}]</option> + <option value="${productStore.productStoreId}" <#if productStoreId! == productStore.productStoreId> selected="selected"</#if>>${displayDesc} [${productStore.productStoreId}]</option> </#list> </#if> </select> @@ -111,7 +111,7 @@ under the License. <#if (18 < displayDesc?length)> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> - <option value="${prodCatalog.prodCatalogId}" <#if searchCatalogId?if_exists == prodCatalog.prodCatalogId> selected="selected"</#if>>${displayDesc} [${prodCatalog.prodCatalogId}]</option> + <option value="${prodCatalog.prodCatalogId}" <#if searchCatalogId! == prodCatalog.prodCatalogId> selected="selected"</#if>>${displayDesc} [${prodCatalog.prodCatalogId}]</option> </#list> </select> <span id="catalogErrorMessage" style="display:none;" class="errorMessage">${uiLabelMap.CommonRequired}</span> @@ -137,7 +137,7 @@ under the License. </#list> </select> <#else> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advToKeywordSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="advToKeywordSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> </#if> ${uiLabelMap.ProductIncludeSubCategories} ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /> @@ -155,7 +155,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PRODUCT_NAME" size="20" value="${requestParameters.SEARCH_PRODUCT_NAME?if_exists}" /> + <input type="text" name="SEARCH_PRODUCT_NAME" size="20" value="${requestParameters.SEARCH_PRODUCT_NAME!}" /> </div> </td> </tr> @@ -165,7 +165,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" value="${requestParameters.SEARCH_INTERNAL_PROD_NAME?if_exists}" /> + <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" value="${requestParameters.SEARCH_INTERNAL_PROD_NAME!}" /> </div> </td> </tr> @@ -175,7 +175,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}" /> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" /> ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /> ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /> </div> @@ -187,19 +187,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="N" /> @@ -212,19 +212,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="N" /> </div> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3?if_exists}" /> + <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="N" /> @@ -237,19 +237,19 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1?if_exists}" /> + <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="N" /> </div> <div> - <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2?if_exists}" /> + <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="N" /> </div> <div> - <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3?if_exists}" /> + <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="Y" /> ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="N" /> @@ -262,8 +262,8 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW?if_exists}" /> - <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH?if_exists}" /> + <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW!}" /> + <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH!}" /> </div> </td> </tr> @@ -273,7 +273,7 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId] /> <tr> <td class="label" align="right" valign="middle"> - ${(productFeatureType.get("description",locale))?if_exists}: + ${(productFeatureType.get("description",locale))!}: </td> <td valign="middle"> <div> @@ -296,7 +296,7 @@ under the License. <select name="SEARCH_SUPPLIER_ID"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail> - <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option> + <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}]</option> </#list> </select> </div> @@ -331,7 +331,7 @@ under the License. ${uiLabelMap.ProductPrioritizeProductsInCategory}: </td> <td valign="middle"> - <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID?if_exists}" formName="advToKeywordSearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID!}" formName="advToKeywordSearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/> </td> </tr> <tr> @@ -342,7 +342,7 @@ under the License. <select name="SEARCH_GOOD_IDENTIFICATION_TYPE"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list goodIdentificationTypes as goodIdentificationType> - <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")?if_exists}</option> + <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")!}</option> </#list> </select> </td> @@ -352,7 +352,7 @@ under the License. ${uiLabelMap.ProductGoodIdentificationValue}: </td> <td> - <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE?if_exists}" /> + <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE!}" /> ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked" /> ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N" /> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. <div><a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>${searchConstraintString}</div> </#list> <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString} - <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> + <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> <#if !productIds?has_content> <div><h2>${uiLabelMap.ProductNoResultsFound}.</h2></div> @@ -76,8 +76,8 @@ under the License. <@paginationPanel /> <form method="post" name="products" action=""> <fieldset> - <input type="hidden" name="productStoreId" value="${parameters.productStoreId?if_exists}" /> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}" /> + <input type="hidden" name="productStoreId" value="${parameters.productStoreId!}" /> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${(requestParameters.SEARCH_CATEGORY_ID)!}" /> <table class="basic-table border-top border-bottom"> <#assign listIndex = lowIndex /> <#assign altRow = false /> @@ -87,7 +87,7 @@ under the License. <tr <#if altRow> class="alternate-row"</#if>> <td> <input type="checkbox" name="selectResult" value="${productId}"/> - <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)?if_exists}</a> + <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)!}</a> </td> </tr> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl Mon Aug 18 07:42:27 2014 @@ -19,7 +19,7 @@ under the License. <script language="JavaScript" type="text/javascript"> function exportToEbay() { - <#if toEbayStore?exists> + <#if toEbayStore??> document.products.action="<@ofbizUrl>prepareProductListing</@ofbizUrl>"; <#else> document.products.action="<@ofbizUrl>ProductsExportToEbay</@ofbizUrl>"; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |