Return-Path: 
 <commits-return-9554-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
X-Original-To: apmail-struts-commits-archive@minotaur.apache.org
Delivered-To: apmail-struts-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 62143947C
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Wed, 16 Nov 2011 17:29:25 +0000 (UTC)
Received: (qmail 96325 invoked by uid 500); 16 Nov 2011 17:29:25 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 96269 invoked by uid 500); 16 Nov 2011 17:29:25 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 96262 invoked by uid 99); 16 Nov 2011 17:29:25 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 17:29:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 17:29:23 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9795C2388A02
	for <commits@struts.apache.org>; Wed, 16 Nov 2011 17:29:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1202798 -
 /struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
Date: Wed, 16 Nov 2011 17:29:03 -0000
To: commits@struts.apache.org
From: jogep@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111116172903.9795C2388A02@eris.apache.org>

Author: jogep
Date: Wed Nov 16 17:29:03 2011
New Revision: 1202798

URL: http://svn.apache.org/viewvc?rev=1202798&view=rev
Log:
WW-3708: <s:checkboxlist> UI tag ignores CSS related parameters

Modified:
    struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl?rev=1202798&r1=1202797&r2=1202798&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl Wed Nov 16 17:29:03 2011
@@ -22,39 +22,42 @@
 -->
 <#assign itemCount = 0/>
 <#if parameters.list??>
-    <@s.iterator value="parameters.list">
-        <#assign itemCount = itemCount + 1/>
-        <#if parameters.listKey??>
-            <#assign itemKey = stack.findValue(parameters.listKey)/>
+<@s.iterator value="parameters.list">
+    <#assign itemCount = itemCount + 1/>
+    <#if parameters.listKey??>
+        <#assign itemKey = stack.findValue(parameters.listKey)/>
         <#else>
             <#assign itemKey = stack.findValue('top')/>
-        </#if>
-        <#if parameters.listValue??>
-            <#assign itemValue = stack.findString(parameters.listValue)?default("")/>
+    </#if>
+    <#if parameters.listValue??>
+        <#assign itemValue = stack.findString(parameters.listValue)?default("")/>
         <#else>
             <#assign itemValue = stack.findString('top')/>
-        </#if>
-<#assign itemKeyStr=itemKey.toString() />
-<input type="checkbox" name="${parameters.name?html}" value="${itemKeyStr?html}" id="${parameters.name?html}-${itemCount}"<#rt/>
-        <#if tag.contains(parameters.nameValue, itemKey)>
- checked="checked"<#rt/>
-        </#if>
-        <#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-        </#if>
-        <#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-        </#if>
-        <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-        <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-/>
+    </#if>
+    <#assign itemKeyStr=itemKey.toString() />
+<input type="checkbox" name="${parameters.name?html}" value="${itemKeyStr?html}"
+       id="${parameters.name?html}-${itemCount}"<#rt/>
+    <#if tag.contains(parameters.nameValue, itemKey)>
+       checked="checked"<#rt/>
+    </#if>
+    <#if parameters.disabled?default(false)>
+       disabled="disabled"<#rt/>
+    </#if>
+    <#if parameters.title??>
+       title="${parameters.title?html}"<#rt/>
+    </#if>
+    <#include "/${parameters.templateDir}/simple/css.ftl" />
+    <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+    <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
+        />
 <label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label>
-    </@s.iterator>
-<#else>
-  &nbsp;
+</@s.iterator>
+    <#else>
+    &nbsp;
 </#if>
-<input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}" value=""<#rt/>
+<input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}"
+       value=""<#rt/>
 <#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
+       disabled="disabled"<#rt/>
 </#if>
- /> 
\ No newline at end of file
+        />
\ No newline at end of file