- Revision
- 649
- Author
- mauro
- Date
- 2008-04-21 12:38:59 -0500 (Mon, 21 Apr 2008)
Log Message
Refactored FTL validation macros.
Modified Paths
- trunk/examples/freemarker-example/src/main/webapp/errors.ftl
- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl
- trunk/waffle-resources/src/main/resources/ftl/waffle/validation.ftl
Diff
Modified: trunk/examples/freemarker-example/src/main/webapp/errors.ftl (648 => 649)
--- trunk/examples/freemarker-example/src/main/webapp/errors.ftl 2008-04-21 16:59:00 UTC (rev 648) +++ trunk/examples/freemarker-example/src/main/webapp/errors.ftl 2008-04-21 17:38:59 UTC (rev 649) @@ -1,4 +1,4 @@ <#import "/ftl/waffle/validation.ftl" as v> -<@v.errorsAsDiv errors /> +<@v.errorsAsUl errors "true" "false" "class='errors'"/> \ No newline at end of file
Modified: trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl (648 => 649)
--- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl 2008-04-21 16:59:00 UTC (rev 648) +++ trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl 2008-04-21 17:38:59 UTC (rev 649) @@ -4,7 +4,7 @@ <h3>Edit Person</h3> - <@v.errorsAsDiv errors /> + <@v.errorsAsUl errors "true" "false" "class='errors'"/> <div class="fieldRow"> <label for=""
Modified: trunk/waffle-resources/src/main/resources/ftl/waffle/validation.ftl (648 => 649)
--- trunk/waffle-resources/src/main/resources/ftl/waffle/validation.ftl 2008-04-21 16:59:00 UTC (rev 648) +++ trunk/waffle-resources/src/main/resources/ftl/waffle/validation.ftl 2008-04-21 17:38:59 UTC (rev 649) @@ -6,18 +6,36 @@ --> <#-- - * Shows errors as Div with CSS class "errors". - * Each error is contained in div with class "error". + * Shows error messages as <ul> * * @param errors the ErrorsContext + * @param showType the boolean flag to show or not the error type + * @param showStack the boolean flag to show or not the error stack + * @param attributes any additional attributes for the element (defaults to "") --> -<#macro errorsAsDiv errors> +<#macro errorsAsUl errors showType="false" showStack="true" attributes=""> <#if errors.hasErrorMessages()> - <div class="errors"> - <#list errors.allErrorMessages as error> - <div class="error">${error.message}</div> + <ul ${attributes}> + <#list errors.allErrorMessages as error> + <li><#if showType=='true'>[${error.type}] </#if> ${error.message} + <#if showStack=='true'><@listAsUl error.getStackMessages()![] attributes/></#if> + </li> </#list> - </div> + </ul> </#if> </#macro> +<#-- + * Shows a list of values as <ul> + * + * @param values the values + * @param attributes any additional attributes for the element (defaults to "") + --> +<#macro listAsUl values attributes=""> +<ul ${attributes}> +<#list values as value> + <li>${value}</li> +</#list> +</ul> +</#macro> +
To unsubscribe from this list please visit:
