From aebc654a5923047fb84efbcfbd35a1110ff23942 Mon Sep 17 00:00:00 2001
From: Wesley Wannemacher <wesw@apache.org>
Date: Tue, 2 Dec 2008 05:19:57 +0000
Subject: [PATCH] moving CSS class declaration to the UL tag to make styling
 more flexible. Per WW-2655

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@722375 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/template/css_xhtml/styles.css   |  2 +-
 .../resources/template/simple/fielderror.ftl  | 26 +++++++++----------
 .../main/resources/template/xhtml/styles.css  |  2 +-
 .../struts2/views/jsp/ui/fielderror-1.txt     |  8 +++---
 .../struts2/views/jsp/ui/fielderror-3.txt     |  6 ++---
 .../struts2/views/jsp/ui/fielderror-4.txt     |  6 ++---
 .../struts2/views/jsp/ui/fielderror-5.txt     |  4 +--
 .../struts2/views/jsp/ui/fielderror-6.txt     |  4 +--
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/core/src/main/resources/template/css_xhtml/styles.css b/core/src/main/resources/template/css_xhtml/styles.css
index 88ced472f..d17b53cf6 100644
--- a/core/src/main/resources/template/css_xhtml/styles.css
+++ b/core/src/main/resources/template/css_xhtml/styles.css
@@ -26,7 +26,7 @@
     width:30%
 }
 .errorLabel {font-style:italic; color:red; }
-.errorMessage {font-weight:bold; text-align: center; color:red; }
+.errorMessage {font-weight:bold; color:red; }
 .checkboxLabel {}
 .checkboxErrorLabel {color:red; }
 .required {color:red;}
diff --git a/core/src/main/resources/template/simple/fielderror.ftl b/core/src/main/resources/template/simple/fielderror.ftl
index cfba98152..52899f1e1 100644
--- a/core/src/main/resources/template/simple/fielderror.ftl
+++ b/core/src/main/resources/template/simple/fielderror.ftl
@@ -33,11 +33,7 @@
 			<#assign haveMatchedErrorField=true><#t/>
 			<#assign eValue = fieldErrors[fieldErrorFieldName]><#t/>
 			<#if (haveMatchedErrorField && (!doneStartUlTag))><#t/>
-				<ul>
-				<#assign doneStartUlTag=true><#t/>
-			</#if><#t/>
-			<#list eValue as eEachValue><#t/>
-				<li><span<#rt/>
+				<ul<#rt/>
 <#if parameters.cssClass??>
  class="${parameters.cssClass?html}"<#rt/>
 <#else>
@@ -46,7 +42,11 @@
 <#if parameters.cssStyle??>
  style="${parameters.cssStyle?html}"<#rt/>
 </#if>
->${eEachValue}</span></li>
+>
+				<#assign doneStartUlTag=true><#t/>
+			</#if><#t/>
+			<#list eValue as eEachValue><#t/>
+				<li><span>${eEachValue}</span></li>
 			</#list><#t/>			
 		</#if><#t/>
 		</#list><#t/>
@@ -57,11 +57,7 @@
 	</#if><#t/>
 <#else><#t/>	
 	<#if (eKeysSize > 0)><#t/>
-		<ul>
-			<#list eKeys as eKey><#t/>
-				<#assign eValue = fieldErrors[eKey]><#t/>
-				<#list eValue as eEachValue><#t/>
-					<li><span<#rt/>
+		<ul<#rt/>
 <#if parameters.cssClass??>
  class="${parameters.cssClass?html}"<#rt/>
 <#else>
@@ -70,10 +66,14 @@
 <#if parameters.cssStyle??>
  style="${parameters.cssStyle?html}"<#rt/>
 </#if>
->${eEachValue}</span></li>
+>
+			<#list eKeys as eKey><#t/>
+				<#assign eValue = fieldErrors[eKey]><#t/>
+				<#list eValue as eEachValue><#t/>
+					<li><span>${eEachValue}</span></li>
 				</#list><#t/>
 			</#list><#t/>
 		</ul>
 	</#if><#t/>
 </#if><#t/>
-</#if><#t/>
\ No newline at end of file
+</#if><#t/>
diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css
index 7497f4529..dd549049b 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -22,7 +22,7 @@
 .wwFormTable {}
 .label {font-style:italic; }
 .errorLabel {font-style:italic; color:red; }
-.errorMessage {font-weight:bold; text-align: center; color:red; }
+.errorMessage {font-weight:bold; color:red; }
 .checkboxLabel {}
 .checkboxErrorLabel {color:red; }
 .required {color:red;}
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt
index b09fdd96f..eeb5239f7 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt
@@ -1,5 +1,5 @@
-<ul>
-	<li><span class="errorMessage">field error message number 1</span></li>
-	<li><span class="errorMessage">field error message number 2</span></li>
-	<li><span class="errorMessage">field error message number 3</span></li>
+<ul class="errorMessage">
+	<li><span>field error message number 1</span></li>
+	<li><span>field error message number 2</span></li>
+	<li><span>field error message number 3</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt
index 4e4744369..45ecee7c0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt
@@ -1,4 +1,4 @@
-<ul>
-	<li><span class="errorMessage">field error message number 1</span></li>
-	<li><span class="errorMessage">field error message number 3</span></li>
+<ul class="errorMessage">
+	<li><span>field error message number 1</span></li>
+	<li><span>field error message number 3</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt
index cf0a1a709..77f669c17 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt
@@ -1,4 +1,4 @@
-<ul>
-	<li><span class="errorMessage">field error message number 1</span></li>
-	<li><span class="errorMessage">field error message number 2</span></li>
+<ul class="errorMessage">
+	<li><span>field error message number 1</span></li>
+	<li><span>field error message number 2</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt
index 98fabae4d..2c3d42a09 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt
@@ -1,3 +1,3 @@
-<ul>
-	<li><span class="errorMessage">field error message number 2</span></li>
+<ul class="errorMessage">
+	<li><span>field error message number 2</span></li>
 </ul>
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt
index e780c6011..005578301 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt
@@ -1,3 +1,3 @@
-<ul>
-	<li><span class="errorMessage">field error message number 1</span></li>
+<ul class="errorMessage">
+	<li><span>field error message number 1</span></li>
 </ul>
\ No newline at end of file