This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push: new bbbedbb Automatic Site Publish by Buildbot bbbedbb is described below commit bbbedbb0bf74ad6088f68706c9b77ca990d37845 Author: buildbot <us...@infra.apache.org> AuthorDate: Tue Jul 6 08:16:58 2021 +0000 Automatic Site Publish by Buildbot --- output/announce-2019.html | 2 +- output/core-developers/interceptors.html | 1 + output/core-developers/struts-default-xml.html | 1 + output/core-developers/xsl-result.html | 54 +++++++++++----------- output/tag-developers/a-tag.html | 10 +++- output/tag-developers/actionerror-tag.html | 10 +++- output/tag-developers/actionmessage-tag.html | 10 +++- output/tag-developers/checkbox-tag.html | 10 +++- output/tag-developers/checkboxlist-tag.html | 10 +++- output/tag-developers/combobox-tag.html | 10 +++- output/tag-developers/component-tag.html | 10 +++- output/tag-developers/css-xhtml-theme.html | 27 ++++++----- output/tag-developers/datetextfield-tag.html | 10 +++- output/tag-developers/doubleselect-tag.html | 10 +++- output/tag-developers/fielderror-tag.html | 10 +++- output/tag-developers/file-tag.html | 10 +++- output/tag-developers/form-tag.html | 10 +++- output/tag-developers/head-tag.html | 10 +++- output/tag-developers/hidden-tag.html | 10 +++- output/tag-developers/inputtransferselect-tag.html | 10 +++- output/tag-developers/label-tag.html | 10 +++- .../tag-developers/optiontransferselect-tag.html | 10 +++- output/tag-developers/password-tag.html | 10 +++- output/tag-developers/radio-tag.html | 10 +++- output/tag-developers/reset-tag.html | 10 +++- output/tag-developers/select-tag.html | 10 +++- output/tag-developers/submit-tag.html | 10 +++- output/tag-developers/textarea-tag.html | 18 +++++++- output/tag-developers/textfield-tag.html | 10 +++- output/tag-developers/token-tag.html | 10 +++- output/tag-developers/updownselect-tag.html | 10 +++- output/tag-developers/xhtml-theme.html | 20 ++++---- 32 files changed, 295 insertions(+), 78 deletions(-) diff --git a/output/announce-2019.html b/output/announce-2019.html index caf8383..c10afd0 100644 --- a/output/announce-2019.html +++ b/output/announce-2019.html @@ -276,7 +276,7 @@ release. The GA designation is our highest quality grade.</p> <p>This release addresses one backward compatibility issue:</p> <ul> - <li>Struts 2.3.36 - InvalidPathException: Illegal char <:> on JDK 9,10,11 on windows</:></li> + <li>Struts 2.3.36 - InvalidPathException: Illegal char <:> on JDK 9,10,11 on windows</li> <li>Error when upgrading to struts2.3.35</li> <li>Upgraded commons-fileupload to version 1.4</li> </ul> diff --git a/output/core-developers/interceptors.html b/output/core-developers/interceptors.html index e786c02..7d1e607 100644 --- a/output/core-developers/interceptors.html +++ b/output/core-developers/interceptors.html @@ -272,6 +272,7 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t java.lang.ClassLoader, java.lang.Shutdown, java.lang.ProcessBuilder, + java.lang.Thread, sun.misc.Unsafe, com.opensymphony.xwork2.ActionContext"</span> <span class="nt">/></span> diff --git a/output/core-developers/struts-default-xml.html b/output/core-developers/struts-default-xml.html index f2fddf6..85e5909 100644 --- a/output/core-developers/struts-default-xml.html +++ b/output/core-developers/struts-default-xml.html @@ -189,6 +189,7 @@ setting in <a href="struts-properties.html">struts.properties</a>.</p> java.lang.ClassLoader, java.lang.Shutdown, java.lang.ProcessBuilder, + java.lang.Thread, sun.misc.Unsafe, com.opensymphony.xwork2.ActionContext"</span> <span class="nt">/></span> diff --git a/output/core-developers/xsl-result.html b/output/core-developers/xsl-result.html index 029fc17..1d1dfaf 100644 --- a/output/core-developers/xsl-result.html +++ b/output/core-developers/xsl-result.html @@ -168,10 +168,10 @@ action.x=x; <span class="nt"></result></span> </code></pre></div></div> -<p>Without it there would be endless <code class="highlighter-rouge">x/y/x/y/x/y/...</code> elements. The <code class="highlighter-rouge">XSLTResult</code> code tries also to deal with the fact +<p>Without it there would be endless <code class="highlighter-rouge">x/y/x/y/x/y/...</code> elements. The <code class="highlighter-rouge">XSLTResult</code> code tries also to deal with the fact that DTM model is built in a manner that children are processed before siblings. The result is that if there is object <code class="highlighter-rouge">x</code> that is both set in action’s <code class="highlighter-rouge">x</code> property, and very deeply under action’s a property then it would only appear under -<code class="highlighter-rouge">a</code>, not under <code class="highlighter-rouge">x</code>. That’s not what we expect, and that’s why <code class="highlighter-rouge">XSLTResult</code> allows objects to repeat in various places +<code class="highlighter-rouge">a</code>, not under <code class="highlighter-rouge">x</code>. That’s not what we expect, and that’s why <code class="highlighter-rouge">XSLTResult</code> allows objects to repeat in various places to some extent.</p> <p>Sometimes the object mesh is still very dense and you may notice that even though you have a relatively simple stylesheet, @@ -179,27 +179,27 @@ execution takes a tremendous amount of time. To help you to deal with that obsta to elements paths (xpath).</p> <blockquote> - <p>In your .xsl file the root match must be named <code class="highlighter-rouge">result</code>. This example will output the username by using <code class="highlighter-rouge">getUsername</code> on your action class: -```xml</p> + <p>In your .xsl file the root match must be named <code class="highlighter-rouge">result</code>. This example will output the username by using <code class="highlighter-rouge">getUsername</code> on your action class:</p> </blockquote> -<xsl:template match="result"> - <html> - <body> - Hello <xsl:value-of select="username" /> how are you? - </body> - </html> -</xsl:template> -<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> -In the following example the XSLT result would only walk through action's properties without their childs. It would also -skip every property that has `hugeCollection` in their name. Element's path is first compared to `excludingPattern` - -if it matches it's no longer processed. Then it is compared to `matchingPattern` and processed only if there's a match. - -```xml -<result name="success" type="xslt"> - <param name="stylesheetLocation">foo.xslt</param> - <param name="matchingPattern">^/result/[^/*]$</param> - <param name="excludingPattern">.*(hugeCollection).*</param> -</result> + +<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><xsl:template</span> <span class="na">match=</span><span class="s">"result"</span><span class="nt">></span> + <span class="nt"><html></span> + <span class="nt"><body></span> + Hello <span class="nt"><xsl:value-of</span> <span class="na">select=</span><span class="s">"username"</span><span class="nt">/></span> how are you? + <span class="nt"></body></span> + <span class="nt"></html></span> +<span class="nt"></xsl:template></span> +</code></pre></div></div> + +<p>In the following example the XSLT result would only walk through action’s properties without their children. It would also +skip every property that has <code class="highlighter-rouge">hugeCollection</code> in their name. Element’s path is first compared to <code class="highlighter-rouge">excludingPattern</code> - +if it matches it’s no longer processed. Then it is compared to <code class="highlighter-rouge">matchingPattern</code> and processed only if there’s a match.</p> + +<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt"><result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"xslt"</span><span class="nt">></span> + <span class="nt"><param</span> <span class="na">name=</span><span class="s">"stylesheetLocation"</span><span class="nt">></span>foo.xslt<span class="nt"></param></span> + <span class="nt"><param</span> <span class="na">name=</span><span class="s">"matchingPattern"</span><span class="nt">></span>^/result/[^/*]$<span class="nt"></param></span> + <span class="nt"><param</span> <span class="na">name=</span><span class="s">"excludingPattern"</span><span class="nt">></span>.*(hugeCollection).*<span class="nt"></param></span> +<span class="nt"></result></span> </code></pre></div></div> <p>In the following example the XSLT result would use the action’s user property instead of the action as it’s base document @@ -219,15 +219,15 @@ and walk through it’s properties. The <code class="highlighter-rouge">exposedV <li><code class="highlighter-rouge">stylesheetLocation</code> (default) - the location to go to after execution.</li> <li><code class="highlighter-rouge">location</code> (deprecated) - the same as <code class="highlighter-rouge">stylesheetLocation</code> but it was dropped since Struts 2.5.</li> <li><code class="highlighter-rouge">encoding</code> - character encoding used in XML, default UTF-8.</li> - <li><code class="highlighter-rouge">parse</code> - <code class="highlighter-rouge">true</code> by default. If set to false, the location param will not be parsed for Ognl expressions.</li> - <li><code class="highlighter-rouge">matchingPattern</code> - a <code class="highlighter-rouge">Pattern</code> that matches only desired elements, by default it matches everything.</li> - <li><code class="highlighter-rouge">excludingPattern</code> - a <code class="highlighter-rouge">Pattern</code> that eliminates unwanted elements, by default it matches none.</li> + <li><code class="highlighter-rouge">parse</code> - <code class="highlighter-rouge">true</code> by default. If set to false, the location param will not be parsed for Ognl expressions.</li> + <li><code class="highlighter-rouge">matchingPattern</code> - a <code class="highlighter-rouge">Pattern</code> that matches only desired elements, by default it matches everything.</li> + <li><code class="highlighter-rouge">excludingPattern</code> - a <code class="highlighter-rouge">Pattern</code> that eliminates unwanted elements, by default it matches none.</li> </ul> -<p><code class="highlighter-rouge">struts.xml</code> related configuration:</p> +<p><code class="highlighter-rouge">struts.xml</code> related configuration:</p> <ul> - <li><code class="highlighter-rouge">struts.xslt.nocache</code> - Defaults to <code class="highlighter-rouge">false</code>. If set to true, disables stylesheet caching. Good for development, bad for production.</li> + <li><code class="highlighter-rouge">struts.xslt.nocache</code> - defaults to <code class="highlighter-rouge">false</code>. If set to true, disables stylesheet caching. Good for development, bad for production.</li> </ul> <h2 id="examples">Examples</h2> diff --git a/output/tag-developers/a-tag.html b/output/tag-developers/a-tag.html index ccf68f2..4023d18 100644 --- a/output/tag-developers/a-tag.html +++ b/output/tag-developers/a-tag.html @@ -328,6 +328,14 @@ using the <code class="highlighter-rouge">param</code> tag.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -341,7 +349,7 @@ using the <code class="highlighter-rouge">param</code> tag.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">method</td> diff --git a/output/tag-developers/actionerror-tag.html b/output/tag-developers/actionerror-tag.html index 2eff6f0..efb44d4 100644 --- a/output/tag-developers/actionerror-tag.html +++ b/output/tag-developers/actionerror-tag.html @@ -264,6 +264,14 @@ blank string) errors will not be printed. The action error strings will be html <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -277,7 +285,7 @@ blank string) errors will not be printed. The action error strings will be html <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/actionmessage-tag.html b/output/tag-developers/actionmessage-tag.html index 7da51e1..a80d15f 100644 --- a/output/tag-developers/actionmessage-tag.html +++ b/output/tag-developers/actionmessage-tag.html @@ -264,6 +264,14 @@ string) messages will not be printed. The action message strings will be html es <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -277,7 +285,7 @@ string) messages will not be printed. The action message strings will be html es <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/checkbox-tag.html b/output/tag-developers/checkbox-tag.html index c05c94b..e935bad 100644 --- a/output/tag-developers/checkbox-tag.html +++ b/output/tag-developers/checkbox-tag.html @@ -263,6 +263,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -276,7 +284,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/checkboxlist-tag.html b/output/tag-developers/checkboxlist-tag.html index 54f22b5..84b3bba 100644 --- a/output/tag-developers/checkboxlist-tag.html +++ b/output/tag-developers/checkboxlist-tag.html @@ -259,6 +259,14 @@ to be null and not used.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -272,7 +280,7 @@ to be null and not used.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">list</td> diff --git a/output/tag-developers/combobox-tag.html b/output/tag-developers/combobox-tag.html index c332d49..b52f019 100644 --- a/output/tag-developers/combobox-tag.html +++ b/output/tag-developers/combobox-tag.html @@ -289,6 +289,14 @@ out the text field.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -302,7 +310,7 @@ out the text field.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">list</td> diff --git a/output/tag-developers/component-tag.html b/output/tag-developers/component-tag.html index ca81bc4..1ffe47d 100644 --- a/output/tag-developers/component-tag.html +++ b/output/tag-developers/component-tag.html @@ -298,6 +298,14 @@ you would have to set templateDir=”components”, theme=”html” and templat <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -311,7 +319,7 @@ you would have to set templateDir=”components”, theme=”html” and templat <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/css-xhtml-theme.html b/output/tag-developers/css-xhtml-theme.html index d5f3326..022bc9f 100644 --- a/output/tag-developers/css-xhtml-theme.html +++ b/output/tag-developers/css-xhtml-theme.html @@ -229,18 +229,17 @@ the CSS theme does not use a <code class="highlighter-rouge">labelposition</code */ --> <#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> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'> <div <#rt/> <#else> <span <#rt/> </#if> -<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl"> - </code></pre></figure> +<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl"></code></pre></figure> <p>Note that the <code class="highlighter-rouge">fieldErrors</code>, usually caused by <a href="../core-developers/validation.html">Validation</a>, are displayed in a <code class="highlighter-rouge">div</code> block before the element is displayed.</p> @@ -271,21 +270,21 @@ block before the element is displayed.</p> --> ${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> -<#if (labelpos!"top") == 'top'> +<#if (labelPos!"top") == 'top'> </div> <#rt/> <#else> </span> <#rt/> </#if> <#if (parameters.errorposition!"top") == 'bottom'> -<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/> <#if hasFieldErrors> <div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> -<#list fieldErrors[parameters.name] as error> +<#list fieldErrors.get(parameters.name) as error> <div<#rt/> <#if parameters.id??> errorFor="${parameters.id}"<#rt/> diff --git a/output/tag-developers/datetextfield-tag.html b/output/tag-developers/datetextfield-tag.html index cb7a798..f4e2cea 100644 --- a/output/tag-developers/datetextfield-tag.html +++ b/output/tag-developers/datetextfield-tag.html @@ -261,6 +261,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -274,7 +282,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/doubleselect-tag.html b/output/tag-developers/doubleselect-tag.html index 0cf6017..266479f 100644 --- a/output/tag-developers/doubleselect-tag.html +++ b/output/tag-developers/doubleselect-tag.html @@ -545,6 +545,14 @@ and <code class="highlighter-rouge">doublelistvalue</code> to be null and not us <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -558,7 +566,7 @@ and <code class="highlighter-rouge">doublelistvalue</code> to be null and not us <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">list</td> diff --git a/output/tag-developers/fielderror-tag.html b/output/tag-developers/fielderror-tag.html index 62c2795..0f7ee79 100644 --- a/output/tag-developers/fielderror-tag.html +++ b/output/tag-developers/fielderror-tag.html @@ -272,6 +272,14 @@ html escaped by default.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -285,7 +293,7 @@ html escaped by default.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/file-tag.html b/output/tag-developers/file-tag.html index 8d4a01e..68b5bf0 100644 --- a/output/tag-developers/file-tag.html +++ b/output/tag-developers/file-tag.html @@ -261,6 +261,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -274,7 +282,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/form-tag.html b/output/tag-developers/form-tag.html index a02be31..06daca5 100644 --- a/output/tag-developers/form-tag.html +++ b/output/tag-developers/form-tag.html @@ -308,6 +308,14 @@ inserted into any HTML element on the page.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -321,7 +329,7 @@ inserted into any HTML element on the page.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">method</td> diff --git a/output/tag-developers/head-tag.html b/output/tag-developers/head-tag.html index 0fcc341..19b3fec 100644 --- a/output/tag-developers/head-tag.html +++ b/output/tag-developers/head-tag.html @@ -255,6 +255,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -268,7 +276,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/hidden-tag.html b/output/tag-developers/hidden-tag.html index 4f634b0..2b64940 100644 --- a/output/tag-developers/hidden-tag.html +++ b/output/tag-developers/hidden-tag.html @@ -255,6 +255,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -268,7 +276,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/inputtransferselect-tag.html b/output/tag-developers/inputtransferselect-tag.html index ef18ff7..766b991 100644 --- a/output/tag-developers/inputtransferselect-tag.html +++ b/output/tag-developers/inputtransferselect-tag.html @@ -327,6 +327,14 @@ and <code class="highlighter-rouge"><form_id>_<inputtransferselect_doub <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -340,7 +348,7 @@ and <code class="highlighter-rouge"><form_id>_<inputtransferselect_doub <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">leftTitle</td> diff --git a/output/tag-developers/label-tag.html b/output/tag-developers/label-tag.html index 9062123..f5e8296 100644 --- a/output/tag-developers/label-tag.html +++ b/output/tag-developers/label-tag.html @@ -264,6 +264,14 @@ as the rest of your UI controls.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -277,7 +285,7 @@ as the rest of your UI controls.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/optiontransferselect-tag.html b/output/tag-developers/optiontransferselect-tag.html index cf21cd3..fd2c228 100644 --- a/output/tag-developers/optiontransferselect-tag.html +++ b/output/tag-developers/optiontransferselect-tag.html @@ -693,6 +693,14 @@ and <code class="highlighter-rouge"><form_id>_<optiontransferselect_dou <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -706,7 +714,7 @@ and <code class="highlighter-rouge"><form_id>_<optiontransferselect_dou <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">leftDownLabel</td> diff --git a/output/tag-developers/password-tag.html b/output/tag-developers/password-tag.html index a2aaa0b..6cac11e 100644 --- a/output/tag-developers/password-tag.html +++ b/output/tag-developers/password-tag.html @@ -253,6 +253,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -266,7 +274,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">maxLength</td> diff --git a/output/tag-developers/radio-tag.html b/output/tag-developers/radio-tag.html index 817151b..7e31203 100644 --- a/output/tag-developers/radio-tag.html +++ b/output/tag-developers/radio-tag.html @@ -259,6 +259,14 @@ to be null and not used.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -272,7 +280,7 @@ to be null and not used.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">list</td> diff --git a/output/tag-developers/reset-tag.html b/output/tag-developers/reset-tag.html index acf43fa..88663f9 100644 --- a/output/tag-developers/reset-tag.html +++ b/output/tag-developers/reset-tag.html @@ -271,6 +271,14 @@ shown on the button face, but has issues with Microsoft Internet Explorer at lea <td align="left" valign="top">Supply a reset button text apart from reset value. Will have no effect for <i>input</i> type reset, since button text will always be the value parameter.</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -284,7 +292,7 @@ shown on the button face, but has issues with Microsoft Internet Explorer at lea <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">method</td> diff --git a/output/tag-developers/select-tag.html b/output/tag-developers/select-tag.html index 54b22dc..ebc567e 100644 --- a/output/tag-developers/select-tag.html +++ b/output/tag-developers/select-tag.html @@ -279,6 +279,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -292,7 +300,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">list</td> diff --git a/output/tag-developers/submit-tag.html b/output/tag-developers/submit-tag.html index 39a6c39..b54111f 100644 --- a/output/tag-developers/submit-tag.html +++ b/output/tag-developers/submit-tag.html @@ -290,6 +290,14 @@ shown on the button face, but has issues with Microsoft Internet Explorer at lea <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -303,7 +311,7 @@ shown on the button face, but has issues with Microsoft Internet Explorer at lea <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">method</td> diff --git a/output/tag-developers/textarea-tag.html b/output/tag-developers/textarea-tag.html index 91b1621..76e50d4 100644 --- a/output/tag-developers/textarea-tag.html +++ b/output/tag-developers/textarea-tag.html @@ -261,6 +261,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -274,7 +282,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">maxlength</td> @@ -285,6 +293,14 @@ <td align="left" valign="top">HTML maxlength attribute</td> </tr> <tr> + <td align="left" valign="top">minlength</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Integer</td> + <td align="left" valign="top">HTML minlength attribute</td> + </tr> + <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> diff --git a/output/tag-developers/textfield-tag.html b/output/tag-developers/textfield-tag.html index 0875c82..b6e14ff 100644 --- a/output/tag-developers/textfield-tag.html +++ b/output/tag-developers/textfield-tag.html @@ -253,6 +253,14 @@ <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -266,7 +274,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">maxLength</td> diff --git a/output/tag-developers/token-tag.html b/output/tag-developers/token-tag.html index fd70e36..28765c7 100644 --- a/output/tag-developers/token-tag.html +++ b/output/tag-developers/token-tag.html @@ -257,6 +257,14 @@ the unique token.</p> <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -270,7 +278,7 @@ the unique token.</p> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">name</td> diff --git a/output/tag-developers/updownselect-tag.html b/output/tag-developers/updownselect-tag.html index 7009405..4c064ed 100644 --- a/output/tag-developers/updownselect-tag.html +++ b/output/tag-developers/updownselect-tag.html @@ -308,6 +308,14 @@ form is submitted, its elements will be submitted in the order they are arranged <td align="left" valign="top">Label expression used for rendering an element specific label</td> </tr> <tr> + <td align="left" valign="top">labelPosition</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Define label position of form element (top/left)</td> + </tr> + <tr> <td align="left" valign="top">labelSeparator</td> <td align="left" valign="top">false</td> <td align="left" valign="top">:</td> @@ -321,7 +329,7 @@ form is submitted, its elements will be submitted in the order they are arranged <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Define label position of form element (top/left)</td> + <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> </tr> <tr> <td align="left" valign="top">list</td> diff --git a/output/tag-developers/xhtml-theme.html b/output/tag-developers/xhtml-theme.html index 344fdba..3c357ce 100644 --- a/output/tag-developers/xhtml-theme.html +++ b/output/tag-developers/xhtml-theme.html @@ -250,10 +250,10 @@ the <a href="ajax-theme.html">ajax theme</a>) contents:</p> Only show message if errors are available. This will be done if ActionSupport is used. --> -<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/> <#if (parameters.errorposition!"top") == 'top'> <#if hasFieldErrors> -<#list fieldErrors[parameters.name] as error> +<#list fieldErrors.get(parameters.name) as error> <tr errorFor="${parameters.id}"> <td class="tdErrorMessage" colspan="2"><#rt/> <span class="errorMessage">${error}</span><#t/> @@ -262,17 +262,17 @@ the <a href="ajax-theme.html">ajax theme</a>) contents:</p> </#list> </#if> </#if> -<#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> <#-- if the label position is top, then give the label it's own row in the table --> <tr> -<#if (labelpos!"") == 'top'> +<#if (labelPos!"") == 'top'> <td class="tdLabelTop" colspan="2"><#rt/> <#else> <td class="tdLabel"><#rt/> @@ -301,7 +301,7 @@ ${parameters.labelseparator!":"}<#t/> </#if> </td><#lt/> <#-- add the extra row --> -<#if (labelpos!"") == 'top'> +<#if (labelPos!"") == 'top'> </tr> <tr> </#if></code></pre></figure> @@ -346,9 +346,9 @@ ${parameters.after!}<#t/> </td><#lt/> </tr> <#if (parameters.errorposition!"top") == 'bottom'> -<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/> <#if hasFieldErrors> -<#list fieldErrors[parameters.name] as error> +<#list fieldErrors.get(parameters.name) as error> <tr errorFor="${parameters.id}"> <td class="tdErrorMessage" colspan="2"><#rt/> <span class="errorMessage">${error}</span><#t/>