Commits

Anonymous committed 03823b8

Fixed checkbox tests, fixed top label position for checkbox to not include extra rows/columns

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@2551573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (3)

src/java/template/xhtml/checkbox.ftl

 <tr>
     <td colspan="2">
         <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
-    </td>
-</tr>
-</#if>
+<#else>
 <tr>
 	<td valign="top" align="right">
 <#if parameters.labelposition?default("") == 'left'>
 >${parameters.label?html}</label><#rt/>
 </#if>
 </#if>
+</#if>
  <#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /><#nt/>

src/test/com/opensymphony/webwork/views/jsp/ui/Checkbox-4.txt

 <tr>
     <td colspan="2">
-        <label for="someId" class="checkboxLabel">mylabel</label>
+        <label for="someId" class="checkboxLabel">mylabel:</label>
     </td>
 </tr>
 <tr>
-	<td valign="top" align="right">
-	</td>
-    <td valign="top" align="left">
+    <td colspan="2">
 		<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>
     </td>
 </tr>

src/test/com/opensymphony/webwork/views/jsp/ui/Checkbox-5.txt

 <tr>
 	<td valign="top" align="right">
-	    <label for="someId" class="checkboxLabel">mylabel</label>
+	    <label for="someId" class="checkboxLabel">mylabel:</label>
 	</td>
     <td valign="top" align="left">
 		<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>