Author: musachy
Date: Sat Dec 20 09:05:17 2008
New Revision: 728303
URL: http://svn.apache.org/viewvc?rev=728303&view=rev
Log:
WW-2930 Apply css and style attributes to ul tags, instead if li in actionerror
and actionmessage
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl?rev=728303&r1=728302&r2=728303&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
Sat Dec 20 09:05:17 2008
@@ -21,9 +21,7 @@
*/
-->
<#if (actionErrors?? && actionErrors?size > 0)>
- <ul>
- <#list actionErrors as error>
- <li><span<#rt/>
+ <ul<#rt/>
<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
<#else>
@@ -32,7 +30,9 @@
<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
->${error!}</span></li>
+>
+ <#list actionErrors as error>
+ <li><span>${error!}</span></li>
</#list>
</ul>
</#if>
\ No newline at end of file
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl?rev=728303&r1=728302&r2=728303&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
Sat Dec 20 09:05:17 2008
@@ -21,9 +21,7 @@
*/
-->
<#if (actionMessages?? && actionMessages?size > 0)>
- <ul>
- <#list actionMessages as message>
- <li><span<#rt/>
+ <ul<#rt/>
<#if parameters.cssClass??>
class="${parameters.cssClass?html}"<#rt/>
<#else>
@@ -32,7 +30,9 @@
<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
->${message!}</span></li>
+>
+ <#list actionMessages as message>
+ <li><span>${message!}</span></li>
</#list>
</ul>
</#if>
\ No newline at end of file
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt?rev=728303&r1=728302&r2=728303&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt
Sat Dec 20 09:05:17 2008
@@ -1,5 +1,5 @@
-<ul>
- <li><span class="errorMessage">action error number 1</span></li>
- <li><span class="errorMessage">action error number 2</span></li>
- <li><span class="errorMessage">action error number 3</span></li>
+<ul class="errorMessage">
+ <li><span>action error number 1</span></li>
+ <li><span>action error number 2</span></li>
+ <li><span>action error number 3</span></li>
</ul>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt?rev=728303&r1=728302&r2=728303&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt
Sat Dec 20 09:05:17 2008
@@ -1,5 +1,5 @@
-<ul>
- <li><span class="actionMessage">action message number 1</span></li>
- <li><span class="actionMessage">action message number 2</span></li>
- <li><span class="actionMessage">action message number 3</span></li>
+<ul class="actionMessage">
+ <li><span>action message number 1</span></li>
+ <li><span>action message number 2</span></li>
+ <li><span>action message number 3</span></li>
</ul>
