Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4283 Extends label position of <s:form> to propagate to elements

Browse Source
This commit is contained in:
Lukasz Lenart
2014-03-27 18:41:52 +01:00
parent 94e20fefcd
commit 5fb27ba7e7
12 changed files with 168 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/css_xhtml/checkbox.ftl
+11 -6
View File
@@ -41,7 +41,12 @@ lables
</#list>
</div><#t/>
</#if>
<#if parameters.labelposition?default("") == 'left'>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if labelpos?default("") == 'left'>
<span <#rt/>
<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
<label<#t/>
@@ -57,7 +62,7 @@ lables
</span>
</#if>
<#if parameters.labelposition?default("top") == 'top'>
<#if labelpos?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
@@ -69,14 +74,14 @@ lables
</#if>
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
<#if parameters.labelposition?default("") != 'left'>
<#if parameters.labelposition?default("top") == 'top'>
<#if labelpos?default("") != 'left'>
<#if labelpos?default("top") == 'top'>
</div> <#rt/>
<#else>
</span> <#rt/>
</#if>
<#if parameters.label??>
<#if parameters.labelposition?default("top") == 'top'>
<#if labelpos?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
@@ -95,7 +100,7 @@ lables
</#if>
</#if>
<#if parameters.label??>
<#if parameters.labelposition?default("top") == 'top'>
<#if labelpos?default("top") == 'top'>
</div> <#rt/>
<#else>
</span> <#rt/>
core/src/main/resources/template/css_xhtml/controlfooter.ftl
+6 -1
View File
@@ -22,7 +22,12 @@
-->
${parameters.after?if_exists}<#t/>
<#lt/>
<#if parameters.labelposition?default("top") == 'top'>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if labelpos?default("top") == 'top'>
</div> <#rt/>
<#else>
</span> <#rt/>
core/src/main/resources/template/css_xhtml/controlheader-core.ftl
+7 -2
View File
@@ -43,8 +43,13 @@
</#if>
</#if>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if parameters.label??>
<#if parameters.labelposition?default("top") == 'top'>
<#if labelpos?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
@@ -66,7 +71,7 @@
${parameters.label?html}${parameters.labelseparator!":"?html}
<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
</label><#t/>
<#if parameters.labelposition?default("top") == 'top'>
<#if labelpos?default("top") == 'top'>
</div> <br /><#rt/>
<#else>
</span> <#rt/>
core/src/main/resources/template/css_xhtml/controlheader.ftl
+6 -1
View File
@@ -21,7 +21,12 @@
*/
-->
<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl">
<#if parameters.labelposition?default("top") == 'top'>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if labelpos?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
core/src/main/resources/template/css_xhtml/reset.ftl
+7 -2
View File
@@ -20,7 +20,12 @@
* under the License.
*/
-->
<#if parameters.labelposition?default("top") == 'top'>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if labelpos?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
@@ -33,7 +38,7 @@
</#if>
><#t/>
<#include "/${parameters.templateDir}/simple/reset.ftl" />
<#if parameters.labelposition?default("top") == 'top'>
<#if labelpos?default("top") == 'top'>
</div> <#t/>
<#else>
</span> <#t/>
core/src/main/resources/template/css_xhtml/submit-close.ftl
+6 -1
View File
@@ -1,5 +1,10 @@
<#include "/${parameters.templateDir}/simple/submit-close.ftl" />
<#if parameters.labelposition?default("top") == 'top'>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if labelpos?default("top") == 'top'>
</div> <#t/>
<#else>
</span> <#t/>
core/src/main/resources/template/css_xhtml/submit.ftl
+6 -1
View File
@@ -20,7 +20,12 @@
* under the License.
*/
-->
<#if parameters.labelposition?default("top") == 'top'>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if labelpos?default("top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
core/src/main/resources/template/xhtml/checkbox.ftl
+10 -5
View File
@@ -34,7 +34,12 @@
</tr>
</#list>
</#if>
<#if parameters.labelposition?default("") == 'top'>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
<#if labelpos?default("") == 'top'>
<tr>
<td colspan="2">
<#if parameters.label??> <label<#t/>
@@ -68,7 +73,7 @@ ${parameters.label?html}<#t/>
<#else>
<tr>
<td valign="top" align="right">
<#if parameters.labelposition?default("") == 'left'>
<#if labelpos?default("") == 'left'>
<#if parameters.label??> <label<#t/>
<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
@@ -93,7 +98,7 @@ ${parameters.label?html}<#t/>
</label><#t/>
</#if>
</#if>
<#if parameters.labelposition?default("") == 'right'>
<#if labelpos?default("") == 'right'>
<#if parameters.required?default(false)>
<span class="required">*</span><#t/>
</#if>
@@ -104,10 +109,10 @@ ${parameters.label?html}<#t/>
</td>
<td valign="top" align="left">
<#if parameters.labelposition?default("") != 'top'>
<#if labelpos?default("") != 'top'>
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
</#if>
<#if parameters.labelposition?default("") != 'top' && parameters.labelposition?default("") != 'left'>
<#if labelpos?default("") != 'top' && labelpos?default("") != 'left'>
<#if parameters.label??> <label<#t/>
<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
core/src/main/resources/template/xhtml/controlheader-core.ftl
+7 -2
View File
@@ -36,12 +36,17 @@
</#list>
</#if>
</#if>
<#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 parameters.labelposition?default("") == 'top'>
<#if labelpos?default("") == 'top'>
<td align="left" valign="top" colspan="2"><#rt/>
<#else>
<td class="tdLabel"><#rt/>
@@ -70,7 +75,7 @@ ${parameters.labelseparator?default(":")?html}<#t/>
</#if>
</td><#lt/>
<#-- add the extra row -->
<#if parameters.labelposition?default("") == 'top'>
<#if labelpos?default("") == 'top'>
</tr>
<tr>
</#if>
core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
+82
View File
@@ -622,6 +622,88 @@ public class FormTagTest extends AbstractUITagTest {
}
public void testFormWithTopLabelPosition() throws Exception {
FormTag form = new FormTag();
form.setTheme("xhtml");
form.setAction("testAction");
form.setPageContext(pageContext);
form.setIncludeContext(false);
form.setLabelposition("top");
TextFieldTag text = new TextFieldTag();
text.setPageContext(pageContext);
text.setLabel("label");
form.doStartTag();
text.doStartTag();
text.doEndTag();
form.doEndTag();
verify(FormTag.class.getResource("Formtag-27.txt"));
}
public void testFormWithTopLabelPositionWithElementOverride() throws Exception {
FormTag form = new FormTag();
form.setTheme("xhtml");
form.setAction("testAction");
form.setPageContext(pageContext);
form.setIncludeContext(false);
form.setLabelposition("left");
TextFieldTag text = new TextFieldTag();
text.setPageContext(pageContext);
text.setLabel("label");
text.setLabelposition("top");
form.doStartTag();
text.doStartTag();
text.doEndTag();
form.doEndTag();
verify(FormTag.class.getResource("Formtag-27.txt"));
}
public void testFormWithTopLabelPositionCssXhtml() throws Exception {
FormTag form = new FormTag();
form.setTheme("css_xhtml");
form.setAction("testAction");
form.setPageContext(pageContext);
form.setIncludeContext(false);
form.setLabelposition("top");
TextFieldTag text = new TextFieldTag();
text.setPageContext(pageContext);
text.setLabel("label");
form.doStartTag();
text.doStartTag();
text.doEndTag();
form.doEndTag();
verify(FormTag.class.getResource("Formtag-28.txt"));
}
public void testFormWithTopLabelPositionWithElementOverrideCssXhtml() throws Exception {
FormTag form = new FormTag();
form.setTheme("css_xhtml");
form.setAction("testAction");
form.setPageContext(pageContext);
form.setIncludeContext(false);
form.setLabelposition("left");
TextFieldTag text = new TextFieldTag();
text.setPageContext(pageContext);
text.setLabel("label");
text.setLabelposition("top");
form.doStartTag();
text.doStartTag();
text.doEndTag();
form.doEndTag();
verify(FormTag.class.getResource("Formtag-28.txt"));
}
@Override
protected void setUp() throws Exception {
super.setUp();
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
+10
View File
@@ -0,0 +1,10 @@
<form id="testAction" name="testAction" action="/testAction.action" method="post">
<table class="wwFormTable">
<tr>
<td align="left" valign="top" colspan="2"><label class="label">label:</label></td>
</tr>
<tr>
<td><input type="text" name=""/></td>
</tr>
</table>
</form>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-28.txt
+10
View File
@@ -0,0 +1,10 @@
<form id="testAction" name="testAction" action="/testAction.action" method="post">
<div class="wwgrp">
<div class="wwlbl">
<label class="label">label:</label>
</div><br />
<div class="wwctrl">
<input type="text" name=""/>
</div>
</div>
</form>