Author: mfortun Date: 2011-06-29 15:28:23 +0200 (Wed, 29 Jun 2011) New Revision: 1005 Url: http://nuiton.org/repositories/revision/wikitty/1005 Log: * improve template Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,24 +1,18 @@ - <#assign aKeys = parameters.wikittyfields><#t/> <#list aKeys as aKey><#t/> - <#if aKey.type=="file"> <input type="hidden" name="${aKey.name}" value="BINARY" /> ${aKey.label} : <input type="file" name="File" label ="File"/> </#if> - <#if aKey.type=="hidden"> <input type="hidden" name="${aKey.name}" value="${aKey.value}" /> </#if> - - <#if aKey.type=="textarea" > ${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> </#if> <#if aKey.type=="textfield" > ${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" > </#if> - <#if aKey.type=="boolean" > ${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true" <#if aKey.value=="true" > @@ -40,7 +34,6 @@ </#if> > ${optionKey.description} </option> </#list><#t/> - </select> </#if> </br> Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,12 +1,8 @@ <form class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" > <input type="hidden" name="id" value="${parameters.wikittyid}" /> -<input type="hidden" name="version" value="${parameters.wikittyversion}" /> -<input type="hidden" name="extensions" value="${parameters.wikittyextensions}"/> <#if parameters.redirect??> <input type="hidden" name="redirect" value="${parameters.redirect}" /> -</#if> +</#if><#t/> <#if parameters.orderBefore?? && parameters.orderBefore==true > <#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" /> -</#if> - - +</#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,7 +1,7 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input type="checkbox" name="${parameters.name}" value="true" - <#if aKey.value=="true" > - checked='true' +${parameters.label} : <input type="checkbox" name="${parameters.name}" value="true" <#t/> + <#if aKey.value=="true" > <#t/> + checked='true'<#t/> </#if> /> </#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,3 +1,3 @@ <#if parameters.included?? && parameters.included==true > -<input type="hidden" name="${parameters.name}" value="${parameters.value}" /> +<input type="hidden" name="${parameters.name}" value="${parameters.value}" /><#t/> </#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,3 +1,3 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea> -</#if> \ No newline at end of file +${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea><#t/> +</#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,3 +1,3 @@ -<#if parameters.included?? && parameters.included==true ><#t/> +<#if parameters.included?? && parameters.included==true > ${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" ><#t/> </#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,12 +1,12 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} :<select name="${parameters.name}" size="1"> -<#assign optionKeys = parameters.wikittiesvalues><#t/> - <#list optionKeys as optionKey><#t/> - <option value="${optionKey.valeur}" +<#assign optionKeys = parameters.wikittiesvalues> + <#list optionKeys as optionKey> + <option value="${optionKey.valeur}"<#t/> <#if optionKey.valeur==parameters.value > - selected - </#if> + selected <#t/> + </#if> <#t/> > ${optionKey.description} </option> - </#list><#t/> -</select> + </#list> +</select><#t/> </#if> \ No newline at end of file