Author: sletellier Date: 2011-07-04 14:57:41 +0200 (Mon, 04 Jul 2011) New Revision: 1039 Url: http://nuiton.org/repositories/revision/wikitty/1039 Log: Move template to correct directory Added: trunk/wikitty-struts/src/main/resources/template/ trunk/wikitty-struts/src/main/resources/template/xhtml/ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield-close.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl Removed: trunk/wikitty-struts/src/main/java/template/ Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,9 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/> + <#if aKey.value=="true" > <#t/> + checked='true'<#t/> + </#if> + /> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,3 @@ +<#if parameters.id?? ><#t/> +id="${parameters.id}"<#t/> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,7 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p> +</#if><#t/> + + Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,6 @@ +<#include "/${parameters.templateDir}/xhtml/ws-form-commons.ftl" /> +<input type="submit" name="store" value="Store" /> +<#if parameters.allowDelete?? && parameters.allowDelete==true > +<input type="submit" name="delete" value="Delete" /> +</#if> +</form> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,50 @@ +<#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 +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + type="hidden" name="${aKey.name}" value="${aKey.value}" /> +</#if> +<#if aKey.type=="textarea" > +${aKey.label} : <textarea +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> +</#if> +<#if aKey.type=="textfield" > +${aKey.label} : <input +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + type="text" name="${aKey.name}" value="${aKey.value}" > +</#if> +<#if aKey.type=="boolean" > +${aKey.label} : <input +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + type="checkbox" name="${aKey.name}" value="true" + <#if aKey.value=="true" > + checked='true' + </#if> + /> +</#if> +<#-- + +--> +<#if aKey.type=="select" > +${aKey.label} : +<select +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + name="${aKey.name}" size="1"> +<#assign optionKeys = aKey.listOption><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==aKey.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> +</select> +</#if> +</br> +</#list><#t/> Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,10 @@ +<form +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> +class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" > +<input type="hidden" name="id" value="${parameters.wikittyid}" /> +<#if parameters.redirect??> +<input type="hidden" name="redirect" value="${parameters.redirect}" /> +</#if><#t/> +<#if parameters.orderBefore?? && parameters.orderBefore==true > +<#include "/${parameters.templateDir}/xhtml/ws-form-commons.ftl" /> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +<input +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> +type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,14 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + name="${parameters.fqFieldName}" size="1"> +<#assign optionKeys = parameters.wikittiesvalues> + <#list optionKeys as optionKey> + <option value="${optionKey.valeur}"<#t/> + <#if optionKey.valeur==parameters.value > + selected <#t/> + </#if> <#t/> + > ${optionKey.description} </option> + </#list> +</select><#t/> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,14 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> +name="${parameters.fqFieldName}" size="1"> +<#assign optionKeys = parameters.fixvalues><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" <#t/> + <#if optionKey.valeur==parameters.value > + selected <#t/> + </#if> <#t/> + > ${optionKey.description} </option> + </#list> +</select><#t/> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <textarea +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl 2011-07-04 12:57:41 UTC (rev 1039) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> +type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/> +</#if><#t/> \ No newline at end of file