From 6b360108e57b8986c6409b26cba9b3cd4f16a603 Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Tue, 17 May 2016 08:37:13 -0400
Subject: [PATCH 1/9]     WW-4634

---
 core/src/main/resources/template/xhtml/controlheader.ftl | 5 ++++-
 core/src/main/resources/template/xhtml/styles.css        | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
index e1209cd315..eeebe9f7ce 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -21,5 +21,8 @@
  */
 -->
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
-    <td
+    <td 
+        <#if parameters.align??>
+            class="tdAlign${parameters.align?html}"
+        </#if>
 ><#t/>
diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index 91d5171eee..383578b1c6 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -35,3 +35,8 @@
 .tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
+
+.tdAligncenter{text-align:center;}
+.tdAlignright{text-align:right;}
+.tdAlignleft{text-align:left;}
+.tdAlignjustify{text-align:justify;}

From ffdacf1b60b8bf1df54af004a5fd84752eb522b4 Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Tue, 17 May 2016 09:00:33 -0400
Subject: [PATCH 2/9] WW-4634

---
 core/src/main/resources/template/xhtml/controlheader.ftl | 2 +-
 core/src/main/resources/template/xhtml/styles.css        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
index eeebe9f7ce..8b855b8211 100644
--- 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??>
-            class="tdAlign${parameters.align?html}"
+            class="tdAlign-${parameters.align?html}"
         </#if>
 ><#t/>
diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index 383578b1c6..fe205179e8 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -36,7 +36,7 @@
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
 
-.tdAligncenter{text-align:center;}
-.tdAlignright{text-align:right;}
-.tdAlignleft{text-align:left;}
-.tdAlignjustify{text-align:justify;}
+.tdAlign-center{text-align:center;}
+.tdAlign-right{text-align:right;}
+.tdAlign-left{text-align:left;}
+.tdAlign-justify{text-align:justify;}

From d06c71d68e5c10990386e8904ca60927ed209250 Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Tue, 17 May 2016 09:03:27 -0400
Subject: [PATCH 3/9] WW-4634

---
 core/src/main/resources/template/xhtml/controlheader.ftl | 2 +-
 core/src/main/resources/template/xhtml/styles.css        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
index eeebe9f7ce..8b855b8211 100644
--- 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??>
-            class="tdAlign${parameters.align?html}"
+            class="tdAlign-${parameters.align?html}"
         </#if>
 ><#t/>
diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index 383578b1c6..fe205179e8 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -36,7 +36,7 @@
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
 
-.tdAligncenter{text-align:center;}
-.tdAlignright{text-align:right;}
-.tdAlignleft{text-align:left;}
-.tdAlignjustify{text-align:justify;}
+.tdAlign-center{text-align:center;}
+.tdAlign-right{text-align:right;}
+.tdAlign-left{text-align:left;}
+.tdAlign-justify{text-align:justify;}

From 9e11b2c2b1962d3bcaa1c2744ecda56f42e21b77 Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Tue, 17 May 2016 09:17:35 -0400
Subject: [PATCH 4/9] WW-4634

---
 core/src/main/resources/template/xhtml/controlheader.ftl | 2 +-
 core/src/main/resources/template/xhtml/styles.css        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
index 8b855b8211..ed8f63ac88 100644
--- 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??>
-            class="tdAlign-${parameters.align?html}"
+            class="align-${parameters.align?html}"
         </#if>
 ><#t/>
diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index fe205179e8..c292a69dfb 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -36,7 +36,7 @@
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
 
-.tdAlign-center{text-align:center;}
-.tdAlign-right{text-align:right;}
-.tdAlign-left{text-align:left;}
-.tdAlign-justify{text-align:justify;}
+.align-center{text-align:center;}
+.align-right{text-align:right;}
+.align-left{text-align:left;}
+.align-justify{text-align:justify;}

From 175d0d42dbb063ad999fef96493ed3b75b9b2c58 Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Wed, 25 May 2016 07:52:23 -0400
Subject: [PATCH 5/9] Add a class .tdInput for future and use align attribute
 with class="align-${parameters.align?html}"

---
 core/src/main/resources/template/xhtml/controlheader.ftl | 6 ++++--
 core/src/main/resources/template/xhtml/styles.css        | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl
index ed8f63ac88..c14779e5a5 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -22,7 +22,9 @@
 -->
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
     <td 
-        <#if parameters.align??>
-            class="align-${parameters.align?html}"
+        <#if parameters.align?? >
+            class="align-${parameters.align?html}" 
+         <#else >
+            class="tdInput"            
         </#if>
 ><#t/>
diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index c292a69dfb..fce6563d8b 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -34,6 +34,7 @@
 .tdCheckboxInput {text-align:left; vertical-align:top;}
 .tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
 .tdErrorMessage {text-align:center; vertical-align:top;}
+.tdInput {text-align:left;}
 .formButton {text-align:right;}
 
 .align-center{text-align:center;}

From c70f2409f2facb8d30cb19d3e9c12946cafc4c53 Mon Sep 17 00:00:00 2001
From: victor sosa <victorsosa@users.noreply.github.com>
Date: Wed, 25 May 2016 08:29:20 -0400
Subject: [PATCH 6/9] Update styles.css

---
 core/src/main/resources/template/xhtml/styles.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index fce6563d8b..4cc1d35e0f 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -34,8 +34,9 @@
 .tdCheckboxInput {text-align:left; vertical-align:top;}
 .tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
 .tdErrorMessage {text-align:center; vertical-align:top;}
-.tdInput {text-align:left;}
 .formButton {text-align:right;}
+.tdInput {text-align:left;}
+
 
 .align-center{text-align:center;}
 .align-right{text-align:right;}

From dce6d3e110cd37b4ecffc160b2e681d11886b46c Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Wed, 25 May 2016 09:23:13 -0400
Subject: [PATCH 7/9] test fix

---
 .../org/apache/struts2/views/jsp/ui/CheckboxList-1.txt        | 2 +-
 .../org/apache/struts2/views/jsp/ui/CheckboxList-2.txt        | 2 +-
 .../org/apache/struts2/views/jsp/ui/CheckboxList-3.txt        | 2 +-
 .../org/apache/struts2/views/jsp/ui/CheckboxList-4.txt        | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Component-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Component-3.txt | 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt        | 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt        | 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt        | 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt        | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/File-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-1.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-2.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-3.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-4.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-5.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Password-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-1.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-2.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-3.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-4.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-5.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-6.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-7.txt     | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-1.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-10.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-11.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-12.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-13.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-2.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-3.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-4.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-5.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-6.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-7.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-8.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-9.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt | 2 +-
 .../org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt | 4 ++--
 .../apache/struts2/views/jsp/ui/optiontransferselect-1.txt    | 2 +-
 .../apache/struts2/views/jsp/ui/optiontransferselect-2.txt    | 2 +-
 .../apache/struts2/views/jsp/ui/optiontransferselect-3.txt    | 2 +-
 .../apache/struts2/views/jsp/ui/optiontransferselect-4.txt    | 2 +-
 .../apache/struts2/views/jsp/ui/optiontransferselect-5.txt    | 2 +-
 .../apache/struts2/views/jsp/ui/optiontransferselect-6.txt    | 2 +-
 .../apache/struts2/views/jsp/ui/optiontransferselect-7.txt    | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt   | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-1.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-10.txt    | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-11.txt    | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-2.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-3.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-4.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-5.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-6.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-7.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-8.txt     | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-9.txt     | 2 +-
 81 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
index 0458cea2a0..3f40324f1e 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <input type="checkbox" name="foo" value="hello" id="foo-1" checked="checked" title="mytitle" onchange="alert('foo');"/>
 <label for="foo-1" class="checkboxLabel">world</label>
 <input type="checkbox" name="foo" value="foo" id="foo-2" title="mytitle" onchange="alert('foo');"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt
index abdaa44148..afd930d8ef 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <input type="checkbox" name="collection" value="hello" id="collection-1" checked="checked"/>
 <label for="collection-1" class="checkboxLabel">world</label>
 <input type="checkbox" name="collection" value="foo" id="collection-2" checked="checked"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt
index 5fe2bf5840..98284f057d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <input type="checkbox" name="collection" value="hello" id="collection-1" checked="checked" disabled="disabled"/>
 <label for="collection-1" class="checkboxLabel">world</label>
 <input type="checkbox" name="collection" value="foo" id="collection-2" checked="checked" disabled="disabled"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt
index 3ba9c42d7f..7bf890a04c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <input type="checkbox" name="foo" value="hello" id="foo-1" checked="checked" disabled="disabled" onchange="alert('foo');"/>
 <label for="foo-1" class="checkboxLabel">world</label>
 <input type="checkbox" name="foo" value="foo" id="foo-2" disabled="disabled" onchange="alert('foo');"/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
index 1c416a598d..fc3c1c0a88 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="cb" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <script type="text/javascript">
 	function autoPopulate_cb(targetElement) {
 		targetElement.form.elements['foo'].value=targetElement.options[targetElement.selectedIndex].value;
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
index f7cc3b2645..c993bf92dc 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myFavouriteFruit" class="label">My Favourite Fruit:</label></td>
-    <td>
+    <td class="tdInput">
 <script type="text/javascript">
 	function autoPopulate_myFavouriteFruit(targetElement) {
 		if (targetElement.options[targetElement.selectedIndex].value == '-1') {
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
index f7cc3b2645..c993bf92dc 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myFavouriteFruit" class="label">My Favourite Fruit:</label></td>
-    <td>
+    <td class="tdInput">
 <script type="text/javascript">
 	function autoPopulate_myFavouriteFruit(targetElement) {
 		if (targetElement.options[targetElement.selectedIndex].value == '-1') {
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
index 2ccd24e0c4..cea746551d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt
@@ -1,6 +1,6 @@
  <tr>
      <td class="tdLabel"><label for="cb.bc" class="label">mylabel:</label></td>
-     <td>
+     <td class="tdInput">
  <script type="text/javascript">
     function autoPopulate_cb_bc(targetElement) {
         targetElement.form.elements['foo'].value=targetElement.options[targetElement.selectedIndex].value;
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt
index d436237cb9..f08c6f90cf 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt
@@ -2,7 +2,7 @@
 	<td class="tdLabel">
 		<label for="myFooValue" class="label">mylabel:</label>
 	</td>
-	<td>
+	<td class="tdInput">
 		<input type="text" name="myname" value="foo" id="myFooValue"/>
 	</td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt
index d6f06421ca..41e3573498 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt
@@ -2,7 +2,7 @@
 	<td class="tdLabel">
 		<label for="foo" class="label">mylabel:</label>
 	</td>
-	<td>
+	<td class="tdInput">
 		<input type="text" name="myname" value="foo" id="foo"/>
 	</td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
index e4a6db1695..a6417030c3 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
     <option value="FR">France</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
index b2e8552ee5..662e3bac70 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="foo" id="foo" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
     <option value="FR" selected="selected">France</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
index 66f0c5b890..b36023aa9e 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo_bar" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="foo.bar" id="foo_bar" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="foo_barRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
     <option value="FR">France</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
index 93cdddb3cc..6608439833 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex);window.status='onchange';">
     <option value="BE">Belgium</option>
     <option value="FR">France</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt
index 206f4d9096..124c221759 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td><input type="file" name="myname" size="10" value="" accept="*.txt" id="myname" title="mytitle"/></td>
+    <td class="tdInput"><input type="file" name="myname" size="10" value="" accept="*.txt" id="myname" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt
index f96bc1c4a1..6277c225f0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td><label id="myname" title="mytitle">bar</label></td>
+    <td class="tdInput"><label id="myname" title="mytitle">bar</label></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt
index f4859443c9..cbb368837d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="foo2" class="label">mylabel:</label></td>
-    <td><label id="foo2" for="for">baz</label></td>
+    <td class="tdInput"><label id="foo2" for="for">baz</label></td>
 </tr>
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
index d66737f62d..d68de5b566 100644
--- 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
@@ -2,5 +2,5 @@
     <td class="tdLabelTop" colspan="2"><label for="myname" class="label">mylabel:</label></td>
 </tr>
 <tr>
-    <td><label id="myname">bar</label></td>
+    <td class="tdInput"><label id="myname">bar</label></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt
index b190ae5238..4e0f6af426 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td><label id="foo" for="for">output</label></td>
+    <td class="tdInput"><label id="foo" for="for">output</label></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt
index 17addde782..b7df72e799 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td><label id="foo" for="for">baz</label></td>
+    <td class="tdInput"><label id="foo" for="for">baz</label></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt
index 6865d239d2..c8628c9e53 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="mySelection" id="mySelection">
     <option value="ONE">one</option>
     <option value="TWO">two</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt
index b8e105e42e..3bf1f9afc2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="mySelection" id="mySelection">
     <option value="ONE">one</option>
     <option value="TWO">two</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt
index 20d52aab5f..6b26e6c366 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="mySelection" id="mySelection" multiple="multiple">
     <option value="ONE">one</option>
     <option value="TWO" selected="selected">two</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
index 27ced4c214..ba2022d521 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="mySelection" id="mySelection">
     <option value="ONE">one</option>
     <option value="TWO">two</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt
index 7000959850..62b4bf04da 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="mySelection" id="mySelection" multiple="multiple">
     <option value="ONE">one</option>
     <option value="TWO" selected="selected">two</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
index 99ed29753e..1273aca91c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="mySelection" id="mySelection">
     <option value="ONE">Edno</option>
     <option value="TWO">Dve</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt
index 9a31727352..f4a0d28032 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="mySelection" class="label">My Selection:</label></td>
-    <td>
+    <td class="tdInput">
 <select name="mySelection" id="mySelection" multiple="multiple">
     <option value="1">one</option>
     <option value="2" selected="selected">two</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt
index be4c1e0f6c..9b3749e5d2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td><input type="password" name="myname" id="myname" title="mytitle"/></td>
+    <td class="tdInput"><input type="password" name="myname" id="myname" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
index 0a42dea3da..0de6d84164 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <input type="radio" name="myname" id="mynamehello" value="hello"/><label for="mynamehello">world</label>
 <input type="radio" name="myname" id="mynamefoo" value="foo"/><label for="mynamefoo">bar</label>
     </td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt
index f5b694a61d..cb8160ccab 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
         <input type="radio" name="myname" id="myname1" checked="checked" value="1"/><label for="myname1">One</label>
         <input type="radio" name="myname" id="myname2" value="2"/><label for="myname2">Two</label>
     </td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt
index 746e04467d..64963f1bb6 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <input type="radio" name="myname" id="mynametrue" checked="checked" value="true"/><label for="mynametrue">male</label>
 <input type="radio" name="myname" id="mynamefalse" value="false"/><label for="mynamefalse">female</label>
     </td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
index 1ac889aa53..ccb749cabe 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
 <input type="radio" name="myname" id="myname" checked="checked" value=""/><label for="myname">N/A</label>
 <input type="radio" name="myname" id="myname1" value="1"/><label for="myname1">One</label>
 <input type="radio" name="myname" id="myname2" value="2"/><label for="myname2">Two</label>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
index ca0e82e088..c51b769421 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel--</label></td>
-    <td>
+    <td class="tdInput">
 <input type="radio" name="myname" id="mynamehello" value="hello"/><label for="mynamehello">world</label>
 <input type="radio" name="myname" id="mynamefoo" value="foo"/><label for="mynamefoo">bar</label>
     </td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
index d58184796a..6bc0381dcf 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"></td>
-    <td>
+    <td class="tdInput">
         <input type="radio" name="myMap['name']" id="myMap_'name'_"value=""/>
         <label for="myMap_'name'_">N/A</label>
         <input type="radio" name="myMap['name']" id="myMap_'name'_Opt." value="Opt."/>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt
index b1f903e0f1..04be0ecbca 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td>
+    <td class="tdInput">
         <input type="radio" name="myname" id="mynamehello" value="hello" dojo="checked:hello"/><label for="mynamehello">world</label>
         <input type="radio" name="myname" id="mynamefoo" value="foo" dojo="checked:foo"/><label for="mynamefoo">bar</label>
     </td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt
index 7bf1ba537e..cd25957dd2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td><select name="foo" id="foo">
+    <td class="tdInput"><select name="foo" id="foo">
     <option value="headerKey">headerValue</option>
     <option value=""></option>
     <option value="hello" selected="selected">world</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt
index ddef927b40..2ab7ed30d5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
-    <td><select name="collection" id="collection" title="mytitle" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
+    <td class="tdInput"><select name="collection" id="collection" title="mytitle" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="1" selected="selected">hello</option>
     <option value="2" selected="selected">foo</option>
 </select>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt
index 09aad69f1a..e0608ddb9b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="fooInt" class="label">mylabel:</label></td>
-    <td><select name="fooInt" id="fooInt">
+    <td class="tdInput"><select name="fooInt" id="fooInt">
     <option value="headerKey">headerValue</option>
     <option value=""></option>
     <option value="1" selected="selected">hello</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
index be3be8ca33..79a3732703 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
-    <td><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
+    <td class="tdInput"><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="1" selected="selected">foo</option>
     <option value="2">bar</option>
     <option value="300000000" selected="selected">foobar</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
index 9101514163..9e6e9e4bff 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="status" class="label">mylabel:</label></td>
-    <td><select name="status" id="status">
+    <td class="tdInput"><select name="status" id="status">
     <option value="INIT">init</option>
     <option value="COMPLETED" selected="selected">completed</option>
 </select></td>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt
index 50b96bb3c2..e9b24a4364 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
-    <td><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
+    <td class="tdInput"><select name="collection" id="collection" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="hello" selected="selected">world</option>
     <option value="foo" selected="selected">bar</option>
     <option value="cat">dog</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt
index 7c3cfef11a..91f11f6218 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="collection" class="label">mylabel:</label></td>
-    <td><select name="collection" id="collection" title="mytitle" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
+    <td class="tdInput"><select name="collection" id="collection" title="mytitle" multiple="multiple" onmousedown="alert('onmousedown');" onmouseup="alert('onmouseup');" onmouseover="alert('onmouseover');" onmousemove="alert('onmousemove');" onmouseout="alert('onmouseout');">
     <option value="hello" selected="selected">1</option>
     <option value="foo" selected="selected">2</option>
     <option value="&lt;cat&gt;">1.5</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt
index 93e929facf..7e4ff89248 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt
@@ -1,5 +1,5 @@
 <tr>
     <td class="tdLabel"><label for="collection" class="label">tmjee_name:</label></td>
-    <td><select name="collection" id="collection">
+    <td class="tdInput"><select name="collection" id="collection">
 </select></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt
index 5766f391dd..0112b71efc 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myId" class="label">media1:</label></td>
-    <td><select name="myName" id="myId" multiple="multiple">
+    <td class="tdInput"><select name="myName" id="myId" multiple="multiple">
     <option value=""></option>
     <option value="aaa">aaa</option>
     <option value="bbb">bbb</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt
index bc216c4db8..f6dd7e6815 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="myId" class="label">media2:</label></td>
-    <td><select name="myName" id="myId">
+    <td class="tdInput"><select name="myName" id="myId">
     <option value=""></option>
     <option value="aaa">aaa</option>
     <option value="bbb">bbb</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt
index d3688f2e50..b38d88dfc2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td><select name="foo" id="foo">
+    <td class="tdInput"><select name="foo" id="foo">
     <option value="headerKey">hello: headerValue</option>
     <option value=""></option>
     <option value="hello" selected="selected">hello - world</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
index b858072a3c..16021b3a2c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt
@@ -1,6 +1,6 @@
 <tr>
 <td class="tdLabel"><label for="myPet" class="label">myLabel:</label></td>
-<td>
+<td class="tdInput">
 <select name="myPet" id="myPet">
     <option value="-1" selected="selected">--- Please Select ---</option>
     <option value="1">Cat</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt
index 68e4d8ceab..adb1cbda5d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt
@@ -1,6 +1,6 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td><select name="foo" id="foo">
+    <td class="tdInput"><select name="foo" id="foo">
     <option value="headerKey">headerValue</option>
     <option value=""></option>
     <option value="hello" selected="selected"></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt
index 5c38c5b3ef..3b6fe998c4 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="the_id" class="label">mylabel:</label></td>
-    <td><textarea name="myname" cols="20" rows="30" disabled="disabled" readonly="readonly" tabindex="5" id="the_id" title="mytitle" onclick="alert('onclick');" onkeyup="alert('hello');" onchange="alert('goodbye');">bar</textarea></td>
+    <td class="tdInput"><textarea name="myname" cols="20" rows="30" disabled="disabled" readonly="readonly" tabindex="5" id="the_id" title="mytitle" onclick="alert('onclick');" onkeyup="alert('hello');" onchange="alert('goodbye');">bar</textarea></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt
index 40dfacf63e..8a783b52fe 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td><input type="text" name="myname" size="10" value="bar" id="myname"/></td>
+    <td class="tdInput"><input type="text" name="myname" size="10" value="bar" id="myname"/></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
index fc370890b7..53b6c10351 100644
--- 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
@@ -3,5 +3,5 @@
 </tr>
 <tr>
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
-    <td><input type="text" name="foo" value="bar" id="myId" title="mytitle"/></td>
+    <td class="tdInput"><input type="text" name="foo" value="bar" id="myId" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt
index c90ae3687a..e1e3154694 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"></td>
-    <td><input type="text" name="myname" size="10" value="bar" id="myname" onblur="blahescape('somevalue');"/></td>
+    <td class="tdInput"><input type="text" name="myname" size="10" value="bar" id="myname" onblur="blahescape('somevalue');"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt
index cb24f04eee..c583312c62 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt
@@ -2,5 +2,5 @@
     <td class="tdLabel">
         <label for="myname" class="label">label??</label>
     </td>
-    <td><input type="text" name="myname" size="10" value="bar" id="myname" onblur="blahescape('somevalue');"/></td>
+    <td class="tdInput"><input type="text" name="myname" size="10" value="bar" id="myname" onblur="blahescape('somevalue');"/></td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
index 5dfc6245e8..08326c7765 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td>
-    <td><input type="text" name="myname" size="10" value="%{1+1}" id="myname"/></td>
+    <td class="tdInput"><input type="text" name="myname" size="10" value="%{1+1}" id="myname"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
index e6ecb5cec6..01809d015c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
-    <td><input type="text" name="foo" size="10" value="%{1+1}" id="foo"/></td>
+    <td class="tdInput"><input type="text" name="foo" size="10" value="%{1+1}" id="foo"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt
index 45d4ffba82..e923560696 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt
@@ -1,4 +1,4 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">myemaillabel:</label></td>
-    <td><input type="email" name="foo" size="50" value="bar" id="foo"/></td>
+    <td class="tdInput"><input type="email" name="foo" size="50" value="bar" id="foo"/></td>
 </tr>
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
index b3e3addc91..4d090a0353 100644
--- 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
@@ -2,7 +2,7 @@
     <td class="tdLabel">
         <label for="myId" class="errorLabel">mylabel:</label>
     </td>
-    <td>
+    <td class="tdInput">
         <input type="text" name="foo" value="bar" id="myId" title="mytitle"/>
     </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
index a0cb054490..bf8b17091c 100644
--- 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
@@ -7,7 +7,7 @@
     <td class="tdLabel">
         <labelfor="myId" class="errorLabel">mylabel:</label>
     </td>
-    <td>
+    <td class="tdInput">
         <input type="text" name="foo" value="bar" id="myId" title="mytitle"/>
     </td>
 </tr>
\ No newline at end of file
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
index 47324f3471..22062bf7f4 100644
--- 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
@@ -1,6 +1,6 @@
 <tr>
-  <tdclass="tdLabel"></td>
-  <td>
+  <td class="tdLabel"></td>
+  <td class="tdInput">
   <script type="text/javascript" src="/struts/inputtransferselect.js"></script>
   <table>
   <tr><td><input type="text" name="collection_input" id="collection_input"/></td>
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
index be8fd8fced..d423b3a3c8 100644
--- 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
@@ -1,6 +1,6 @@
 <tr> 
 <td class="tdLabel"></td> 
-<td>
+<td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr>
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
index 3e3642190e..2713ceca63 100644
--- 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
@@ -1,6 +1,6 @@
 <tr> 
 <td class="tdLabel"></td>
-<td>
+<td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr>
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
index a7905457bf..fee9003667 100644
--- 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
@@ -1,6 +1,6 @@
 <tr> 
 <td class="tdLabel"></td>
-<td>
+<td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr>
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
index 4454ed2f92..61668b22a6 100644
--- 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
@@ -1,6 +1,6 @@
 <tr> 
 <td class="tdLabel"></td>
-<td>
+<td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr>
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
index cbcde657c6..dc0057fdd5 100644
--- 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
@@ -1,6 +1,6 @@
 <tr> 
 <td class="tdLabel"></td> 
-<td>
+<td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr>
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
index 68f689b7bd..ade6e348ab 100644
--- 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
@@ -1,6 +1,6 @@
 <tr> 
 <td class="tdLabel"></td>
-<td>
+<td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr>
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
index 75f5aaf4cd..9becafca59 100644
--- 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
@@ -1,6 +1,6 @@
 <tr> 
 <td class="tdLabel"></td>
-<td>
+<td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
index 7701269ab3..8394cb502b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
@@ -8,7 +8,7 @@
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/>
 				</label>
 			</td>
-			<td>
+			<td class="tdInput">
 				<input type="text" name="" id="myId"/>
 			</td>
 		</tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
index 8c7d2fe327..596854e731 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
@@ -8,7 +8,7 @@
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/>
 				</label>
 			</td>
-			<td>
+			<td class="tdInput">
 				<input type="text" name="" id="myId"/>
 			</td>
 		</tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
index a8871b6a68..e4885645a5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
@@ -8,7 +8,7 @@
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','5000','styleClass','StrutsTTClassic')"/>
 				</label>
 			</td>
-			<td>
+			<td class="tdInput">
 				<input type="text" name="" id="myId"/>
 			</td>
 		</tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt
index 36cb71127c..f8aad53bd5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt
@@ -8,7 +8,7 @@
 								title="myTooltip" alt="myTooltip" />
 				</label>
 			</td>
-			<td>
+			<td class="tdInput">
 				<input type="text" name="" id="myId"/>
 			</td>
 		</tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
index 1781a6edc6..8949d2ad6c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
     <option value=""></option>
     <option value="england" selected="selected">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
index 02dc6af745..2cf75d1ee8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
index cbcb6da1e8..dc3cab5a8b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
index 8409926825..c6cd2f0d0f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
     <option value="england">England</option>
     <option value="america" selected="selected">America</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
index 6882b436d8..de67ff76db 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value="-1">--- Please Order ---</option>
 	<option value=""></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
index 8f95fa6ee5..3692648db3 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value="-1">--- Please Order ---</option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
index d8d80a4434..6019a1e14f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
index 16a2760f76..17473293a5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
index 863b1346d7..a9bda39262 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
index b3d73dae64..45df86b4ff 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
index 9a3dc0c9bf..7a7b723e89 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
@@ -1,7 +1,7 @@
 <tr> <td class="tdLabel"></td> <td>
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td>
+<tr><td class="tdInput">
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>

From 2cd28b160ec72af7888951019762f1c069c65bf2 Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Wed, 25 May 2016 09:47:28 -0400
Subject: [PATCH 8/9] fix test

---
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt   | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-1.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-10.txt    | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-11.txt    | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-2.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-3.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-4.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-5.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-6.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-7.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-8.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-9.txt     | 4 ++--
 .../org/apache/struts2/views/jsp/ui/validationstyles-1.txt    | 2 +-
 .../org/apache/struts2/views/jsp/ui/validationstyles-2.txt    | 2 +-
 .../org/apache/struts2/views/jsp/ui/validationstyles-3.txt    | 2 +-
 20 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
index e64dc79a39..efb3596b5c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
@@ -3,7 +3,7 @@
 <form id="testAction" name="myForm" onsubmit="submitMe(); return validateForm_testAction();" action="/testAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="testAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
index 8cd21021ec..806a94e874 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
@@ -3,7 +3,7 @@
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
index ab2a1ee586..710ad541a9 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
@@ -3,7 +3,7 @@
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
index afbd0491dd..f512ff4d57 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
@@ -3,7 +3,7 @@
 <form id="doubleValidationAction" name="myForm" onsubmit="submitMe(); return validateForm_doubleValidationAction();" action="/doubleValidationAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8" onreset="clearErrorMessages(this);clearErrorLabels(this);">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="doubleValidationAction_myUpDownSelectTag" multiple="multiple">
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
index a9b92445ca..01efdf18b1 100644
--- 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
@@ -4,7 +4,7 @@
         <td class="tdLabelTop" colspan="2"><label class="label">label:</label></td>
     </tr>
     <tr>
-        <td><input type="text" name=""/></td>
+        <td class="tdInput"><input type="text" name=""/></td>
     </tr>
 </table>
 </form>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
index 3487b33703..2c62222d34 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
@@ -1,7 +1,7 @@
 <form id="myAction" name="myForm" onsubmit="submitMe()" action="myAction" method="post" enctype="myEncType" title="mytitle">
 <table class="wwFormTable"> <tr>
     <td class="tdLabel"></td>
-    <td>	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
+    <td class="tdInput">	<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
 <tr><td>
 <select name="myUpDownSelectTag" size="5" id="myAction_myUpDownSelectTag" multiple="multiple">
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
index 8949d2ad6c..2f0974e93c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
     <option value=""></option>
     <option value="england" selected="selected">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
index 2cf75d1ee8..b98ee464a2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
index dc3cab5a8b..593a7b9b27 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
index c6cd2f0d0f..a00d294036 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
     <option value="england">England</option>
     <option value="america" selected="selected">America</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
index de67ff76db..40d57d5c4f 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value="-1">--- Please Order ---</option>
 	<option value=""></option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
index 3692648db3..1237d1bd69 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value="-1">--- Please Order ---</option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
index 6019a1e14f..6a87c2165d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
index 17473293a5..2a8ccd6a37 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
index a9bda39262..6d6fab994b 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
index 45df86b4ff..939b784019 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
index 7a7b723e89..bebbd9bb64 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt
@@ -1,7 +1,7 @@
-<tr> <td class="tdLabel"></td> <td>
+<tr> <td class="tdLabel"></td> <td class="tdInput">
 <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
 <table>
-<tr><td class="tdInput">
+<tr><td>
 <select name="myName" size="5" id="myId" multiple="multiple">
 	<option value=""></option>
     <option value="england">England</option>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
index 57bfbf69f2..fc1633532c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt
@@ -3,5 +3,5 @@
 </tr>
 <tr>                                    
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
-    <td><input type="text" name="foo" value="bar" id="myId" style="style" title="mytitle"/></td>
+    <td class="tdInput"><input type="text" name="foo" value="bar" id="myId" style="style" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
index e965d43227..8bdb4b6bf9 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt
@@ -3,5 +3,5 @@
 </tr>
 <tr>
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
-    <td><input type="text" name="foo" value="bar" id="myId" style="errstyle" title="mytitle"/></td>
+    <td class="tdInput"><input type="text" name="foo" value="bar" id="myId" style="errstyle" title="mytitle"/></td>
 </tr>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
index 67d52b2479..c35c1ea620 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt
@@ -3,5 +3,5 @@
 </tr>
 <tr>
     <td class="tdLabel"><label for="myId" class="errorLabel">mylabel:</label></td>
-    <td><input type="text" name="foo" value="bar" id="myId" class="errclass" title="mytitle"/></td>
+    <td class="tdInput"><input type="text" name="foo" value="bar" id="myId" class="errclass" title="mytitle"/></td>
 </tr>

From e0b13a5b0b5e7820729cba570082fe698dacb7c7 Mon Sep 17 00:00:00 2001
From: victorsosa <victor.sosa@peopleware.do>
Date: Wed, 25 May 2016 10:38:37 -0400
Subject: [PATCH 9/9] fix test cases

---
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
index 9a3155d4d0..956c891055 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
@@ -5,7 +5,7 @@
       <span class="required">*</span>:
     </label>
   </td>
-  <td>
+  <td class="tdInput">
     <input type="text" name="foo" value="bar" id="myId"/>
   </td>
 </tr>
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
index e5e6e926d8..373f0dca7d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
@@ -5,7 +5,7 @@
       mylabel:
     </label>
   </td>
-  <td>
+  <td class="tdInput">
     <input type="text" name="foo" value="bar" id="myId"/>
   </td>
 </tr>
\ No newline at end of file