Author: vbriand Date: 2011-04-08 09:56:14 +0200 (Fri, 08 Apr 2011) New Revision: 65 Url: http://chorem.org/repositories/revision/chorem/65 Log: Added comments to explain changes in overloaded templates Modified: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl Modified: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -39,6 +39,7 @@ <#if parameters.title??> title="${parameters.title?html}"<#rt/> </#if> +<#-- vbriand-2001-04-08 added parameter name --> <#if parameters.name??> name="${parameters.name?html}"<#rt/> </#if> Modified: trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -29,6 +29,7 @@ <#if parameters.id??> id="${parameters.id?html}"<#rt/> </#if> +<#-- vbriand-2001-04-08 removed parameter name which isn't W3C compliant --> <#if parameters.onsubmit??> onsubmit="${parameters.onsubmit?html}"<#rt/> </#if> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -25,6 +25,10 @@ This will be done if ActionSupport is used. --> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<#-- vbriand-2001-04-08 removed all table elements and/or replaced them by their +non-table equivalents +Note: maybe it would be better if the errors messages were displayed in a list +(with <ul><li>...) rather than by using <span> --> <#if hasFieldErrors> <#list fieldErrors[parameters.name] as error> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/file.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,6 +20,7 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 removed /xhtml/control-close.ftl which closes the <table> tag --> <#include "/${parameters.templateDir}/simple/form-close.ftl" /> <#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" /> <#if parameters.focusElement?if_exists != ""> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -30,3 +30,4 @@ </#if> </#if>

+<#-- vbriand-2001-04-08 removed /xhtml/control.ftl which opens the <table> tag --> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/password.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -1 +1,3 @@ <#include "/${parameters.templateDir}/simple/submit-close.ftl" /> +<#-- vbriand-2001-04-08 removed a </div> tag and /xhtml/controlfooter.ftl which +closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,4 +20,5 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 removed a table row creation --> <#include "/${parameters.templateDir}/simple/submit.ftl" /> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/text.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> Modified: trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl =================================================================== --- trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2011-04-07 23:10:16 UTC (rev 64) +++ trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2011-04-08 07:56:14 UTC (rev 65) @@ -20,5 +20,9 @@ * under the License. */ --> +<#-- vbriand-2001-04-08 replaced /controlheader.ftl by /controlheader-core.ftl +because the first one includes the second one and only opens a new table +element --> <#include "/${parameters.templateDir}/${parameters.theme}/controlheader-core.ftl" /> <#include "/${parameters.templateDir}/simple/textarea.ftl" /> +<#-- vbriand-2001-04-08 removed /xhtml/controlfooter.ftl which closes a table row--> \ No newline at end of file