r1037 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag java/template/xhtml tld
Author: mfortun Date: 2011-07-04 12:16:24 +0200 (Mon, 04 Jul 2011) New Revision: 1037 Url: http://nuiton.org/repositories/revision/wikitty/1037 Log: * add support for id attribute * rename tag * change location of stack key for handler Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl Removed: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 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-fixedselect-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.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/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -40,6 +40,8 @@ // if include is enable it change how to construct result protected boolean includeEnable = false; + public static final String WIKITTY_STACK_KEY = "wikitty_key"; + public Set<String> getFieldAdded() { return fieldAdded; } 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-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -23,7 +23,7 @@ super(stack, request, response); handler = (WikittyFieldHandler) stack.getContext().get( - WikittyTagBean.WIKITTY_STACK_KEY); + WikittyFieldHandler.WIKITTY_STACK_KEY); if (handler == null) { log.info("Handler not found in the stack"); Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,76 +0,0 @@ -package org.nuiton.wikitty.struts.component; - -import java.util.LinkedList; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.struts.Option; -import org.nuiton.wikitty.struts.WikittyFieldHandler; - -import com.opensymphony.xwork2.util.ValueStack; - -@StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) -public class FixedSelectBean extends AbstractWikittyComponent { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - final static private Log log = LogFactory.getLog(FixedSelectBean.class); - - public static final String OPEN_TEMPLATE = "ws-fixedselect"; - public static final String TEMPLATE = "ws-fixedselect-close"; - - protected String fixvalues; - - public FixedSelectBean(ValueStack stack, HttpServletRequest request, - HttpServletResponse response) { - super(stack, request, response); - } - - @Override - protected void evaluateExtraParams() { - super.evaluateExtraParams(); - - // if field defined as inclued - if (handler.isIncluded(fqFieldName)) { - handler.addAddedField(fqFieldName); - // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); - // add parametters to be use by the template - addParameter("included", true); - addParameter( - "value", - handler.getWikitty().getFieldAsString(fieldsAccess[0], - fieldsAccess[1])); - - List<Option> fixlist = new LinkedList<Option>(); - String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR); - for (String it : values) { - fixlist.add(new Option(it, it)); - } - addParameter("fixvalues", fixlist); - - } - - } - - public String getDefaultOpenTemplate() { - return OPEN_TEMPLATE; - } - - protected String getDefaultTemplate() { - return TEMPLATE; - } - - public String getFixvalues() { - return fixvalues; - } - - public void setFixvalues(String fixvalues) { - this.fixvalues = fixvalues; - } - -} Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -0,0 +1,201 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + +import com.opensymphony.xwork2.util.ValueStack; + +@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.FormTag", + description = "", allowDynamicAttributes = false) +public class FormTagBean extends ClosingUIBean { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(FormTagBean.class); + + + public static final String OPEN_TEMPLATE = "ws-form"; + public static final String TEMPLATE = "ws-form-close"; + protected Wikitty wikitty; + protected WikittyProxy proxy; + + protected String action; + protected String redirect; + + protected String include; + protected String exclude; + + protected String order; + protected Boolean orderBefore; + + protected Boolean allowDelete; + + public FormTagBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + } + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + + /* this methode is called two times: + * - first when the wikitty open tag is red + * - second when the wikitty closing tag is red + * + * for the first called this create an object wikittyfieldhandler + * that will be store inside the stack and used by the included tag ( + * inside the wikitty tags to store) + * + * + */ + + if (action != null) { + addParameter("action", findString(action)); + } + + if (redirect != null) { + addParameter("redirect", findString(redirect)); + } + + if (allowDelete != null) { + addParameter("allowDelete", allowDelete); + } + + if (orderBefore!=null) { + addParameter("orderBefore", orderBefore); + } + + if (wikitty != null) { + addParameter("wikittyid", findString(wikitty.getId())); + //no uses finally: + //addParameter("wikittyversion", findString(wikitty.getVersion())); + //addParameter("wikittyextensions", findString(wikitty + // .getExtensionNames().toString())); + } + + Object temp = stack.getContext().get(WikittyFieldHandler.WIKITTY_STACK_KEY); + WikittyFieldHandler handler; + if (temp == null) { + + // construct wikitty field handler withh + // all required param and put it in the stack + handler = new WikittyFieldHandler(); + + log.info(handler + " Added to the stack"); + + stack.getContext().put(WikittyFieldHandler.WIKITTY_STACK_KEY, handler); + + handler.setExclude(exclude); + handler.setInclude(include); + handler.setOrder(order); + handler.setWikitty(wikitty); + handler.setProxy(proxy); + handler.setOrderBefore(orderBefore); + + } else { + handler = (WikittyFieldHandler) temp; + } + // add field that have to be write inside the page + log.info("add wikitty fields to the parametters"); + addParameter("wikittyfields", handler.getWikittyField()); + + + } + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + + public Wikitty getWikitty() { + return wikitty; + } + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + + public WikittyProxy getProxy() { + return proxy; + } + + public void setProxy(WikittyProxy proxy) { + this.proxy = proxy; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getRedirect() { + return redirect; + } + + public void setRedirect(String redirect) { + this.redirect = redirect; + } + + public String getInclude() { + return include; + } + + public void setInclude(String include) { + this.include = include; + } + + public String getExclude() { + return exclude; + } + + public void setExclude(String exclude) { + this.exclude = exclude; + } + + public String getOrder() { + return order; + } + + public void setOrder(String order) { + this.order = order; + } + + public boolean isAllowDelete() { + return allowDelete; + } + + public void setAllowDelete(boolean allowDelete) { + this.allowDelete = allowDelete; + } + + public Boolean getOrderBefore() { + return orderBefore; + } + + public void setOrderBefore(Boolean orderBefore) { + this.orderBefore = orderBefore; + } + + public Boolean getAllowDelete() { + return allowDelete; + } + + public void setAllowDelete(Boolean allowDelete) { + this.allowDelete = allowDelete; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -0,0 +1,121 @@ +package org.nuiton.wikitty.struts.component; + +import java.util.LinkedList; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + +import com.opensymphony.xwork2.util.ValueStack; + +@StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.SelectCriteriaTag", description = "", allowDynamicAttributes = false) +public class SelectCriteriaBean extends AbstractWikittyComponent { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(SelectCriteriaBean.class); + + public static final String OPEN_TEMPLATE = "ws-selectcriteria"; + public static final String TEMPLATE = "ws-selectcriteria-close"; + + protected Criteria criteria; + protected String descfield; + + public SelectCriteriaBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + } + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + + // if field defined as inclued + if (handler.isIncluded(fqFieldName)) { + + + + + handler.addAddedField(fqFieldName); + + // parse extname and field name + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); + // add parametters to be use by the template + addParameter("included", true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + + List<Option> fixlist = new LinkedList<Option>(); + + // search for the wikitty with the criteria + PagedResult<Wikitty> wikitties = handler.getProxy() + .findAllByCriteria(criteria); + + String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR); + + // if wikitties not null contruct option result + // with descriptor + if (wikitties != null) { + for (Wikitty wiki : wikitties) { + // by default value and description are the same + // wikitty id + String val = wiki.getId(); + + String desc = wiki.getId(); + + // if attribute descripteur fill with something + // extract from wikitty corresponding field value + if (descriptor.length != 0) { + desc = ""; + for (String descriptorIt : descriptor) { + String[] descTable = StringUtil.split(descriptorIt, + "."); + + desc += wiki.getFieldAsWikitty(descTable[0], + descTable[1]); + } + } + fixlist.add(new Option(val, desc)); + } + addParameter("wikittiesvalues", fixlist); + } + } + + } + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + + public Criteria getCriteria() { + return criteria; + } + + public void setCriteria(Criteria criteria) { + this.criteria = criteria; + } + + public String getDescfield() { + return descfield; + } + + public void setDescfield(String descfield) { + this.descfield = descfield; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -0,0 +1,76 @@ +package org.nuiton.wikitty.struts.component; + +import java.util.LinkedList; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + +import com.opensymphony.xwork2.util.ValueStack; + +@StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.SelectFixedTag", description = "", allowDynamicAttributes = false) +public class SelectFixedBean extends AbstractWikittyComponent { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(SelectFixedBean.class); + + public static final String OPEN_TEMPLATE = "ws-selectfixed"; + public static final String TEMPLATE = "ws-selectfixed-close"; + + protected String fixvalues; + + public SelectFixedBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + } + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + // if field defined as inclued + if (handler.isIncluded(fqFieldName)) { + handler.addAddedField(fqFieldName); + // parse extname and field name + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); + // add parametters to be use by the template + addParameter("included", true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + + List<Option> fixlist = new LinkedList<Option>(); + String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR); + for (String it : values) { + fixlist.add(new Option(it, it)); + } + addParameter("fixvalues", fixlist); + + } + + } + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + + public String getFixvalues() { + return fixvalues; + } + + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,121 +0,0 @@ -package org.nuiton.wikitty.struts.component; - -import java.util.LinkedList; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.struts.Option; -import org.nuiton.wikitty.struts.WikittyFieldHandler; - -import com.opensymphony.xwork2.util.ValueStack; - -@StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false) -public class WikittySelectBean extends AbstractWikittyComponent { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - final static private Log log = LogFactory.getLog(WikittySelectBean.class); - - public static final String OPEN_TEMPLATE = "ws-wikittyselect"; - public static final String TEMPLATE = "ws-wikittyselect-close"; - - protected Criteria criteria; - protected String descfield; - - public WikittySelectBean(ValueStack stack, HttpServletRequest request, - HttpServletResponse response) { - super(stack, request, response); - } - - @Override - protected void evaluateExtraParams() { - super.evaluateExtraParams(); - - - // if field defined as inclued - if (handler.isIncluded(fqFieldName)) { - - - - - handler.addAddedField(fqFieldName); - - // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); - // add parametters to be use by the template - addParameter("included", true); - addParameter( - "value", - handler.getWikitty().getFieldAsString(fieldsAccess[0], - fieldsAccess[1])); - - List<Option> fixlist = new LinkedList<Option>(); - - // search for the wikitty with the criteria - PagedResult<Wikitty> wikitties = handler.getProxy() - .findAllByCriteria(criteria); - - String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR); - - // if wikitties not null contruct option result - // with descriptor - if (wikitties != null) { - for (Wikitty wiki : wikitties) { - // by default value and description are the same - // wikitty id - String val = wiki.getId(); - - String desc = wiki.getId(); - - // if attribute descripteur fill with something - // extract from wikitty corresponding field value - if (descriptor.length != 0) { - desc = ""; - for (String descriptorIt : descriptor) { - String[] descTable = StringUtil.split(descriptorIt, - "."); - - desc += wiki.getFieldAsWikitty(descTable[0], - descTable[1]); - } - } - fixlist.add(new Option(val, desc)); - } - addParameter("wikittiesvalues", fixlist); - } - } - - } - - public String getDefaultOpenTemplate() { - return OPEN_TEMPLATE; - } - - protected String getDefaultTemplate() { - return TEMPLATE; - } - - public Criteria getCriteria() { - return criteria; - } - - public void setCriteria(Criteria criteria) { - this.criteria = criteria; - } - - public String getDescfield() { - return descfield; - } - - public void setDescfield(String descfield) { - this.descfield = descfield; - } - -} Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,203 +0,0 @@ -package org.nuiton.wikitty.struts.component; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.components.ClosingUIBean; -import org.apache.struts2.views.annotations.StrutsTag; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.struts.WikittyFieldHandler; - -import com.opensymphony.xwork2.util.ValueStack; - -@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag", - description = "", allowDynamicAttributes = false) -public class WikittyTagBean extends ClosingUIBean { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - final static private Log log = LogFactory.getLog(WikittyTagBean.class); - - - public static final String OPEN_TEMPLATE = "wikitty"; - public static final String TEMPLATE = "wikitty-close"; - public static final String WIKITTY_STACK_KEY = "wikitty_key"; - - protected Wikitty wikitty; - protected WikittyProxy proxy; - - protected String action; - protected String redirect; - - protected String include; - protected String exclude; - - protected String order; - protected Boolean orderBefore; - - protected Boolean allowDelete; - - public WikittyTagBean(ValueStack stack, HttpServletRequest request, - HttpServletResponse response) { - super(stack, request, response); - } - - @Override - protected void evaluateExtraParams() { - super.evaluateExtraParams(); - - - /* this methode is called two times: - * - first when the wikitty open tag is red - * - second when the wikitty closing tag is red - * - * for the first called this create an object wikittyfieldhandler - * that will be store inside the stack and used by the included tag ( - * inside the wikitty tags to store) - * - * - */ - - if (action != null) { - addParameter("action", findString(action)); - } - - if (redirect != null) { - addParameter("redirect", findString(redirect)); - } - - if (allowDelete != null) { - addParameter("allowDelete", allowDelete); - } - - if (orderBefore!=null) { - addParameter("orderBefore", orderBefore); - } - - if (wikitty != null) { - addParameter("wikittyid", findString(wikitty.getId())); - //no uses finally: - //addParameter("wikittyversion", findString(wikitty.getVersion())); - //addParameter("wikittyextensions", findString(wikitty - // .getExtensionNames().toString())); - } - - Object temp = stack.getContext().get(WIKITTY_STACK_KEY); - WikittyFieldHandler handler; - if (temp == null) { - - // construct wikitty field handler withh - // all required param and put it in the stack - handler = new WikittyFieldHandler(); - - log.info(handler + " Added to the stack"); - - stack.getContext().put(WIKITTY_STACK_KEY, handler); - - handler.setExclude(exclude); - handler.setInclude(include); - handler.setOrder(order); - handler.setWikitty(wikitty); - handler.setProxy(proxy); - handler.setOrderBefore(orderBefore); - - } else { - handler = (WikittyFieldHandler) temp; - } - // add field that have to be write inside the page - log.info("add wikitty fields to the parametters"); - addParameter("wikittyfields", handler.getWikittyField()); - - - } - - public String getDefaultOpenTemplate() { - return OPEN_TEMPLATE; - } - - protected String getDefaultTemplate() { - return TEMPLATE; - } - - public Wikitty getWikitty() { - return wikitty; - } - - public void setWikitty(Wikitty wikitty) { - this.wikitty = wikitty; - } - - public WikittyProxy getProxy() { - return proxy; - } - - public void setProxy(WikittyProxy proxy) { - this.proxy = proxy; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getRedirect() { - return redirect; - } - - public void setRedirect(String redirect) { - this.redirect = redirect; - } - - public String getInclude() { - return include; - } - - public void setInclude(String include) { - this.include = include; - } - - public String getExclude() { - return exclude; - } - - public void setExclude(String exclude) { - this.exclude = exclude; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public boolean isAllowDelete() { - return allowDelete; - } - - public void setAllowDelete(boolean allowDelete) { - this.allowDelete = allowDelete; - } - - public Boolean getOrderBefore() { - return orderBefore; - } - - public void setOrderBefore(Boolean orderBefore) { - this.orderBefore = orderBefore; - } - - public Boolean getAllowDelete() { - return allowDelete; - } - - public void setAllowDelete(Boolean allowDelete) { - this.allowDelete = allowDelete; - } - -} Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,43 +0,0 @@ -package org.nuiton.wikitty.struts.tag; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; -import org.nuiton.wikitty.struts.component.FixedSelectBean; - -import com.opensymphony.xwork2.util.ValueStack; - -public class FixedSelectTag extends AbstractWikittyTag { - - /** - * - */ - private static final long serialVersionUID = -8415432856577152486L; - protected String fixvalues; - - @Override - public Component getBean(ValueStack stack, HttpServletRequest req, - HttpServletResponse res) { - return new FixedSelectBean(stack, req, res); - } - - @Override - protected void populateParams() { - super.populateParams(); - FixedSelectBean fieldtag = ((FixedSelectBean) component); - - fieldtag.setFixvalues(fixvalues); - - } - - public String getFixvalues() { - return fixvalues; - } - - public void setFixvalues(String fixvalues) { - this.fixvalues = fixvalues; - } - -} Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -0,0 +1,123 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.struts.component.FormTagBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class FormTag extends AbstractClosingTag { + + /** + * + */ + private static final long serialVersionUID = 258152544560583399L; + protected Wikitty wikitty; + protected WikittyProxy proxy; + protected String action; + protected String redirect; + protected String include; + protected String exclude; + protected String order; + protected boolean allowDelete; + protected boolean orderBefore; + + public boolean isOrderBefore() { + return orderBefore; + } + + public void setOrderBefore(boolean orderBefore) { + this.orderBefore = orderBefore; + } + + public String getInclude() { + return include; + } + + public void setInclude(String include) { + this.include = include; + } + + public String getExclude() { + return exclude; + } + + public void setExclude(String exclude) { + this.exclude = exclude; + } + + public String getOrder() { + return order; + } + + public void setOrder(String order) { + this.order = order; + } + + public boolean isAllowDelete() { + return allowDelete; + } + + public void setAllowDelete(boolean allowDelete) { + this.allowDelete = allowDelete; + } + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new FormTagBean(stack, req, res); + + } + + @Override + protected void populateParams() { + super.populateParams(); + FormTagBean wikittyTag = ((FormTagBean) component); + wikittyTag.setAction(action); + wikittyTag.setRedirect(redirect); + wikittyTag.setWikitty(wikitty); + wikittyTag.setProxy(proxy); + wikittyTag.setOrder(order); + wikittyTag.setOrderBefore(orderBefore); + wikittyTag.setAllowDelete(allowDelete); + wikittyTag.setInclude(include); + wikittyTag.setExclude(exclude); + } + + public Wikitty getWikitty() { + return wikitty; + } + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + + public WikittyProxy getProxy() { + return proxy; + } + + public void setProxy(WikittyProxy proxy) { + this.proxy = proxy; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getRedirect() { + return redirect; + } + + public void setRedirect(String redirect) { + this.redirect = redirect; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -0,0 +1,58 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; + +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.struts.component.SelectCriteriaBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class SelectCriteriaTag extends AbstractWikittyTag { + + /** + * + */ + private static final long serialVersionUID = 2807198744532780915L; + protected Criteria criteria; + protected String descfield; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new SelectCriteriaBean(stack, req, res); + + } + + + + @Override + protected void populateParams() { + super.populateParams(); + SelectCriteriaBean fieldtag = ((SelectCriteriaBean) component); + + fieldtag.setCriteria(criteria); + fieldtag.setDescfield(descfield); + } + + + public Criteria getCriteria() { + return criteria; + } + + public void setCriteria(Criteria criteria) { + this.criteria = criteria; + } + + public String getDescfield() { + return descfield; + } + + public void setDescfield(String descfield) { + this.descfield = descfield; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -0,0 +1,43 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.SelectFixedBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class SelectFixedTag extends AbstractWikittyTag { + + /** + * + */ + private static final long serialVersionUID = -8415432856577152486L; + protected String fixvalues; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new SelectFixedBean(stack, req, res); + } + + @Override + protected void populateParams() { + super.populateParams(); + SelectFixedBean fieldtag = ((SelectFixedBean) component); + + fieldtag.setFixvalues(fixvalues); + + } + + public String getFixvalues() { + return fixvalues; + } + + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,58 +0,0 @@ -package org.nuiton.wikitty.struts.tag; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; - -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.struts.component.WikittySelectBean; - -import com.opensymphony.xwork2.util.ValueStack; - -public class WikittySelectTag extends AbstractWikittyTag { - - /** - * - */ - private static final long serialVersionUID = 2807198744532780915L; - protected Criteria criteria; - protected String descfield; - - @Override - public Component getBean(ValueStack stack, HttpServletRequest req, - HttpServletResponse res) { - return new WikittySelectBean(stack, req, res); - - } - - - - @Override - protected void populateParams() { - super.populateParams(); - WikittySelectBean fieldtag = ((WikittySelectBean) component); - - fieldtag.setCriteria(criteria); - fieldtag.setDescfield(descfield); - } - - - public Criteria getCriteria() { - return criteria; - } - - public void setCriteria(Criteria criteria) { - this.criteria = criteria; - } - - public String getDescfield() { - return descfield; - } - - public void setDescfield(String descfield) { - this.descfield = descfield; - } - -} Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,123 +0,0 @@ -package org.nuiton.wikitty.struts.tag; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.struts.component.WikittyTagBean; - -import com.opensymphony.xwork2.util.ValueStack; - -public class WikittyTag extends AbstractClosingTag { - - /** - * - */ - private static final long serialVersionUID = 258152544560583399L; - protected Wikitty wikitty; - protected WikittyProxy proxy; - protected String action; - protected String redirect; - protected String include; - protected String exclude; - protected String order; - protected boolean allowDelete; - protected boolean orderBefore; - - public boolean isOrderBefore() { - return orderBefore; - } - - public void setOrderBefore(boolean orderBefore) { - this.orderBefore = orderBefore; - } - - public String getInclude() { - return include; - } - - public void setInclude(String include) { - this.include = include; - } - - public String getExclude() { - return exclude; - } - - public void setExclude(String exclude) { - this.exclude = exclude; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public boolean isAllowDelete() { - return allowDelete; - } - - public void setAllowDelete(boolean allowDelete) { - this.allowDelete = allowDelete; - } - - @Override - public Component getBean(ValueStack stack, HttpServletRequest req, - HttpServletResponse res) { - return new WikittyTagBean(stack, req, res); - - } - - @Override - protected void populateParams() { - super.populateParams(); - WikittyTagBean wikittyTag = ((WikittyTagBean) component); - wikittyTag.setAction(action); - wikittyTag.setRedirect(redirect); - wikittyTag.setWikitty(wikitty); - wikittyTag.setProxy(proxy); - wikittyTag.setOrder(order); - wikittyTag.setOrderBefore(orderBefore); - wikittyTag.setAllowDelete(allowDelete); - wikittyTag.setInclude(include); - wikittyTag.setExclude(exclude); - } - - public Wikitty getWikitty() { - return wikitty; - } - - public void setWikitty(Wikitty wikitty) { - this.wikitty = wikitty; - } - - public WikittyProxy getProxy() { - return proxy; - } - - public void setProxy(WikittyProxy proxy) { - this.proxy = proxy; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getRedirect() { - return redirect; - } - - public void setRedirect(String redirect) { - this.redirect = redirect; - } - -} Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,6 +0,0 @@ -<#include "/${parameters.templateDir}/xhtml/wikitty-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 Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,40 +0,0 @@ -<#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" > - checked='true' - </#if> - /> -</#if> -<#-- - ---> -<#if aKey.type=="select" > -${aKey.label} : -<select 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/> Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,8 +0,0 @@ -<form 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/wikitty-commons.ftl" /> -</#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-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,5 +1,7 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/> +${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> Added: trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -0,0 +1,3 @@ +<#if parameters.id?? ><#t/> +id="${parameters.id}"<#t/> +</#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,5 +1,7 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input id="datepicker" name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p> +${parameters.label} : <input +<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> + name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p> </#if><#t/> Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,12 +0,0 @@ -<#if parameters.included?? && parameters.included==true > -${parameters.label} :<select 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/java/template/xhtml/ws-form-close.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl) =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -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/java/template/xhtml/ws-form-commons.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl) =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -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/java/template/xhtml/ws-form.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl) =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -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 Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,3 +1,5 @@ <#if parameters.included?? && parameters.included==true > -<input type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/> +<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/java/template/xhtml/ws-selectcriteria.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl) =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -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/java/template/xhtml/ws-selectfixed.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl) =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -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 Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,3 +1,5 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <textarea id="${parameters.fqFieldName}" cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/> +${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 Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,3 +1,5 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/> +${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 Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-07-04 10:16:24 UTC (rev 1037) @@ -1,12 +0,0 @@ -<#if parameters.included?? && parameters.included==true > -${parameters.label} :<select 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 Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-01 15:45:35 UTC (rev 1036) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-04 10:16:24 UTC (rev 1037) @@ -9,10 +9,15 @@ <uri>/wikitty-struts</uri> <tag> - <name>wikitty</name> - <tagclass>org.nuiton.wikitty.struts.tag.WikittyTag</tagclass> + <name>form</name> + <tagclass>org.nuiton.wikitty.struts.tag.FormTag</tagclass> <description><![CDATA[Tag use to make a form to edit wikitty]]></description> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> @@ -74,10 +79,15 @@ <tag> - <name>wikittySelect</name> - <tagclass>org.nuiton.wikitty.struts.tag.WikittySelectTag</tagclass> + <name>selectCriteria</name> + <tagclass>org.nuiton.wikitty.struts.tag.SelectCriteriaTag</tagclass> <bodycontent>empty</bodycontent> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[if subtype == wikitty, use the list of wikitty found by criteria as option for select]]></description> <name>criteria</name> <rtexprvalue>true</rtexprvalue> @@ -104,10 +114,15 @@ <tag> - <name>fixedSelect</name> - <tagclass>org.nuiton.wikitty.struts.tag.FixedSelectTag</tagclass> + <name>selectFixed</name> + <tagclass>org.nuiton.wikitty.struts.tag.SelectFixedTag</tagclass> <bodycontent>empty</bodycontent> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[if subtype == fixed, use the list of fixed value as option for a select]]></description> <name>fixvalues</name> <rtexprvalue>true</rtexprvalue> @@ -132,6 +147,11 @@ <tagclass>org.nuiton.wikitty.struts.tag.HiddenTag</tagclass> <bodycontent>empty</bodycontent> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -145,6 +165,11 @@ <tagclass>org.nuiton.wikitty.struts.tag.TextFieldTag</tagclass> <bodycontent>empty</bodycontent> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -163,6 +188,11 @@ <tagclass>org.nuiton.wikitty.struts.tag.DateTag</tagclass> <bodycontent>empty</bodycontent> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -187,6 +217,11 @@ <tagclass>org.nuiton.wikitty.struts.tag.TextAreaTag</tagclass> <bodycontent>empty</bodycontent> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -205,6 +240,11 @@ <tagclass>org.nuiton.wikitty.struts.tag.BooleanTag</tagclass> <bodycontent>empty</bodycontent> <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue>
participants (1)
-
mfortun＠users.nuiton.org