From 256cd14bf068fae473fe0ae1c900f7b68bfb2182 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 14 Jun 2021 20:27:48 +0200 Subject: [PATCH 1/3] WW-5123 Makes labelpostion deprecated --- .../controlheader-core.ftl | 12 +++++----- .../org/apache/struts2/components/UIBean.java | 24 ++++++++++++++----- .../struts2/views/jsp/ui/AbstractUITag.java | 17 +++++++++---- .../struts2/views/jsp/ui/CheckboxTag.java | 7 +++--- .../template/archive/xhtml/controlheader.vm | 6 ++--- .../resources/template/css_xhtml/checkbox.ftl | 20 ++++++++-------- .../template/css_xhtml/controlfooter.ftl | 12 +++++----- .../template/css_xhtml/controlheader-core.ftl | 14 +++++------ .../template/css_xhtml/controlheader.ftl | 11 ++++----- .../resources/template/css_xhtml/reset.ftl | 12 +++++----- .../template/css_xhtml/submit-close.ftl | 10 ++++---- .../resources/template/css_xhtml/submit.ftl | 10 ++++---- .../resources/template/xhtml/checkbox.ftl | 20 ++++++++-------- .../template/xhtml/controlheader-core.ftl | 12 +++++----- core/src/site/resources/tags/a.html | 8 +++++++ core/src/site/resources/tags/actionerror.html | 8 +++++++ .../site/resources/tags/actionmessage.html | 8 +++++++ core/src/site/resources/tags/checkbox.html | 10 +++++++- .../src/site/resources/tags/checkboxlist.html | 8 +++++++ core/src/site/resources/tags/combobox.html | 8 +++++++ core/src/site/resources/tags/component.html | 8 +++++++ .../site/resources/tags/datetextfield.html | 8 +++++++ core/src/site/resources/tags/debug.html | 8 +++++++ .../src/site/resources/tags/doubleselect.html | 8 +++++++ core/src/site/resources/tags/fielderror.html | 8 +++++++ core/src/site/resources/tags/file.html | 8 +++++++ core/src/site/resources/tags/form.html | 8 +++++++ core/src/site/resources/tags/head.html | 8 +++++++ core/src/site/resources/tags/hidden.html | 8 +++++++ .../resources/tags/inputtransferselect.html | 8 +++++++ core/src/site/resources/tags/label.html | 8 +++++++ .../resources/tags/optiontransferselect.html | 8 +++++++ core/src/site/resources/tags/password.html | 8 +++++++ core/src/site/resources/tags/radio.html | 8 +++++++ core/src/site/resources/tags/reset.html | 8 +++++++ core/src/site/resources/tags/select.html | 8 +++++++ core/src/site/resources/tags/submit.html | 8 +++++++ core/src/site/resources/tags/textarea.html | 8 +++++++ core/src/site/resources/tags/textfield.html | 8 +++++++ core/src/site/resources/tags/token.html | 8 +++++++ .../src/site/resources/tags/updownselect.html | 8 +++++++ 41 files changed, 319 insertions(+), 86 deletions(-) diff --git a/apps/showcase/src/main/resources/template/ajaxErrorContainers/controlheader-core.ftl b/apps/showcase/src/main/resources/template/ajaxErrorContainers/controlheader-core.ftl index df67d2799..7bda4e66f 100644 --- a/apps/showcase/src/main/resources/template/ajaxErrorContainers/controlheader-core.ftl +++ b/apps/showcase/src/main/resources/template/ajaxErrorContainers/controlheader-core.ftl @@ -33,17 +33,17 @@ <#lt/> -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelpos = parameters.labelPosition/> <#-- if the label position is top, then give the label it's own row in the table --> -<#if (labelpos!"") == 'top'> +<#if (labelPos!"") == 'top'> <#rt/> <#else> <#rt/> @@ -72,7 +72,7 @@ ${parameters.labelseparator!":"?html}<#t/> <#lt/> <#-- add the extra row --> -<#if (labelpos!"") == 'top'> +<#if (labelPos!"") == 'top'> diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index 528809e5d..060d48b72 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -637,7 +637,7 @@ public abstract class UIBean extends Component { public void evaluateParams() { String templateDir = getTemplateDir(); String theme = getTheme(); - + addParameter("templateDir", templateDir); addParameter("theme", theme); addParameter("template", template != null ? findString(template) : getDefaultTemplate()); @@ -679,7 +679,9 @@ public abstract class UIBean extends Component { } if (labelPosition != null) { - addParameter("labelposition", findString(labelPosition)); + String labelPosition = findString(this.labelPosition); + addParameter("labelposition", labelPosition); + addParameter("labelPosition", labelPosition); } if (requiredPosition != null) { @@ -689,7 +691,7 @@ public abstract class UIBean extends Component { if (errorPosition != null) { addParameter("errorposition", findString(errorPosition)); } - + if (requiredLabel != null) { addParameter("required", findValue(requiredLabel, Boolean.class)); } @@ -1005,7 +1007,7 @@ public abstract class UIBean extends Component { } else { tryId = generatedId; } - + //fix for https://issues.apache.org/jira/browse/WW-4299 //do not assign value to id if tryId is null if (tryId != null) { @@ -1096,11 +1098,21 @@ public abstract class UIBean extends Component { this.labelSeparator = labelseparator; } - @StrutsTagAttribute(description="Define label position of form element (top/left)") + /** + * Deprecated since 2.5.27 + * @deprecated use {@link #setLabelPosition(String)} instead + */ + @StrutsTagAttribute(description="(Deprecated) Define label position of form element (top/left)") + @Deprecated public void setLabelposition(String labelPosition) { this.labelPosition = labelPosition; } + @StrutsTagAttribute(description="Define label position of form element (top/left)") + public void setLabelPosition(String labelPosition) { + this.labelPosition = labelPosition; + } + @StrutsTagAttribute(description="Define required position of required form element (left|right)") public void setRequiredPosition(String requiredPosition) { this.requiredPosition = requiredPosition; @@ -1110,7 +1122,7 @@ public abstract class UIBean extends Component { public void setErrorPosition(String errorPosition) { this.errorPosition = errorPosition; } - + @StrutsTagAttribute(description="The name to set for element") public void setName(String name) { this.name = name; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java index 677892efe..5c7a835db 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java @@ -18,9 +18,7 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.commons.lang3.ObjectUtils; import org.apache.struts2.components.UIBean; -import org.apache.struts2.util.ComponentUtils; import org.apache.struts2.views.jsp.ComponentTagSupport; import javax.servlet.jsp.JspException; @@ -40,7 +38,7 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam protected String disabled; protected String label; protected String labelSeparator; - protected String labelposition; + protected String labelPosition; protected String requiredPosition; protected String errorPosition; protected String name; @@ -92,7 +90,7 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam uiBean.setDisabled(disabled); uiBean.setLabel(label); uiBean.setLabelSeparator(labelSeparator); - uiBean.setLabelposition(labelposition); + uiBean.setLabelPosition(labelPosition); uiBean.setRequiredPosition(requiredPosition); uiBean.setErrorPosition(errorPosition); uiBean.setName(name); @@ -169,8 +167,17 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam this.label = label; } + /** + * Deprecated since 2.5.27 + * @deprecated use {@link #setLabelPosition(String)} instead + */ + @Deprecated public void setLabelposition(String labelPosition) { - this.labelposition = labelPosition; + this.labelPosition = labelPosition; + } + + public void setLabelPosition(String labelPosition) { + this.labelPosition = labelPosition; } public void setRequiredPosition(String requiredPosition) { diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java index bd2d0597c..633c51d75 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java @@ -18,13 +18,12 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Checkbox; import org.apache.struts2.components.Component; -import com.opensymphony.xwork2.util.ValueStack; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @see Checkbox diff --git a/core/src/main/resources/template/archive/xhtml/controlheader.vm b/core/src/main/resources/template/archive/xhtml/controlheader.vm index a07d787fb..95a289b1b 100644 --- a/core/src/main/resources/template/archive/xhtml/controlheader.vm +++ b/core/src/main/resources/template/archive/xhtml/controlheader.vm @@ -24,16 +24,16 @@ #set ($hasFieldErrors = $fieldErrors.get($parameters.name)) #foreach ($error in $fieldErrors.get($parameters.name)) - #if ($parameters.labelposition == 'top')#else#end$!struts.htmlEncode($error) + #if ($parameters.labelPosition == 'top')#else#end$!struts.htmlEncode($error) #end #end ## if the label position is top, ## then give the label it's own row in the table -#if ($parameters.labelposition && $parameters.labelposition == 'top')#else#end#if ($parameters.label)#end +#if ($parameters.labelPosition && $parameters.labelPosition == 'top')#else#end#if ($parameters.label)#end ## add the extra row -#if ($parameters.labelposition && $parameters.labelposition == 'top') +#if ($parameters.labelPosition && $parameters.labelPosition == 'top') #end diff --git a/core/src/main/resources/template/css_xhtml/checkbox.ftl b/core/src/main/resources/template/css_xhtml/checkbox.ftl index 65d4dccf7..df576ea98 100644 --- a/core/src/main/resources/template/css_xhtml/checkbox.ftl +++ b/core/src/main/resources/template/css_xhtml/checkbox.ftl @@ -39,12 +39,12 @@ lables <#t/> -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> -<#if (labelpos!"") == 'left'> +<#if (labelPos!"") == 'left'> <#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> @@ -60,7 +60,7 @@ lables -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'>
<#else> @@ -72,14 +72,14 @@ lables <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> -<#if (labelpos!"") != 'left'> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"") != 'left'> +<#if (labelPos!"top") == 'top'>
<#rt/> <#else> <#rt/> <#if parameters.label??> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'>
<#else> @@ -98,7 +98,7 @@ lables <#if parameters.label??> -<#if (labelpos!"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 e7409522d..c98df93b4 100644 --- a/core/src/main/resources/template/css_xhtml/controlfooter.ftl +++ b/core/src/main/resources/template/css_xhtml/controlfooter.ftl @@ -20,12 +20,12 @@ --> ${parameters.after!}<#t/> <#lt/> -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'> <#rt/> <#else> <#rt/> @@ -46,4 +46,4 @@ ${parameters.after!}<#t/> <#t/> - \ No newline at end of file + 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 c0dd653e7..f32666f1e 100644 --- a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl @@ -24,7 +24,7 @@ --> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/>
<#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/> class="wwgrp"> - + <#if (parameters.errorposition!"top") == 'top'> <#if hasFieldErrors>
<#if parameters.id??>id="wwerr_${parameters.id}"<#rt/> class="wwerr"> @@ -41,13 +41,13 @@ -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> <#if parameters.label??> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'>
<#else> @@ -69,7 +69,7 @@ ${parameters.label?html}${parameters.labelseparator!":"?html} <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> <#t/> -<#if (labelpos!"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 893064c6a..f7b7daae5 100644 --- a/core/src/main/resources/template/css_xhtml/controlheader.ftl +++ b/core/src/main/resources/template/css_xhtml/controlheader.ftl @@ -19,15 +19,14 @@ */ --> <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl"> -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'>
<#else> <#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/> class="wwctrl"> - diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl index a2a1698c0..534ab374b 100644 --- a/core/src/main/resources/template/css_xhtml/reset.ftl +++ b/core/src/main/resources/template/css_xhtml/reset.ftl @@ -18,12 +18,12 @@ * under the License. */ --> -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'>
<#else> @@ -34,7 +34,7 @@ ><#t/> <#include "/${parameters.templateDir}/simple/reset.ftl" /> -<#if (labelpos!"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 01a4ec456..d581962c1 100644 --- a/core/src/main/resources/template/css_xhtml/submit-close.ftl +++ b/core/src/main/resources/template/css_xhtml/submit-close.ftl @@ -19,12 +19,12 @@ */ --> <#include "/${parameters.templateDir}/simple/submit-close.ftl" /> -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> -<#if (labelpos!"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 055aca516..1f0ee1a10 100644 --- a/core/src/main/resources/template/css_xhtml/submit.ftl +++ b/core/src/main/resources/template/css_xhtml/submit.ftl @@ -18,12 +18,12 @@ * under the License. */ --> -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'>
<#else> diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl index 207a11125..4c938e673 100644 --- a/core/src/main/resources/template/xhtml/checkbox.ftl +++ b/core/src/main/resources/template/xhtml/checkbox.ftl @@ -32,12 +32,12 @@ -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> -<#if (labelpos!"") == 'top'> +<#if (labelPos!"") == 'top'> <#if parameters.label??> @@ -71,7 +71,7 @@ ${parameters.label?html}<#t/> <#else> -<#if (labelpos!"") == 'left'> +<#if (labelPos!"") == 'left'> <#if parameters.label??> <#if parameters.id??> for="${parameters.id?html}"<#rt/> @@ -96,7 +96,7 @@ ${parameters.label?html}<#t/> <#t/> -<#if (labelpos!"") == 'right'> +<#if (labelPos!"") == 'right'> <#if parameters.required!false> *<#t/> @@ -107,10 +107,10 @@ ${parameters.label?html}<#t/> -<#if (labelpos!"") != 'top'> +<#if (labelPos!"") != 'top'> <#include "/${parameters.templateDir}/simple/checkbox.ftl" /> - -<#if (labelpos!"") != 'top' && (labelpos!"") != '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/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl index 67b2cc381..78f23dafe 100644 --- a/core/src/main/resources/template/xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/xhtml/controlheader-core.ftl @@ -34,17 +34,17 @@ -<#if !parameters.labelposition?? && (parameters.form.labelposition)??> -<#assign labelpos = parameters.form.labelposition/> -<#elseif parameters.labelposition??> -<#assign labelpos = parameters.labelposition/> +<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??> +<#assign labelPos = parameters.form.labelPosition/> +<#elseif parameters.labelPosition??> +<#assign labelPos = parameters.labelPosition/> <#-- if the label position is top, then give the label it's own row in the table --> -<#if (labelpos!"") == 'top'> +<#if (labelPos!"") == 'top'> <#rt/> <#else> <#rt/> @@ -73,7 +73,7 @@ ${parameters.labelseparator!":"?html}<#t/> <#lt/> <#-- add the extra row --> -<#if (labelpos!"") == 'top'> +<#if (labelPos!"") == 'top'> diff --git a/core/src/site/resources/tags/a.html b/core/src/site/resources/tags/a.html index 827d56d29..b24d7afcb 100644 --- a/core/src/site/resources/tags/a.html +++ b/core/src/site/resources/tags/a.html @@ -193,6 +193,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/actionerror.html b/core/src/site/resources/tags/actionerror.html index d9c533647..042d259d8 100644 --- a/core/src/site/resources/tags/actionerror.html +++ b/core/src/site/resources/tags/actionerror.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/actionmessage.html b/core/src/site/resources/tags/actionmessage.html index 55fc07822..d32260196 100644 --- a/core/src/site/resources/tags/actionmessage.html +++ b/core/src/site/resources/tags/actionmessage.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/checkbox.html b/core/src/site/resources/tags/checkbox.html index 75cd10679..f8a5046c8 100644 --- a/core/src/site/resources/tags/checkbox.html +++ b/core/src/site/resources/tags/checkbox.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left/right) + labelSeparator false @@ -151,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + Define label position of form element (top/left/right) name diff --git a/core/src/site/resources/tags/checkboxlist.html b/core/src/site/resources/tags/checkboxlist.html index 41f3922cf..348beb2a8 100644 --- a/core/src/site/resources/tags/checkboxlist.html +++ b/core/src/site/resources/tags/checkboxlist.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/combobox.html b/core/src/site/resources/tags/combobox.html index 39ae8d499..24fbcfe82 100644 --- a/core/src/site/resources/tags/combobox.html +++ b/core/src/site/resources/tags/combobox.html @@ -153,6 +153,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/component.html b/core/src/site/resources/tags/component.html index 0142c0778..a9006d78b 100644 --- a/core/src/site/resources/tags/component.html +++ b/core/src/site/resources/tags/component.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/datetextfield.html b/core/src/site/resources/tags/datetextfield.html index 5e9941ebe..cd05c29e2 100644 --- a/core/src/site/resources/tags/datetextfield.html +++ b/core/src/site/resources/tags/datetextfield.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/debug.html b/core/src/site/resources/tags/debug.html index 60dfaccc2..61a4032a3 100644 --- a/core/src/site/resources/tags/debug.html +++ b/core/src/site/resources/tags/debug.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/doubleselect.html b/core/src/site/resources/tags/doubleselect.html index 9e19fbeae..63c06f86e 100644 --- a/core/src/site/resources/tags/doubleselect.html +++ b/core/src/site/resources/tags/doubleselect.html @@ -417,6 +417,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/fielderror.html b/core/src/site/resources/tags/fielderror.html index f567ce2f7..39b20c671 100644 --- a/core/src/site/resources/tags/fielderror.html +++ b/core/src/site/resources/tags/fielderror.html @@ -145,6 +145,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/file.html b/core/src/site/resources/tags/file.html index a79c3f525..0bd7ee1b1 100644 --- a/core/src/site/resources/tags/file.html +++ b/core/src/site/resources/tags/file.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/form.html b/core/src/site/resources/tags/form.html index 67e07c8ab..b41d097d4 100644 --- a/core/src/site/resources/tags/form.html +++ b/core/src/site/resources/tags/form.html @@ -169,6 +169,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/head.html b/core/src/site/resources/tags/head.html index a477a139f..5bf5e9e7d 100644 --- a/core/src/site/resources/tags/head.html +++ b/core/src/site/resources/tags/head.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/hidden.html b/core/src/site/resources/tags/hidden.html index 76af165de..aac9b1911 100644 --- a/core/src/site/resources/tags/hidden.html +++ b/core/src/site/resources/tags/hidden.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/inputtransferselect.html b/core/src/site/resources/tags/inputtransferselect.html index 550ae3ee9..de9e59c5d 100644 --- a/core/src/site/resources/tags/inputtransferselect.html +++ b/core/src/site/resources/tags/inputtransferselect.html @@ -193,6 +193,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/label.html b/core/src/site/resources/tags/label.html index 82a7c96e2..a4595acf1 100644 --- a/core/src/site/resources/tags/label.html +++ b/core/src/site/resources/tags/label.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/optiontransferselect.html b/core/src/site/resources/tags/optiontransferselect.html index 0dd58b0bc..2907f9f04 100644 --- a/core/src/site/resources/tags/optiontransferselect.html +++ b/core/src/site/resources/tags/optiontransferselect.html @@ -553,6 +553,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/password.html b/core/src/site/resources/tags/password.html index 1de56cf3d..3043dfbb0 100644 --- a/core/src/site/resources/tags/password.html +++ b/core/src/site/resources/tags/password.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/radio.html b/core/src/site/resources/tags/radio.html index df37c325a..e6df82d20 100644 --- a/core/src/site/resources/tags/radio.html +++ b/core/src/site/resources/tags/radio.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/reset.html b/core/src/site/resources/tags/reset.html index 006302af3..8fad6595b 100644 --- a/core/src/site/resources/tags/reset.html +++ b/core/src/site/resources/tags/reset.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Supply a reset button text apart from reset value. Will have no effect for input type reset, since button text will always be the value parameter. + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/select.html b/core/src/site/resources/tags/select.html index b3ab30ed9..ff3361df5 100644 --- a/core/src/site/resources/tags/select.html +++ b/core/src/site/resources/tags/select.html @@ -153,6 +153,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html index d1b7e1db8..9e32528bf 100644 --- a/core/src/site/resources/tags/submit.html +++ b/core/src/site/resources/tags/submit.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/textarea.html b/core/src/site/resources/tags/textarea.html index 8972566b1..e8dab7003 100644 --- a/core/src/site/resources/tags/textarea.html +++ b/core/src/site/resources/tags/textarea.html @@ -137,6 +137,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/textfield.html b/core/src/site/resources/tags/textfield.html index 04e71da67..39cdec6ca 100644 --- a/core/src/site/resources/tags/textfield.html +++ b/core/src/site/resources/tags/textfield.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/token.html b/core/src/site/resources/tags/token.html index 4b9a58028..fce85d57c 100644 --- a/core/src/site/resources/tags/token.html +++ b/core/src/site/resources/tags/token.html @@ -129,6 +129,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false diff --git a/core/src/site/resources/tags/updownselect.html b/core/src/site/resources/tags/updownselect.html index 79947d808..cca9ea35b 100644 --- a/core/src/site/resources/tags/updownselect.html +++ b/core/src/site/resources/tags/updownselect.html @@ -177,6 +177,14 @@ Please do not edit it directly. String Label expression used for rendering an element specific label + + labelPosition + false + + false + String + Define label position of form element (top/left) + labelSeparator false From 675deff599a83cbb3c289a9e7a21b9279783a20f Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 14 Jun 2021 20:28:24 +0200 Subject: [PATCH 2/3] WW-5123 Adds right option to TLD for Checkbox tag --- .../org/apache/struts2/components/Checkbox.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java index 06f999788..5b4d99839 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -83,4 +83,21 @@ public class Checkbox extends UIBean { this.fieldValue = fieldValue; } + /** + * Deprecated since 2.5.27 + * @deprecated use {@link #setLabelPosition(String)} instead + */ + @Deprecated + @Override + @StrutsTagAttribute(description="(Deprecated) Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme") + public void setLabelposition(String labelPosition) { + super.setLabelPosition(labelPosition); + } + + @Override + @StrutsTagAttribute(description="Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme") + public void setLabelPosition(String labelPosition) { + super.setLabelPosition(labelPosition); + } + } From f1824b539389e92c4302e93d9af6fb9f7b0fdfcc Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 18 Jun 2021 07:02:20 +0200 Subject: [PATCH 3/3] WW-5132 Marks old labelposition as Deprecated --- core/src/site/resources/tags/a.html | 2 +- core/src/site/resources/tags/actionerror.html | 2 +- core/src/site/resources/tags/actionmessage.html | 2 +- core/src/site/resources/tags/checkbox.html | 4 ++-- core/src/site/resources/tags/checkboxlist.html | 2 +- core/src/site/resources/tags/combobox.html | 2 +- core/src/site/resources/tags/component.html | 2 +- core/src/site/resources/tags/datetextfield.html | 2 +- core/src/site/resources/tags/debug.html | 2 +- core/src/site/resources/tags/doubleselect.html | 2 +- core/src/site/resources/tags/fielderror.html | 2 +- core/src/site/resources/tags/file.html | 2 +- core/src/site/resources/tags/form.html | 2 +- core/src/site/resources/tags/head.html | 2 +- core/src/site/resources/tags/hidden.html | 2 +- core/src/site/resources/tags/inputtransferselect.html | 2 +- core/src/site/resources/tags/label.html | 2 +- core/src/site/resources/tags/optiontransferselect.html | 2 +- core/src/site/resources/tags/password.html | 2 +- core/src/site/resources/tags/radio.html | 2 +- core/src/site/resources/tags/reset.html | 2 +- core/src/site/resources/tags/select.html | 2 +- core/src/site/resources/tags/submit.html | 2 +- core/src/site/resources/tags/textarea.html | 2 +- core/src/site/resources/tags/textfield.html | 2 +- core/src/site/resources/tags/token.html | 2 +- core/src/site/resources/tags/updownselect.html | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/src/site/resources/tags/a.html b/core/src/site/resources/tags/a.html index b24d7afcb..200196819 100644 --- a/core/src/site/resources/tags/a.html +++ b/core/src/site/resources/tags/a.html @@ -215,7 +215,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) method diff --git a/core/src/site/resources/tags/actionerror.html b/core/src/site/resources/tags/actionerror.html index 042d259d8..6bb733d93 100644 --- a/core/src/site/resources/tags/actionerror.html +++ b/core/src/site/resources/tags/actionerror.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/actionmessage.html b/core/src/site/resources/tags/actionmessage.html index d32260196..e22de1e7f 100644 --- a/core/src/site/resources/tags/actionmessage.html +++ b/core/src/site/resources/tags/actionmessage.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/checkbox.html b/core/src/site/resources/tags/checkbox.html index f8a5046c8..f40559c49 100644 --- a/core/src/site/resources/tags/checkbox.html +++ b/core/src/site/resources/tags/checkbox.html @@ -143,7 +143,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left/right) + Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme labelSeparator @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left/right) + (Deprecated) Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme name diff --git a/core/src/site/resources/tags/checkboxlist.html b/core/src/site/resources/tags/checkboxlist.html index 348beb2a8..39ce917dd 100644 --- a/core/src/site/resources/tags/checkboxlist.html +++ b/core/src/site/resources/tags/checkboxlist.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) list diff --git a/core/src/site/resources/tags/combobox.html b/core/src/site/resources/tags/combobox.html index 24fbcfe82..605110501 100644 --- a/core/src/site/resources/tags/combobox.html +++ b/core/src/site/resources/tags/combobox.html @@ -175,7 +175,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) list diff --git a/core/src/site/resources/tags/component.html b/core/src/site/resources/tags/component.html index a9006d78b..0ad47e785 100644 --- a/core/src/site/resources/tags/component.html +++ b/core/src/site/resources/tags/component.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/datetextfield.html b/core/src/site/resources/tags/datetextfield.html index cd05c29e2..030987d75 100644 --- a/core/src/site/resources/tags/datetextfield.html +++ b/core/src/site/resources/tags/datetextfield.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/debug.html b/core/src/site/resources/tags/debug.html index 61a4032a3..f27422764 100644 --- a/core/src/site/resources/tags/debug.html +++ b/core/src/site/resources/tags/debug.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/doubleselect.html b/core/src/site/resources/tags/doubleselect.html index 63c06f86e..82ce362d4 100644 --- a/core/src/site/resources/tags/doubleselect.html +++ b/core/src/site/resources/tags/doubleselect.html @@ -439,7 +439,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) list diff --git a/core/src/site/resources/tags/fielderror.html b/core/src/site/resources/tags/fielderror.html index 39b20c671..4ad39e684 100644 --- a/core/src/site/resources/tags/fielderror.html +++ b/core/src/site/resources/tags/fielderror.html @@ -167,7 +167,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/file.html b/core/src/site/resources/tags/file.html index 0bd7ee1b1..c9aaa340b 100644 --- a/core/src/site/resources/tags/file.html +++ b/core/src/site/resources/tags/file.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/form.html b/core/src/site/resources/tags/form.html index b41d097d4..268b705e9 100644 --- a/core/src/site/resources/tags/form.html +++ b/core/src/site/resources/tags/form.html @@ -191,7 +191,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) method diff --git a/core/src/site/resources/tags/head.html b/core/src/site/resources/tags/head.html index 5bf5e9e7d..aefe87b35 100644 --- a/core/src/site/resources/tags/head.html +++ b/core/src/site/resources/tags/head.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/hidden.html b/core/src/site/resources/tags/hidden.html index aac9b1911..b0d766fef 100644 --- a/core/src/site/resources/tags/hidden.html +++ b/core/src/site/resources/tags/hidden.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/inputtransferselect.html b/core/src/site/resources/tags/inputtransferselect.html index de9e59c5d..6879c959e 100644 --- a/core/src/site/resources/tags/inputtransferselect.html +++ b/core/src/site/resources/tags/inputtransferselect.html @@ -215,7 +215,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) leftTitle diff --git a/core/src/site/resources/tags/label.html b/core/src/site/resources/tags/label.html index a4595acf1..07c1f1194 100644 --- a/core/src/site/resources/tags/label.html +++ b/core/src/site/resources/tags/label.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/optiontransferselect.html b/core/src/site/resources/tags/optiontransferselect.html index 2907f9f04..37ae0da93 100644 --- a/core/src/site/resources/tags/optiontransferselect.html +++ b/core/src/site/resources/tags/optiontransferselect.html @@ -575,7 +575,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) leftDownLabel diff --git a/core/src/site/resources/tags/password.html b/core/src/site/resources/tags/password.html index 3043dfbb0..a712b6203 100644 --- a/core/src/site/resources/tags/password.html +++ b/core/src/site/resources/tags/password.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) maxLength diff --git a/core/src/site/resources/tags/radio.html b/core/src/site/resources/tags/radio.html index e6df82d20..98686ae25 100644 --- a/core/src/site/resources/tags/radio.html +++ b/core/src/site/resources/tags/radio.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) list diff --git a/core/src/site/resources/tags/reset.html b/core/src/site/resources/tags/reset.html index 8fad6595b..cb5c5f8dd 100644 --- a/core/src/site/resources/tags/reset.html +++ b/core/src/site/resources/tags/reset.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) method diff --git a/core/src/site/resources/tags/select.html b/core/src/site/resources/tags/select.html index ff3361df5..da5056ad8 100644 --- a/core/src/site/resources/tags/select.html +++ b/core/src/site/resources/tags/select.html @@ -175,7 +175,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) list diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html index 9e32528bf..12b243537 100644 --- a/core/src/site/resources/tags/submit.html +++ b/core/src/site/resources/tags/submit.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) method diff --git a/core/src/site/resources/tags/textarea.html b/core/src/site/resources/tags/textarea.html index e8dab7003..bbbeabff0 100644 --- a/core/src/site/resources/tags/textarea.html +++ b/core/src/site/resources/tags/textarea.html @@ -159,7 +159,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/textfield.html b/core/src/site/resources/tags/textfield.html index 39cdec6ca..0f9666caf 100644 --- a/core/src/site/resources/tags/textfield.html +++ b/core/src/site/resources/tags/textfield.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) maxLength diff --git a/core/src/site/resources/tags/token.html b/core/src/site/resources/tags/token.html index fce85d57c..3b572f8ce 100644 --- a/core/src/site/resources/tags/token.html +++ b/core/src/site/resources/tags/token.html @@ -151,7 +151,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) name diff --git a/core/src/site/resources/tags/updownselect.html b/core/src/site/resources/tags/updownselect.html index cca9ea35b..16b37afca 100644 --- a/core/src/site/resources/tags/updownselect.html +++ b/core/src/site/resources/tags/updownselect.html @@ -199,7 +199,7 @@ Please do not edit it directly. false String - Define label position of form element (top/left) + (Deprecated) Define label position of form element (top/left) list