Author: sletellier Date: 2011-07-05 15:42:02 +0200 (Tue, 05 Jul 2011) New Revision: 1047 Url: http://nuiton.org/repositories/revision/wikitty/1047 Log: - Set as parent theme css_xhtml - Move templates to wikitty directory - Set wikitty theme name in abstract component Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl Removed: trunk/wikitty-struts/src/main/resources/template/xhtml/ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 11:54:44 UTC (rev 1046) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 13:42:02 UTC (rev 1047) @@ -79,6 +79,7 @@ } else { addParameter("name", fqFieldName); } + addParameter("theme", getTheme()); // check if field included // if so add the parametter included @@ -93,8 +94,12 @@ } } } - + @Override + public String getTheme() { + return "wikitty"; + } + public WikittyFieldHandler getHandler() { return handler; } Added: trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1 @@ +parent = css_xhtml Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,9 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="checkbox" 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/wikitty/ws-commons.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,4 @@ +name=${parameters.name} +<#if parameters.id?? ><#t/> +id="${parameters.id}"<#t/> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,7 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="text" value="${parameters.value}"> </p> +</#if><#t/> + + Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,6 @@ +<#include "/${parameters.templateDir}/${parameters.theme}/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/wikitty/ws-form-commons.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -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}/${parameters.theme}/ws-commons.ftl" /> + type="hidden" name="${aKey.name}" value="${aKey.value}" /> +</#if> +<#if aKey.type=="textarea" > +${aKey.label} : <textarea +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> +</#if> +<#if aKey.type=="textfield" > +${aKey.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="text" name="${aKey.name}" value="${aKey.value}" > +</#if> +<#if aKey.type=="boolean" > +${aKey.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/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}/${parameters.theme}/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/wikitty/ws-form.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,10 @@ +<form +<#include "/${parameters.templateDir}/${parameters.theme}/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}/${parameters.theme}/ws-form-commons.ftl" /> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +<input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> +type="hidden" value="${parameters.value}" /><#t/> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,14 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + 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/wikitty/ws-selectfixed.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,14 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + 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/wikitty/ws-textarea.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <textarea +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + cols="80" rows="20" >${parameters.value}</textarea><#t/> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,11 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + +<#if parameters.password?? && parameters.password==true ><#t/> +type="password" +<#else><#t/> +type="text" +</#if><#t/> + value="${parameters.value}" ><#t/> +</#if><#t/> \ No newline at end of file