svn commit: r1202798 - /struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl

[jogep]

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