Author: hermanns
Date: Fri Nov 17 05:06:43 2006
New Revision: 476129
URL: http://svn.apache.org/viewvc?view=rev&rev=476129
Log:
fixed checkbox for css_xhtml
Issue number: WW-1455
Submitted by: Mike McMahon
Modified:
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl?view=diff&rev=476129&r1=476128&r2=476129
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/checkbox.ftl
Fri Nov 17 05:06:43 2006
@@ -19,6 +19,21 @@
</#list>
</div><#t/>
</#if>
+<#if parameters.labelposition?default("") == 'left'>
+<span <#rt/>
+<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if>
class="wwlbl">
+<label<#t/>
+<#if parameters.id?exists>
+ for="${parameters.id?html}"<#rt/>
+</#if>
+<#if hasFieldErrors>
+ class="checkboxErrorLabel"<#rt/>
+<#else>
+ class="label"<#rt/>
+</#if>
+>${parameters.label?html}</label><#rt/>
+</span>
+</#if>
<#if parameters.labelposition?default("top") == 'top'>
<div <#rt/>
@@ -32,12 +47,13 @@
</#if>
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
+<#if parameters.labelposition?default("") != 'left'>
<#if parameters.labelposition?default("top") == 'top'>
</div> <#rt/>
<#else>
</span> <#rt/>
</#if>
-<#if parameters.label?exists>
+<#if parameters.label?exists>
<#if parameters.labelposition?default("top") == 'top'>
<div <#rt/>
<#else>
@@ -54,5 +70,6 @@
class="checkboxLabel"<#rt/>
</#if>
>${parameters.label?html}</label><#rt/>
+</#if>
</#if>
<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
