1. opensymphony
  2. webwork

Commits

mbogaert  committed 3f327a1

Final fix and test for WW-660.

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

  • Participants
  • Parent commits ff03947
  • Branches master

Comments (0)

Files changed (4)

File src/java/template/xhtml/checkbox.vm

View file
   #set ($hasFieldErrors = $fieldErrors.get($parameters.name))
   #foreach ($error in $fieldErrors.get($parameters.name))
     <tr>
-        <td align="left" valign="middle" colspan="2"><span class="errorMessage">$!error</span></td>
+        <td align="left" valign="top" colspan="2"><span class="errorMessage">$!error</span></td>
     </tr>
   #end
 #end
 
 <tr>
-    <td valign="middle" colspan="2">
+    <td valign="top" colspan="2">
 #* Use an extra table so that the checkbox doesn't align with the other columns. *#
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>

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

View file
     <td valign="top" colspan="2">
         <table width="100%" border="0" cellpadding="0" cellspacing="0">
             <tr>
-                <td valign="top"><input type="checkbox" name="foo" value="baz" checked="checked" id="someId" onfocus="test();" /></td>
-                <td width="100%" valign="top"><label for="someId" class="checkboxLabel">mylabel</label></td>
+                <td valign="middle"><input type="checkbox" name="foo" value="baz" checked="checked" id="someId" onfocus="test();" /></td>
+                <td width="100%" valign="middle"><label for="someId" class="checkboxLabel">mylabel</label></td>
             </tr>
         </table>
     </td>

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

View file
     <td valign="top" colspan="2">
         <table width="100%" border="0" cellpadding="0" cellspacing="0">
             <tr>
-                <td valign="top"><input type="checkbox" name="foo" value="baz" /></td>
-                <td width="100%" valign="top"><label class="checkboxLabel">mylabel</label></td>
+                <td valign="middle"><input type="checkbox" name="foo" value="baz" /></td>
+                <td width="100%" valign="middle"><label class="checkboxLabel">mylabel</label></td>
             </tr>
         </table>
     </td>

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

View file
     <td valign="top" colspan="2">
         <table width="100%" border="0" cellpadding="0" cellspacing="0">
             <tr>
-                <td valign="top"><input type="checkbox" name="foo" value="baz" checked="checked" onclick="test();" ondblclick="test();" /></td>
-                <td width="100%" valign="top"><label class="checkboxErrorLabel">mylabel</label></td>
+                <td valign="middle"><input type="checkbox" name="foo" value="baz" checked="checked" onclick="test();" ondblclick="test();" /></td>
+                <td width="100%" valign="middle"><label class="checkboxErrorLabel">mylabel</label></td>
             </tr>
         </table>
     </td>