From 7c11bd3564ee44c68e2e5a339aca54b08c4b67df Mon Sep 17 00:00:00 2001
From: James Holmes <jholmes@apache.org>
Date: Tue, 14 Aug 2007 17:29:29 +0000
Subject: [PATCH] WW-2110 css_xhtml checkbox.ftl renders one </div> to many
 when no label exists

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@565844 13f79535-47bb-0310-9956-ffa450edef68
---
 core/src/main/resources/template/css_xhtml/checkbox.ftl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/template/css_xhtml/checkbox.ftl b/core/src/main/resources/template/css_xhtml/checkbox.ftl
index 61990986d..2784eb987 100644
--- a/core/src/main/resources/template/css_xhtml/checkbox.ftl
+++ b/core/src/main/resources/template/css_xhtml/checkbox.ftl
@@ -94,4 +94,11 @@ lables
 >${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>