From 692e763e4391169a06bb832a0fec5a42f16534fc Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 13 Oct 2015 19:45:33 +0200 Subject: [PATCH] WW-2891 Replaces deprecated Freemarker's operators --- .../tags/non-ui/actionPrefix/actionPrefix.ftl | 2 +- .../tags/non-ui/actionPrefix/methodPrefix.ftl | 2 +- .../actionPrefix/redirectActionPrefix.ftl | 2 +- .../resources/template/css_xhtml/checkbox.ftl | 14 ++++---- .../template/css_xhtml/controlfooter.ftl | 6 ++-- .../template/css_xhtml/controlheader-core.ftl | 8 ++--- .../template/css_xhtml/controlheader.ftl | 2 +- .../template/css_xhtml/form-validate.ftl | 2 +- .../resources/template/css_xhtml/reset.ftl | 4 +-- .../template/css_xhtml/submit-close.ftl | 2 +- .../resources/template/css_xhtml/submit.ftl | 2 +- .../resources/template/simple/a-close.ftl | 4 +-- .../resources/template/simple/actionerror.ftl | 4 +-- .../template/simple/actionmessage.ftl | 4 +-- .../template/simple/checkboxlist.ftl | 6 ++-- .../resources/template/simple/combobox.ftl | 10 +++--- .../main/resources/template/simple/debug.ftl | 4 +-- .../template/simple/doubleselect.ftl | 6 ++-- .../resources/template/simple/form-close.ftl | 12 +++---- .../template/simple/optiontransferselect.ftl | 36 +++++++++---------- .../template/simple/submit-close.ftl | 2 +- .../main/resources/template/simple/token.ftl | 4 +-- .../template/simple/updownselect.ftl | 12 +++---- .../resources/template/xhtml/checkbox.ftl | 22 ++++++------ .../main/resources/template/xhtml/control.ftl | 2 +- .../template/xhtml/controlfooter.ftl | 4 +-- .../template/xhtml/controlheader-core.ftl | 12 +++---- .../resources/template/xhtml/form-close.ftl | 2 +- .../template/xhtml/form-validate.ftl | 2 +- .../main/resources/template/xhtml/form.ftl | 4 +-- .../main/resources/template/xhtml/tooltip.ftl | 4 +-- .../resources/config-browser/showConfig.ftl | 2 +- 32 files changed, 102 insertions(+), 102 deletions(-) diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl index 412e37069..0faa3a9e8 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl @@ -13,7 +13,7 @@

You have come to this page because you used an action prefix.

-

The text you've entered is ${text?default('')?html}

+

The text you've entered is ${text!''?html}

<@s.a href="javascript:history.back();" cssClass="btn btn-info"> Back diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl index 702ca71d6..744f7fa3f 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl @@ -13,7 +13,7 @@

You have come to this page because you used an method prefix.

-

The text you've enter is ${text?default('')?html}

+

The text you've enter is ${text!''?html}

<@s.a href="javascript:history.back();" cssClass="btn btn-info"> Back diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl index f0bd957be..4dd06d7d1 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl @@ -16,7 +16,7 @@

Because this is a redirect-action, the text will be lost, due to a redirection implies a new request being issued from the client.

- The text you've enter is ${text?default('')?html}

+ The text you've enter is ${text!''?html}

<@s.a href="javascript:history.back();" cssClass="btn btn-info"> Back diff --git a/core/src/main/resources/template/css_xhtml/checkbox.ftl b/core/src/main/resources/template/css_xhtml/checkbox.ftl index 004f67471..c89f764aa 100644 --- a/core/src/main/resources/template/css_xhtml/checkbox.ftl +++ b/core/src/main/resources/template/css_xhtml/checkbox.ftl @@ -46,7 +46,7 @@ lables <#elseif parameters.labelposition??> <#assign labelpos = parameters.labelposition/> -<#if labelpos?default("") == 'left'> +<#if labelpos!"" == 'left'> <#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> @@ -62,26 +62,26 @@ lables -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>

<#else> <#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/> class="wwctrl"> -<#if parameters.required?default(false)> +<#if parameters.required!false> *<#t/> <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> -<#if labelpos?default("") != 'left'> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"") != 'left'> +<#if (labelpos!"top") == 'top'>
<#rt/> <#else> <#rt/> <#if parameters.label??> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#else> @@ -100,7 +100,7 @@ lables <#if parameters.label??> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#rt/> <#else> <#rt/> diff --git a/core/src/main/resources/template/css_xhtml/controlfooter.ftl b/core/src/main/resources/template/css_xhtml/controlfooter.ftl index 2783a0ba0..fef73cee6 100644 --- a/core/src/main/resources/template/css_xhtml/controlfooter.ftl +++ b/core/src/main/resources/template/css_xhtml/controlfooter.ftl @@ -20,19 +20,19 @@ * under the License. */ --> -${parameters.after?if_exists}<#t/> +${parameters.after!}<#t/> <#lt/> <#if !parameters.labelposition?? && (parameters.form.labelposition)??> <#assign labelpos = parameters.form.labelposition/> <#elseif parameters.labelposition??> <#assign labelpos = parameters.labelposition/> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'> <#rt/> <#else> <#rt/> -<#if parameters.errorposition?default("top") == 'bottom'> +<#if (parameters.errorposition!"top") == 'bottom'> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> <#if hasFieldErrors>
<#if parameters.id??>id="wwerr_${parameters.id}"<#rt/> class="wwerr"> diff --git a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl index 2a5c98b55..0c93113a1 100644 --- a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl @@ -27,7 +27,7 @@ <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
<#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/> class="wwgrp"> -<#if parameters.errorposition?default("top") == 'top'> +<#if (parameters.errorposition!"top") == 'top'> <#if hasFieldErrors>
<#if parameters.id??>id="wwerr_${parameters.id}"<#rt/> class="wwerr"> <#list fieldErrors[parameters.name] as error> @@ -49,7 +49,7 @@ <#assign labelpos = parameters.labelposition/> <#if parameters.label??> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#else> @@ -65,13 +65,13 @@ class="label"<#t/> ><#t/> -<#if parameters.required?default(false)> +<#if parameters.required!false> *<#t/> ${parameters.label?html}${parameters.labelseparator!":"?html} <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> <#t/> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>

<#rt/> <#else> <#rt/> diff --git a/core/src/main/resources/template/css_xhtml/controlheader.ftl b/core/src/main/resources/template/css_xhtml/controlheader.ftl index 9e4737790..bc27a672f 100644 --- a/core/src/main/resources/template/css_xhtml/controlheader.ftl +++ b/core/src/main/resources/template/css_xhtml/controlheader.ftl @@ -26,7 +26,7 @@ <#elseif parameters.labelposition??> <#assign labelpos = parameters.labelposition/> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#else> diff --git a/core/src/main/resources/template/css_xhtml/form-validate.ftl b/core/src/main/resources/template/css_xhtml/form-validate.ftl index e62cd8d99..dac513e82 100644 --- a/core/src/main/resources/template/css_xhtml/form-validate.ftl +++ b/core/src/main/resources/template/css_xhtml/form-validate.ftl @@ -20,7 +20,7 @@ * under the License. */ --> -<#if parameters.validate?default(false) == true> +<#if parameters.validate!false == true> <#if parameters.onsubmit??> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")} diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl index 9c3a40af3..8cb50a929 100644 --- a/core/src/main/resources/template/css_xhtml/reset.ftl +++ b/core/src/main/resources/template/css_xhtml/reset.ftl @@ -25,7 +25,7 @@ <#elseif parameters.labelposition??> <#assign labelpos = parameters.labelposition/> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#else> @@ -36,7 +36,7 @@ ><#t/> <#include "/${parameters.templateDir}/simple/reset.ftl" /> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#t/> <#else> <#t/> diff --git a/core/src/main/resources/template/css_xhtml/submit-close.ftl b/core/src/main/resources/template/css_xhtml/submit-close.ftl index 15c608af4..c275e4d26 100644 --- a/core/src/main/resources/template/css_xhtml/submit-close.ftl +++ b/core/src/main/resources/template/css_xhtml/submit-close.ftl @@ -4,7 +4,7 @@ <#elseif parameters.labelposition??> <#assign labelpos = parameters.labelposition/> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#t/> <#else> <#t/> diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl index 1611ffb5f..d7173253a 100644 --- a/core/src/main/resources/template/css_xhtml/submit.ftl +++ b/core/src/main/resources/template/css_xhtml/submit.ftl @@ -25,7 +25,7 @@ <#elseif parameters.labelposition??> <#assign labelpos = parameters.labelposition/> -<#if labelpos?default("top") == 'top'> +<#if (labelpos!"top") == 'top'>
<#else> diff --git a/core/src/main/resources/template/simple/a-close.ftl b/core/src/main/resources/template/simple/a-close.ftl index 84b5aaeb4..f2f58e6fb 100644 --- a/core/src/main/resources/template/simple/a-close.ftl +++ b/core/src/main/resources/template/simple/a-close.ftl @@ -21,10 +21,10 @@ */ --> -<#if parameters.id?if_exists != ""> +<#if parameters.id??> id="${parameters.id?html}"<#rt/> -<#if parameters.href?if_exists != ""> +<#if parameters.href??> href="${parameters.href}"<#rt/> <#if parameters.tabindex??> diff --git a/core/src/main/resources/template/simple/actionerror.ftl b/core/src/main/resources/template/simple/actionerror.ftl index 6563876d4..6164a4419 100644 --- a/core/src/main/resources/template/simple/actionerror.ftl +++ b/core/src/main/resources/template/simple/actionerror.ftl @@ -22,7 +22,7 @@ --> <#if (actionErrors?? && actionErrors?size > 0)> -<#if parameters.id?if_exists != ""> +<#if parameters.id??> id="${parameters.id?html}"<#rt/> <#if parameters.cssClass??> @@ -35,7 +35,7 @@ > <#list actionErrors as error> - <#if error?if_exists != ""> + <#if error??>
  • <#if parameters.escape>${error!?html}<#else>${error!}<#rt/>
    • <#rt/> diff --git a/core/src/main/resources/template/simple/actionmessage.ftl b/core/src/main/resources/template/simple/actionmessage.ftl index 07174dd20..f5b02e595 100644 --- a/core/src/main/resources/template/simple/actionmessage.ftl +++ b/core/src/main/resources/template/simple/actionmessage.ftl @@ -22,7 +22,7 @@ --> <#if (actionMessages?? && actionMessages?size > 0 && !parameters.isEmptyList)> -<#if parameters.id?if_exists != ""> +<#if parameters.id??> id="${parameters.id?html}"<#rt/> <#if parameters.cssClass??> @@ -35,7 +35,7 @@ > <#list actionMessages as message> - <#if message?if_exists != ""> + <#if message??>
  • <#if parameters.escape>${message!?html}<#else>${message!}
    • diff --git a/core/src/main/resources/template/simple/checkboxlist.ftl b/core/src/main/resources/template/simple/checkboxlist.ftl index d50a98fa3..4f262ecaf 100644 --- a/core/src/main/resources/template/simple/checkboxlist.ftl +++ b/core/src/main/resources/template/simple/checkboxlist.ftl @@ -72,21 +72,21 @@ <#if parameters.disabled!false> disabled="disabled"<#rt/> - <#if itemCssClass! != ""> + <#if itemCssClass??> class="${itemCssClass?html}"<#rt/> <#else> <#if parameters.cssClass?has_content> class="${parameters.cssClass?html}"<#rt/> - <#if itemCssStyle! != ""> + <#if itemCssStyle??> style="${itemCssStyle?html}"<#rt/> <#else> <#if parameters.cssStyle?has_content> style="${parameters.cssStyle?html}"<#rt/> - <#if itemTitle! != ""> + <#if itemTitle??> title="${itemTitle?html}"<#rt/> <#else> <#if parameters.title?has_content> diff --git a/core/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl index 760ad7116..a9ef547d0 100644 --- a/core/src/main/resources/template/simple/combobox.ftl +++ b/core/src/main/resources/template/simple/combobox.ftl @@ -40,14 +40,14 @@ <#if parameters.list??> @@ -48,8 +48,8 @@ - <#if parameters.allowAddToLeft?default(true)><#t/> - <#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/> + <#if parameters.allowAddToLeft!true><#t/> + <#assign addToLeftLabel = parameters.addToLeftLabel!"<-"?html/><#t/> <#if parameters.doubleHeaderKey??><#t/> <#t/> @@ -70,8 +70,8 @@ value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '');<#if parameters.addToLeftOnclick?has_content>${parameters.addToLeftOnclick};" />

    <#t/> <#t/> - <#if parameters.allowAddToRight?default(true)><#t/> - <#assign addToRightLabel=parameters.addToRightLabel?default("->")?html /><#t/> + <#if parameters.allowAddToRight!true><#t/> + <#assign addToRightLabel=parameters.addToRightLabel!"->"?html /><#t/> <#if parameters.headerKey??><#t/> <#t/> @@ -92,8 +92,8 @@ value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '');<#if parameters.addToRightOnclick?has_content>${parameters.addToRightOnclick};" />

    <#t/> <#t/> - <#if parameters.allowAddAllToLeft?default(true)><#t/> - <#assign addAllToLeftLabel=parameters.addAllToLeftLabel?default("<<--")?html /><#t/> + <#if parameters.allowAddAllToLeft!true><#t/> + <#assign addAllToLeftLabel=parameters.addAllToLeftLabel!"<<--"?html /><#t/> <#if parameters.doubleHeaderKey??><#t/> <#t/> @@ -114,8 +114,8 @@ value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '');<#if parameters.addAllToLeftOnclick?has_content>${parameters.addAllToLeftOnclick};" />

    <#t/> <#t/> - <#if parameters.allowAddAllToRight?default(true)><#t/> - <#assign addAllToRightLabel=parameters.addAllToRightLabel?default("-->>")?html /><#t/> + <#if parameters.allowAddAllToRight!true><#t/> + <#assign addAllToRightLabel=parameters.addAllToRightLabel!"-->>"?html /><#t/> <#if parameters.headerKey??><#t/> <#t/> @@ -136,8 +136,8 @@ value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '');<#if parameters.addAllToRightOnclick?has_content>${parameters.addAllToRightOnclick};" />

    <#t/> <#t/> - <#if parameters.allowSelectAll?default(true)><#t/> - <#assign selectAllLabel=parameters.selectAllLabel?default("<*>")?html /><#t/> + <#if parameters.allowSelectAll!true><#t/> + <#assign selectAllLabel=parameters.selectAllLabel!"<*>"?html /><#t/> <#if parameters.headerKey?? && parameters.doubleHeaderKey??><#t/> <#t/> @@ -182,14 +182,14 @@
    <#t/> -<#if parameters.doubleMultiple?default(false)> +<#if parameters.doubleMultiple!false> -<#if parameters.doubleDisabled?default(false)> +<#if parameters.doubleDisabled!false> disabled="disabled"<#rt/> /> -<#if parameters.allowUpDownOnRight?default(true)> +<#if parameters.allowUpDownOnRight!true> diff --git a/core/src/main/resources/template/simple/submit-close.ftl b/core/src/main/resources/template/simple/submit-close.ftl index 7f5195888..c16ac6e4b 100644 --- a/core/src/main/resources/template/simple/submit-close.ftl +++ b/core/src/main/resources/template/simple/submit-close.ftl @@ -1,5 +1,5 @@ <#if parameters.type?? && parameters.type=="button"> -<#if (parameters.body)?default("")?length gt 0>${parameters.body}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/> +<#if parameters.body?length gt 0>${parameters.body}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/> <#else> ${parameters.body}<#rt/> diff --git a/core/src/main/resources/template/simple/token.ftl b/core/src/main/resources/template/simple/token.ftl index cabfa9c77..18131cfa9 100644 --- a/core/src/main/resources/template/simple/token.ftl +++ b/core/src/main/resources/template/simple/token.ftl @@ -20,5 +20,5 @@ * under the License. */ --> - - \ No newline at end of file + + \ No newline at end of file diff --git a/core/src/main/resources/template/simple/updownselect.ftl b/core/src/main/resources/template/simple/updownselect.ftl index 30128ef9f..bc741ad7f 100644 --- a/core/src/main/resources/template/simple/updownselect.ftl +++ b/core/src/main/resources/template/simple/updownselect.ftl @@ -29,24 +29,24 @@ <#include "/${templateDir}/simple/select.ftl" /><#t/> -<#if parameters.allowMoveUp?default(true)><#t/> - <#assign defMoveUpLabel="${parameters.moveUpLabel?default('^')}" /><#t/> +<#if parameters.allowMoveUp!true><#t/> + <#assign defMoveUpLabel="${parameters.moveUpLabel!'^'}" /><#t/> <#if parameters.headerKey??><#t/>    <#else><#t/>    <#t/> <#t/> -<#if parameters.allowMoveDown?default(true)><#t/> - <#assign defMoveDownLabel="${parameters.moveDownLabel?default('v')}" /><#t/> +<#if parameters.allowMoveDown!true><#t/> + <#assign defMoveDownLabel="${parameters.moveDownLabel!'v'}" /><#t/> <#if parameters.headerKey??><#t/>    <#else><#t/>    <#t/> <#t/> -<#if parameters.allowSelectAll?default(true)><#t/> - <#assign defSelectAllLabel="${parameters.selectAllLabel?default('*')}" /><#t/> +<#if parameters.allowSelectAll!true><#t/> + <#assign defSelectAllLabel="${parameters.selectAllLabel!'*'}" /><#t/> <#if parameters.headerKey??><#t/>    <#else><#t/> diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl index d84506538..7791dfe97 100644 --- a/core/src/main/resources/template/xhtml/checkbox.ftl +++ b/core/src/main/resources/template/xhtml/checkbox.ftl @@ -39,7 +39,7 @@ <#elseif parameters.labelposition??> <#assign labelpos = parameters.labelposition/> -<#if labelpos?default("") == 'top'> +<#if (labelpos!"") == 'top'> <#if parameters.label??> @@ -52,11 +52,11 @@ class="checkboxLabel"<#rt/> > -<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'> +<#if parameters.required!false && parameters.requiredPosition!"right" != 'right'> *<#t/> ${parameters.label?html}<#t/> -<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'> +<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'> *<#t/> :<#t/> @@ -73,7 +73,7 @@ ${parameters.label?html}<#t/> <#else> -<#if labelpos?default("") == 'left'> +<#if (labelpos!"") == 'left'> <#if parameters.label??> <#if parameters.id??> for="${parameters.id?html}"<#rt/> @@ -84,11 +84,11 @@ ${parameters.label?html}<#t/> class="checkboxLabel"<#rt/> > -<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'> +<#if parameters.required!false && parameters.requiredPosition!"right" != 'right'> *<#t/> ${parameters.label?html}<#t/> -<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'> +<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'> *<#t/> :<#t/> @@ -98,8 +98,8 @@ ${parameters.label?html}<#t/> <#t/> -<#if labelpos?default("") == 'right'> - <#if parameters.required?default(false)> +<#if (labelpos!"") == 'right'> + <#if parameters.required!false> *<#t/> <#if parameters.tooltip??> @@ -109,10 +109,10 @@ ${parameters.label?html}<#t/> -<#if labelpos?default("") != 'top'> - <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> +<#if (labelpos!"") != 'top'> + <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> -<#if labelpos?default("") != 'top' && labelpos?default("") != 'left'> +<#if (labelpos!"") != 'top' && (labelpos!"") != 'left'> <#if parameters.label??> <#if parameters.id??> for="${parameters.id?html}"<#rt/> diff --git a/core/src/main/resources/template/xhtml/control.ftl b/core/src/main/resources/template/xhtml/control.ftl index 2761ac3b8..06cb89ecb 100644 --- a/core/src/main/resources/template/xhtml/control.ftl +++ b/core/src/main/resources/template/xhtml/control.ftl @@ -20,7 +20,7 @@ * under the License. */ --> - +
    <#if parameters.cssStyle??> style="${parameters.cssStyle?html}"<#rt/> > \ No newline at end of file diff --git a/core/src/main/resources/template/xhtml/controlfooter.ftl b/core/src/main/resources/template/xhtml/controlfooter.ftl index ef3f3caef..16d4a107b 100644 --- a/core/src/main/resources/template/xhtml/controlfooter.ftl +++ b/core/src/main/resources/template/xhtml/controlfooter.ftl @@ -20,10 +20,10 @@ * under the License. */ --> -${parameters.after?if_exists}<#t/> +${parameters.after!}<#t/> <#lt/> -<#if parameters.errorposition?default("top") == 'bottom'> +<#if (parameters.errorposition!"top") == 'bottom'> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error> diff --git a/core/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl index 5835a8434..302442d03 100644 --- a/core/src/main/resources/template/xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/xhtml/controlheader-core.ftl @@ -25,7 +25,7 @@ This will be done if ActionSupport is used. --> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> -<#if parameters.errorposition?default("top") == 'top'> +<#if (parameters.errorposition!"top") == 'top'> <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error> @@ -46,7 +46,7 @@ then give the label it's own row in the table --> -<#if labelpos?default("") == 'top'> +<#if (labelpos!"") == 'top'> <#lt/> <#-- add the extra row --> -<#if labelpos?default("") == 'top'> +<#if (labelpos!"") == 'top'> diff --git a/core/src/main/resources/template/xhtml/form-close.ftl b/core/src/main/resources/template/xhtml/form-close.ftl index d783454b8..aca423665 100644 --- a/core/src/main/resources/template/xhtml/form-close.ftl +++ b/core/src/main/resources/template/xhtml/form-close.ftl @@ -23,7 +23,7 @@ <#include "/${parameters.templateDir}/${parameters.expandTheme}/control-close.ftl" /> <#include "/${parameters.templateDir}/simple/form-close.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-validate.ftl" /> -<#if parameters.focusElement?if_exists != ""> +<#if parameters.focusElement??> <#if parameters.onsubmit??> diff --git a/core/src/main/resources/template/xhtml/form.ftl b/core/src/main/resources/template/xhtml/form.ftl index 5a686ddb1..cce99cc03 100644 --- a/core/src/main/resources/template/xhtml/form.ftl +++ b/core/src/main/resources/template/xhtml/form.ftl @@ -22,8 +22,8 @@ --> <#include "/${parameters.templateDir}/${parameters.expandTheme}/form-validate.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/form-common.ftl" /> -<#if (parameters.validate?default(false))> - onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}" +<#if (parameters.validate!false)> + onreset="${parameters.onreset!'clearErrorMessages(this);clearErrorLabels(this);'}" <#else> <#if parameters.onreset??> onreset="${parameters.onreset?html}" diff --git a/core/src/main/resources/template/xhtml/tooltip.ftl b/core/src/main/resources/template/xhtml/tooltip.ftl index 74938a841..862500f87 100644 --- a/core/src/main/resources/template/xhtml/tooltip.ftl +++ b/core/src/main/resources/template/xhtml/tooltip.ftl @@ -27,12 +27,12 @@ <#else><#t/> src='<@s.url value="/struts/tooltip.gif" includeParams="none" encode="false" />' <#t/> - <#if parameters.jsTooltipEnabled?default('false') == 'true'> + <#if (parameters.jsTooltipEnabled!'false') == 'true'> onmouseover="domTT_activate(this, event, 'content', '${parameters.tooltip}'<#t/> <#if parameters.tooltipDelay??><#t/> <#t/>,'delay', '${parameters.tooltipDelay}'<#t/> <#t/> - <#t/>,'styleClass', '${parameters.tooltipCssClass?default("StrutsTTClassic")}'<#t/> + <#t/>,'styleClass', '${parameters.tooltipCssClass!"StrutsTTClassic"}'<#t/> <#t/>)" /> <#else> title="${parameters.tooltip?html}" diff --git a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl index 34987a17f..400d63650 100644 --- a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl +++ b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl @@ -29,7 +29,7 @@ - +
    <#rt/> <#else> <#rt/> @@ -62,20 +62,20 @@ class="label"<#t/> ><#t/> -<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'> +<#if parameters.required!false && parameters.requiredPosition!"right" != 'right'> *<#t/> ${parameters.label?html}<#t/> -<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'> +<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'> *<#t/> -${parameters.labelseparator?default(":")?html}<#t/> +${parameters.labelseparator!":"?html}<#t/> <#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" /> <#t/>
    Action name:${actionName}
    Namespace: ${namespace}
    Action class: ${config.className}
    Action method: <#if config.methodName?exists>${config.methodName}
    Action method: <#if config.methodName??>${config.methodName}
    Parameters: <#list config.params?keys as p> ${p}