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 df67d27996..7bda4e66fc 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/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java
index 06f9997888..5b4d998397 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 void setFieldValue(String fieldValue) {
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);
+ }
+
}
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 528809e5d2..060d48b72c 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 String getTheme() {
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 void evaluateParams() {
}
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 void evaluateParams() {
if (errorPosition != null) {
addParameter("errorposition", findString(errorPosition));
}
-
+
if (requiredLabel != null) {
addParameter("required", findValue(requiredLabel, Boolean.class));
}
@@ -1005,7 +1007,7 @@ protected void populateComponentHtmlId(Form form) {
} 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 void setLabelSeparator(String labelseparator) {
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 void setRequiredPosition(String requiredPosition) {
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 677892efe1..5c7a835dbc 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 @@ protected void populateParams() {
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 void setLabel(String label) {
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 bd2d0597cd..633c51d753 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 a07d787fb1..95a289b1bf 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 65d4dccf74..df576ea980 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 e7409522d9..c98df93b44 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 c0dd653e7b..f32666f1e9 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 893064c6a9..f7b7daae5c 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 a2a1698c0d..534ab374b2 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 01a4ec4562..d581962c1c 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 055aca5161..1f0ee1a107 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 207a111255..4c938e6730 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 67b2cc3818..78f23dafeb 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 827d56d299..2001968195 100644
--- a/core/src/site/resources/tags/a.html
+++ b/core/src/site/resources/tags/a.html
@@ -193,6 +193,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -207,7 +215,7 @@ Attributes
|
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 d9c533647a..6bb733d93d 100644
--- a/core/src/site/resources/tags/actionerror.html
+++ b/core/src/site/resources/tags/actionerror.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
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 55fc078226..e22de1e7f3 100644
--- a/core/src/site/resources/tags/actionmessage.html
+++ b/core/src/site/resources/tags/actionmessage.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
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 75cd10679b..f40559c49b 100644
--- a/core/src/site/resources/tags/checkbox.html
+++ b/core/src/site/resources/tags/checkbox.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
false |
String |
- Define label position of form element (top/left) |
+ (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 41f3922cff..39ce917ddf 100644
--- a/core/src/site/resources/tags/checkboxlist.html
+++ b/core/src/site/resources/tags/checkboxlist.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 39ae8d499a..6051105015 100644
--- a/core/src/site/resources/tags/combobox.html
+++ b/core/src/site/resources/tags/combobox.html
@@ -153,6 +153,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -167,7 +175,7 @@ Attributes
|
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 0142c07789..0ad47e785f 100644
--- a/core/src/site/resources/tags/component.html
+++ b/core/src/site/resources/tags/component.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 5e9941ebec..030987d75f 100644
--- a/core/src/site/resources/tags/datetextfield.html
+++ b/core/src/site/resources/tags/datetextfield.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
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 60dfaccc23..f274227649 100644
--- a/core/src/site/resources/tags/debug.html
+++ b/core/src/site/resources/tags/debug.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 9e19fbeaeb..82ce362d47 100644
--- a/core/src/site/resources/tags/doubleselect.html
+++ b/core/src/site/resources/tags/doubleselect.html
@@ -417,6 +417,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -431,7 +439,7 @@ Attributes
|
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 f567ce2f73..4ad39e684f 100644
--- a/core/src/site/resources/tags/fielderror.html
+++ b/core/src/site/resources/tags/fielderror.html
@@ -145,6 +145,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -159,7 +167,7 @@ Attributes
|
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 a79c3f5258..c9aaa340b4 100644
--- a/core/src/site/resources/tags/file.html
+++ b/core/src/site/resources/tags/file.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
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 67e07c8ab9..268b705e97 100644
--- a/core/src/site/resources/tags/form.html
+++ b/core/src/site/resources/tags/form.html
@@ -169,6 +169,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -183,7 +191,7 @@ Attributes
|
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 a477a139f4..aefe87b359 100644
--- a/core/src/site/resources/tags/head.html
+++ b/core/src/site/resources/tags/head.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 76af165de3..b0d766fefd 100644
--- a/core/src/site/resources/tags/hidden.html
+++ b/core/src/site/resources/tags/hidden.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 550ae3ee94..6879c959e0 100644
--- a/core/src/site/resources/tags/inputtransferselect.html
+++ b/core/src/site/resources/tags/inputtransferselect.html
@@ -193,6 +193,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -207,7 +215,7 @@ Attributes
|
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 82a7c96e22..07c1f11947 100644
--- a/core/src/site/resources/tags/label.html
+++ b/core/src/site/resources/tags/label.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
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 0dd58b0bc2..37ae0da93e 100644
--- a/core/src/site/resources/tags/optiontransferselect.html
+++ b/core/src/site/resources/tags/optiontransferselect.html
@@ -553,6 +553,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -567,7 +575,7 @@ Attributes
|
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 1de56cf3d1..a712b6203c 100644
--- a/core/src/site/resources/tags/password.html
+++ b/core/src/site/resources/tags/password.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 df37c325a2..98686ae257 100644
--- a/core/src/site/resources/tags/radio.html
+++ b/core/src/site/resources/tags/radio.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 006302af35..cb5c5f8dda 100644
--- a/core/src/site/resources/tags/reset.html
+++ b/core/src/site/resources/tags/reset.html
@@ -137,6 +137,14 @@ Attributes
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 |
@@ -151,7 +159,7 @@ Attributes
|
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 b3ab30ed93..da5056ad8c 100644
--- a/core/src/site/resources/tags/select.html
+++ b/core/src/site/resources/tags/select.html
@@ -153,6 +153,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -167,7 +175,7 @@ Attributes
|
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 d1b7e1db8c..12b243537e 100644
--- a/core/src/site/resources/tags/submit.html
+++ b/core/src/site/resources/tags/submit.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
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 8972566b11..bbbeabff09 100644
--- a/core/src/site/resources/tags/textarea.html
+++ b/core/src/site/resources/tags/textarea.html
@@ -137,6 +137,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -151,7 +159,7 @@ Attributes
|
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 04e71da678..0f9666caf9 100644
--- a/core/src/site/resources/tags/textfield.html
+++ b/core/src/site/resources/tags/textfield.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 4b9a580284..3b572f8cef 100644
--- a/core/src/site/resources/tags/token.html
+++ b/core/src/site/resources/tags/token.html
@@ -129,6 +129,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -143,7 +151,7 @@ Attributes
|
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 79947d8080..16b37afca2 100644
--- a/core/src/site/resources/tags/updownselect.html
+++ b/core/src/site/resources/tags/updownselect.html
@@ -177,6 +177,14 @@ Attributes
String |
Label expression used for rendering an element specific label |
+
+ | labelPosition |
+ false |
+ |
+ false |
+ String |
+ Define label position of form element (top/left) |
+
| labelSeparator |
false |
@@ -191,7 +199,7 @@ Attributes
|
false |
String |
- Define label position of form element (top/left) |
+ (Deprecated) Define label position of form element (top/left) |
| list |