Commits

Anonymous committed d6f69fe

Comments (0)

Files changed (5)

src/java/template/css_xhtml/checkbox.ftl

-<#assign hasFieldErrors = fieldErrors?exists && fieldErrors[parameters.name]?exists/>
-<#if hasFieldErrors>
-<#list fieldErrors[parameters.name] as error>
-<p<#rt/>
-<#if parameters.id?exists>
- errorFor="${parameters.id}"<#rt/>
-</#if>
->
-        <span class="errorMessage">${error?html}</span><#t/>
-</p>
-</#list>
-</#if>
-
-<p>
+<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<div<#rt/><#if parameters.id?exists>id="wwctrl_${parameters.id}"<#rt/></#if>>
 <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
 <label<#rt/>
 <#if parameters.id?exists>
  class="checkboxLabel"<#rt/>
 </#if>
 >${parameters.label?html}</label><#rt/>
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /><#nt/>
+<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>

src/java/template/css_xhtml/checkboxlist.ftl

 <#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/checkboxlist.ftl" />
-    <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
+<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>

src/java/template/css_xhtml/controlfooter.ftl

 ${parameters.after?if_exists}<#t/>
     <#lt/>
 
-</p>
+</div>
 </div>

src/java/template/css_xhtml/controlheader.ftl

 	This will be done if ActionSupport is used.
 -->
 <#assign hasFieldErrors = fieldErrors?exists && fieldErrors[parameters.name]?exists/>
-<div>
+<div <#rt/><#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/></#if>>
+	
 <#if hasFieldErrors>
+<div <#rt/><#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/></#if>>
 <#list fieldErrors[parameters.name] as error>
     <div<#rt/>
     <#if parameters.id?exists>
              ${error?html}
     </div><#t/>
 </#list>
+</div><#t/>
 </#if>
 
-<p>
+<div <#rt/><#if parameters.id?exists>id="wwctrl_${parameters.id}"<#rt/></#if>>
 
 <#if parameters.label?exists>
     <label <#t/>

src/java/template/css_xhtml/submit.ftl

 <#if parameters.align?exists>
     align="${parameters.align?html}"<#t/>
 </#if>
+<#if parameters.id?exists>
+    id="wwctrl_${parameters.id}"<#rt/>
+</#if>
 ><#t/>
 <#include "/${parameters.templateDir}/simple/submit.ftl" />
 </div><#t/>