Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

moving CSS class declaration to the UL tag to make styling more flexible. Per WW-2655

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@722375 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Wesley Wannemacher
2008-12-02 05:19:57 +00:00
parent 4bc9f8f62d
commit aebc654a59
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/css_xhtml/styles.css
+1 -1
View File
@@ -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;}
core/src/main/resources/template/simple/fielderror.ftl
+13 -13
View File
@@ -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/>
</#if><#t/>
core/src/main/resources/template/xhtml/styles.css
+1 -1
View File
@@ -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;}
core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt
+4 -4
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt
+3 -3
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt
+3 -3
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt
+2 -2
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-6.txt
+2 -2
View File
@@ -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>