converted align and valign to css text-align and vertical-align

EddyZhan · May 30, 2014 · 1de0e77 · 1de0e77
1 parent 63897e8
commit 1de0e77
Show file tree

Hide file tree

Showing 45 changed files with 62 additions and 62 deletions.
diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl
@@ -31,7 +31,7 @@
 <span <#rt/>
 </#if>
 <#if parameters.align??>
-    align="${parameters.align?html}"<#t/>
+    style="text-align: ${parameters.align?html};"<#t/>
 </#if>
 <#if parameters.id??>
     id="wwctrl_${parameters.id}"<#rt/>

diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl
@@ -31,7 +31,7 @@
 <span <#rt/>
 </#if>
 <#if parameters.align??>
-    align="${parameters.align?html}"<#t/>
+    style="text-align: ${parameters.align?html};"<#t/>
 </#if>
 <#if parameters.id??>
     id="wwctrl_${parameters.id}"<#rt/>

diff --git a/core/src/main/resources/template/simple/inputtransferselect.ftl b/core/src/main/resources/template/simple/inputtransferselect.ftl
@@ -61,7 +61,7 @@
 
 
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<#assign addLabel=parameters.addLabel?default("->")?html /><#t/>
 	<input type="button"
 		<#if parameters.buttonCssClass??><#t/>

diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl
@@ -47,7 +47,7 @@
 </#if>
 
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<#if parameters.allowAddToLeft?default(true)><#t/>
 		<#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/>
 		<#if parameters.doubleHeaderKey??><#t/>

diff --git a/core/src/main/resources/template/simple/table.ftl b/core/src/main/resources/template/simple/table.ftl
@@ -24,7 +24,7 @@
 <#assign tableModel = webTable.model/>
 
 <#if tableModel??>
-<p align="center">
+<p style="text-align: center;">
 <table bgcolor="white" border="0" cellpadding="1" cellspacing="0" >
     <tr>
         <td>
@@ -40,16 +40,16 @@
                                 <td>
                                     <table border="0" cellspacing="0" cellpadding="0">
                                         <tr>
-                                            <td align="bottom">
+                                            <td style="vertical-align: bottom;">
 <#if false>
-                                                 <img src="images/sorted_asc.gif" border="0" align="bottom" />
+                                                 <img src="images/sorted_asc.gif" border="0" style="vertical-align: bottom;" />
 <#else>
-                                                <a href="<@s.url><@s.param name="${webTable.sortColumnLinkName}" value="${curColumn.offset}"/><@s.param name="${webTable.sortOrderLinkName}" value="ASC"/></@s.url>"><img src="images/unsorted_asc.gif" border="0" align="bottom"/></a>
+                                                <a href="<@s.url><@s.param name="${webTable.sortColumnLinkName}" value="${curColumn.offset}"/><@s.param name="${webTable.sortOrderLinkName}" value="ASC"/></@s.url>"><img src="images/unsorted_asc.gif" border="0" style="vertical-align: bottom;"/></a>
 </#if>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td align="top"></td>
+                                            <td style="vertical-align: top;"></td>
                                         </tr>
                                     </table>
                                 </td>

diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl
@@ -28,7 +28,7 @@
  errorFor="${parameters.id}"<#rt/>
 </#if>
 >
-    <td align="left" valign="top" colspan="2"><#rt/>
+    <td style="text-align: left; vertical-align: top;" colspan="2"><#rt/>
         <span class="errorMessage">${error?html}</span><#t/>
     </td><#lt/>
 </tr>
@@ -72,7 +72,7 @@ ${parameters.label?html}<#t/>
         <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
 <#else>
 <tr>
-	<td valign="top" align="right">
+	<td style="text-align: right; vertical-align: top;">
 <#if labelpos?default("") == 'left'>
 <#if parameters.label??> <label<#t/>
 <#if parameters.id??>
@@ -107,7 +107,7 @@ ${parameters.label?html}<#t/>
     </#if>
 </#if>
     </td>
-    <td valign="top" align="left">
+    <td style="text-align: left; vertical-align: top;">
 
 <#if labelpos?default("") != 'top'>
                 	<#include "/${parameters.templateDir}/simple/checkbox.ftl" />

diff --git a/core/src/main/resources/template/xhtml/controlfooter.ftl b/core/src/main/resources/template/xhtml/controlfooter.ftl
@@ -28,7 +28,7 @@ ${parameters.after?if_exists}<#t/>
 <#if hasFieldErrors>
 <#list fieldErrors[parameters.name] as error>
 <tr errorFor="${parameters.id}">
-    <td align="center" valign="top" colspan="2"><#rt/>
+    <td style="text-align: center; vertical-align: top;" colspan="2"><#rt/>
         <span class="errorMessage">${error?html}</span><#t/>
     </td><#lt/>
 </tr>

diff --git a/core/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl
@@ -29,7 +29,7 @@
 <#if hasFieldErrors>
 <#list fieldErrors[parameters.name] as error>
 <tr errorFor="${parameters.id}">
-    <td align="center" valign="top" colspan="2"><#rt/>
+    <td style="text-align: center; vertical-align: top;" colspan="2"><#rt/>
         <span class="errorMessage">${error?html}</span><#t/>
     </td><#lt/>
 </tr>
@@ -47,7 +47,7 @@
 -->
 <tr>
 <#if labelpos?default("") == 'top'>
-    <td align="left" valign="top" colspan="2"><#rt/>
+    <td style="text-align: left; vertical-align: top;" colspan="2"><#rt/>
 <#else>
     <td class="tdLabel"><#rt/>
 </#if>

diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -23,6 +23,6 @@
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
     <td
 <#if parameters.align??>
-    align="${parameters.align?html}"<#t/>
+    style="text-align: ${parameters.align?html};"<#t/>
 </#if>
 ><#t/>
diff --git a/core/src/main/resources/template/xhtml/reset.ftl b/core/src/main/resources/template/xhtml/reset.ftl
@@ -23,7 +23,7 @@
 <tr>
     <td colspan="2"><div <#rt/>
 <#if parameters.align??>
-    align="${parameters.align?html}"<#t/>
+    style="text-align: ${parameters.align?html};"<#t/>
 </#if>
 ><#t/>
 <#include "/${parameters.templateDir}/simple/reset.ftl" />

diff --git a/core/src/main/resources/template/xhtml/submit.ftl b/core/src/main/resources/template/xhtml/submit.ftl
@@ -23,7 +23,7 @@
 <tr>
     <td colspan="2"><div <#rt/>
 <#if parameters.align??>
-    align="${parameters.align?html}"<#t/>
+    style="text-align: ${parameters.align?html};"<#t/>
 </#if>
 ><#t/>
 <#include "/${parameters.templateDir}/simple/submit.ftl" />
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
@@ -1,7 +1,7 @@
 <tr>
-	<td valign="top" align="right">
+	<td style="text-align: right; vertical-align: top;">
 	</td>
-    <td valign="top" align="left">
+    <td style="text-align: left; vertical-align: top;">
 		<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>
 		<input type="hidden" id="__checkbox_someId" name="__checkbox_foo" value="baz"/>
         <label for="someId" class="checkboxLabel">mylabel</label>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
@@ -1,7 +1,7 @@
 <tr>
-	<td valign="top" align="right">
+	<td style="text-align: right; vertical-align: top;">
 	</td>
-    <td valign="top" align="left">
+    <td style="text-align: left; vertical-align: top;">
         <input type="checkbox" name="foo" value="baz" id="foo" title="mytitle"/>
         <input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
         <label for="foo" class="checkboxLabel">mylabel</label>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
@@ -1,14 +1,14 @@
 <tr errorFor="foo">
-    <td align="left" valign="top" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
+    <td style="text-align: left; vertical-align: top;" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
 </tr>
 <tr errorFor="foo">
-    <td align="left" valign="top" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
+    <td style="text-align: left; vertical-align: top;" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
 </tr>
 <tr>
-	<td valign="top" align="right">
+	<td style="text-align: right; vertical-align: top;">
 
 	</td>
-    <td valign="top" align="left">
+    <td style="text-align: left; vertical-align: top;">
           <input type="checkbox" name="foo" value="baz" checked="checked" id="foo" class="myErrorClass" title="mytitle" onclick="test();" ondblclick="test();"/>
           <input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
           <label for="foo" class="checkboxErrorLabel">mylabel</label>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt
@@ -1,14 +1,14 @@
 <tr errorFor="foo">
-    <td align="left" valign="top" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
+    <td style="text-align: left; vertical-align: top;" colspan="2"><span class="errorMessage">Some Foo Error</span></td>
 </tr>
 <tr errorFor="foo">
-    <td align="left" valign="top" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
+    <td style="text-align: left; vertical-align: top;" colspan="2"><span class="errorMessage">Another Foo Error</span></td>
 </tr>
 <tr>
-	<td valign="top" align="right">
+	<td style="text-align: right; vertical-align: top;">
 
 	</td>
-    <td valign="top" align="left">
+    <td style="text-align: left; vertical-align: top;">
           <input type="checkbox" name="foo" value="baz" checked="checked" id="foo" style="color:red" title="mytitle" onclick="test();" ondblclick="test();"/>
           <input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz"/>
           <label for="foo" class="checkboxErrorLabel">mylabel</label>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt
@@ -1,8 +1,8 @@
 <tr>
-	<td valign="top" align="right">
+	<td style="text-align: right; vertical-align: top;">
 	    <label for="someId" class="checkboxLabel">mylabel:</label>
 	</td>
-    <td valign="top" align="left">
+    <td style="text-align: left; vertical-align: top;">
 		<input type="checkbox" name="foo" value="baz" checked="checked" id="someId" title="mytitle" onfocus="test();"/>
 		<input type="hidden" id="__checkbox_someId" name="__checkbox_foo" value="baz"/>
     </td>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt
@@ -1,7 +1,7 @@
 <tr>
-	<td valign="top" align="right">
+	<td style="text-align: right; vertical-align: top;">
 	</td>
-    <td valign="top" align="left">
+    <td style="text-align: left; vertical-align: top;">
 		<input type="checkbox" name="foo" value="baz" checked="checked" disabled="disabled" id="foo" title="mytitle" />
 		<input type="hidden" id="__checkbox_foo" name="__checkbox_foo" value="baz" disabled="disabled"/>
 		<label for="foo" class="checkboxLabel">mylabel</label>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
@@ -1,7 +1,7 @@
 <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>
+        <td style="text-align: left; vertical-align: top;" colspan="2"><label class="label">label:</label></td>
     </tr>
     <tr>
         <td><input type="text" name=""/></td>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt
@@ -1,5 +1,5 @@
 <tr>
-    <td align="left" valign="top" colspan="2"><label for="myname" class="label">mylabel:</label></td>
+    <td style="text-align: left; vertical-align: top;" colspan="2"><label for="myname" class="label">mylabel:</label></td>
 </tr>
 <tr>
     <td><label id="myname">bar</label></td>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="left"><input type="reset" name="myname" value="bar"/></div></td>
+    <td colspan="2"><div style="text-align: left;"><input type="reset" name="myname" value="bar"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><input type="reset" name="myname" value="Reset" title="mytitle"/></div></td>
+    <td colspan="2"><div style="text-align: right;"><input type="reset" name="myname" value="Reset" title="mytitle"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><button type="reset" name="myname" value="bar">bar</button></div></td>
+    <td colspan="2"><div style="text-align: right;"><button type="reset" name="myname" value="bar">bar</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="left"><button type="reset" name="myname" value="bar">mylabel</button></div></td>
+    <td colspan="2"><div style="text-align: left;"><button type="reset" name="myname" value="bar">mylabel</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><button type="reset" name="myname" value="bar" disabled="disabled">bar</button></div></td>
+    <td colspan="2"><div style="text-align: right;"><button type="reset" name="myname" value="bar" disabled="disabled">bar</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><button type="reset" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
+    <td colspan="2"><div style="text-align: right;"><button type="reset" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="left"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
+    <td colspan="2"><div style="text-align: left;"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
+    <td colspan="2"><div style="text-align: right;"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><button type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1">bar</button></div></td>
+    <td colspan="2"><div style="text-align: right;"><button type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1">bar</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="left"><button type="submit" id="myname" name="myname" value="bar">mylabel</button></div></td>
+    <td colspan="2"><div style="text-align: left;"><button type="submit" id="myname" name="myname" value="bar">mylabel</button></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
+    <td colspan="2"><div style="text-align: right;"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
+    <td colspan="2"><div style="text-align: right;"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt
@@ -1,5 +1,5 @@
 <tr errorFor="myId">
-    <td align="center" valign="top" colspan="2"><span class="errorMessage">bar error message</span></td>
+    <td style="text-align: center; vertical-align: top;" colspan="2"><span class="errorMessage">bar error message</span></td>
 </tr>
 <tr>
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt
@@ -7,7 +7,7 @@
     </td>
 </tr>
 <tr errorFor="myId">
-    <td align="center" valign="top" colspan="2">
+    <td style="text-align: center; vertical-align: top;" colspan="2">
         <span class="errorMessage">barerrormessage</span>
     </td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt
@@ -1,5 +1,5 @@
 <tr errorFor="myId">
-    <td align="center" valign="top" colspan="2">
+    <td style="text-align: center; vertical-align: top;" colspan="2">
         <span class="errorMessage">barerrormessage</span>
     </td>
 </tr>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt
@@ -4,7 +4,7 @@
   <script type="text/javascript" src="/struts/inputtransferselect.js"></script>
   <tableborder="0">
   <tr><td><input type="text" name="collection_input" id="collection_input"/></td>
-      <td valign="middle"align="center"><inputtype="button"value="-&gt;"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
+      <td style="text-align: center; vertical-align: middle;"><inputtype="button"value="-&gt;"onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))"/>
       <br/><br/>
       <input type="button"value="&lt;-"onclick="removeOptions(document.getElementById('collection'))"/>
       <br/><br/>

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
@@ -16,7 +16,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt
@@ -16,7 +16,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', '');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', '');" value="^" />
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt
@@ -16,7 +16,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt
@@ -17,7 +17,7 @@
 	<input type="button" onclick="moveOptionDown(document.getElementById('id'), 'key', 'Header Key');" value="v" />
 	<input type="button" onclick="moveOptionUp(document.getElementById('id'), 'key', 'Header Key');" value="^" />
 </td>
-<td valign="middle" align="center">
+<td style="text-align: center; vertical-align: middle;">
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"
 			value="Left" onclick="moveSelectedOptions(document.getElementById('doubleId'), document.getElementById('id'), false, 'Double Header Key', '');alert('Moving Left');" /><br/><br/>
 	<input type="button" class="buttonCssClass" style="buttonCssStyle"