Author: jholmes
Date: Tue Aug 14 10:29:29 2007
New Revision: 565844
URL: http://svn.apache.org/viewvc?view=rev&rev=565844
Log:
WW-2110 css_xhtml checkbox.ftl renders one </div> to many when no label exists
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=565844&r1=565843&r2=565844
==============================================================================
---
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
Tue Aug 14 10:29:29 2007
@@ -94,4 +94,11 @@
>${parameters.label?html}</label><#rt/>
</#if>
</#if>
-<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
+<#if parameters.label?exists>
+<#if parameters.labelposition?default("top") == 'top'>
+</div> <#rt/>
+<#else>
+</span> <#rt/>
+</#if>
+</#if>
+</div>