Author: lfryc(a)redhat.com Date: 2010-07-10 14:05:04 -0400 (Sat, 10 Jul 2010) New Revision: 17810 Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/Person.java root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml Removed: root/tests/metamer/trunk/src/main/webapp/commandLink/component.xhtml Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java root/tests/metamer/trunk/src/main/webapp/WEB-INF/faces-config.xml root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml Log: JBQA-3172 * added support for putting selected component into various containers * log temporarily removed * added some attributes for a4j:commandLink Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java 2010-07-10 18:05:04 UTC (rev 17810) @@ -52,6 +52,7 @@ private boolean reTests; private boolean log; private String component; + private String container; @PostConstruct public void init() { @@ -66,7 +67,8 @@ skins.add("plain"); skins.add("ruby"); skins.add("wine"); - setComponent("none"); + component = "none"; + container = "plain"; skin = "DEFAULT"; skinning = "disable"; skinningClasses = "disable"; @@ -166,6 +168,14 @@ return component; } + public String getContainer() { + return container; + } + + public void setContainer(String container) { + this.container = container; + } + public boolean isReTests() { return reTests; } @@ -181,12 +191,12 @@ public void setSkinningSelect(String skinningSelect) { this.skinningSelect = skinningSelect; } - + public String getComponentPage() { if (component.equals("none")) { return "/none.xhtml"; } else { - return String.format("/%s/component.xhtml", component); + return String.format("/%s/%s.xhtml", component, container); } } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java 2010-07-10 18:05:04 UTC (rev 17810) @@ -1,12 +1,13 @@ package org.richfaces.testapp.commandlink; public class LinkAttributes { - - private String render = "outputs"; + + private String render = "output1,output2,output3,output4"; private String value = "update"; private boolean disabled = false; private boolean ajaxSingle = false; private boolean bypassUpdates = false; + private boolean rendered = true; private String action; private String actionListener; private String style; @@ -18,9 +19,14 @@ private String charset; private String focus; private String accesskey; - private boolean rendered = true; private String target; - + private String coords; + private String rel; + private String rev; + private String shape = "default"; + private String type; + private int tabindex; + private String onbeforedomupdate; private String onblur; private String onclick; @@ -35,22 +41,20 @@ private String onmouseout; private String onmouseover; private String onmouseup; - + private boolean limitRender; private String queue; private int requestDelay; private boolean ignoreDupResponses; private String process; private boolean immediate; - + private String onbegin; private String onsuccess; private String onerror; private String data; private String onsubmit; - - - + public String getTitle() { return title; } @@ -86,43 +90,43 @@ public String getRender() { return render; } - + public void setRender(String render) { this.render = render; } - + public String getValue() { return value; } - + public void setValue(String value) { this.value = value; } - + public boolean isLimitRender() { return limitRender; } - + public void setLimitRender(boolean limitRender) { this.limitRender = limitRender; } - + public String getQueue() { return queue; } - + public void setQueue(String queue) { this.queue = queue; } - + public int getRequestDelay() { return requestDelay; } - + public void setRequestDelay(int requestDelay) { this.requestDelay = requestDelay; } - + public String getTarget() { return target; } @@ -134,51 +138,51 @@ public boolean isIgnoreDupResponses() { return ignoreDupResponses; } - + public void setIgnoreDupResponses(boolean ignoreDupResponses) { this.ignoreDupResponses = ignoreDupResponses; } - + public String getProcess() { return process; } - + public void setProcess(String process) { this.process = process; } - + public boolean isImmediate() { return immediate; } - + public void setImmediate(boolean immediate) { this.immediate = immediate; } - + public boolean isBypassUpdates() { return bypassUpdates; } - + public void setBypassUpdates(boolean bypassUpdates) { this.bypassUpdates = bypassUpdates; } - + public String getAction() { return action; } - + public void setAction(String action) { this.action = action; } - + public String getActionListener() { return actionListener; } - + public void setActionListener(String actionListener) { this.actionListener = actionListener; } - + public String getCharset() { return charset; } @@ -187,6 +191,46 @@ this.charset = charset; } + public String getCoords() { + return coords; + } + + public void setCoords(String coords) { + this.coords = coords; + } + + public String getRel() { + return rel; + } + + public void setRel(String rel) { + this.rel = rel; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public int getTabindex() { + return tabindex; + } + + public void setTabindex(int tabindex) { + this.tabindex = tabindex; + } + + public String getShape() { + return shape; + } + + public void setShape(String shape) { + this.shape = shape; + } + public void setAccesskey(String accesskey) { this.accesskey = accesskey; } @@ -194,51 +238,51 @@ public String getOnsubmit() { return onsubmit; } - + public void setOnsubmit(String onsubmit) { this.onsubmit = onsubmit; } - + public String getOnbegin() { return onbegin; } - + public void setOnbegin(String onbegin) { this.onbegin = onbegin; } - + public String getOnclick() { return onclick; } - + public void setOnclick(String onclick) { this.onclick = onclick; } - + public String getOnsuccess() { return onsuccess; } - + public void setOnsuccess(String onsuccess) { this.onsuccess = onsuccess; } - + public String getOncomplete() { return oncomplete; } - + public void setOncomplete(String oncomplete) { this.oncomplete = oncomplete; } - + public String getOnerror() { return onerror; } - + public void setOnerror(String onerror) { this.onerror = onerror; } - + public String getOnbeforedomupdate() { return onbeforedomupdate; } @@ -338,51 +382,59 @@ public String getData() { return data; } - + public void setData(String data) { this.data = data; } - + + public String getRev() { + return rev; + } + + public void setRev(String rev) { + this.rev = rev; + } + public boolean isDisabled() { return disabled; } - + public void setDisabled(boolean disabled) { this.disabled = disabled; } - + public String getFocus() { return focus; } - + public void setFocus(String focus) { this.focus = focus; } - + public String getDir() { return dir; } - + public void setDir(String dir) { this.dir = dir; } - + public String getStyle() { return style; } - + public void setStyle(String style) { this.style = style; } - + public String getStyleClass() { return styleClass; } - + public void setStyleClass(String styleClass) { this.styleClass = styleClass; } - + public void setHreflang(String hreflang) { this.hreflang = hreflang; } @@ -390,7 +442,7 @@ public String getHreflang() { return hreflang; } - + public void setRendered(boolean rendered) { this.rendered = rendered; } @@ -398,13 +450,11 @@ public boolean isRendered() { return rendered; } - + public static LinkAttributes getInstanceTestDisabled() { - System.out.println("getInstance"); LinkAttributes cLinkBean = new LinkAttributes(); cLinkBean.setDisabled(true); return cLinkBean; } - } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java 2010-07-10 18:05:04 UTC (rev 17810) @@ -22,11 +22,16 @@ package org.richfaces.testapp.commandlink; +import java.util.List; + import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; import javax.faces.event.ActionEvent; +import org.richfaces.testapp.model.People; +import org.richfaces.testapp.model.Person; + /** * * @@ -41,6 +46,7 @@ private String input; private String input2; private String input3; + private People people; @PostConstruct public void init() { @@ -71,6 +77,18 @@ this.input = input; } + public List<Person> getPeople() { + if (people == null) { + people = new People(); + } + + return people.getPeople(); + } + + public void setPeople(List<Person> people) { + this.people.setPeople(people); + } + public void runTestDisabled() { attrs = LinkAttributes.getInstanceTestDisabled(); } @@ -84,4 +102,6 @@ public void toUpperCaseActionListener (ActionEvent e) { input3 = input.toUpperCase(); } + + } Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java 2010-07-10 18:05:04 UTC (rev 17810) @@ -0,0 +1,124 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ + +package org.richfaces.testapp.model; + +import java.awt.Color; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.TimeZone; +import org.richfaces.testapp.model.Person; + +/** + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class People { + private List<Person> people = new ArrayList<Person>(); + + public People() { + Calendar cal = Calendar.getInstance(); + cal.setTimeZone(TimeZone.getDefault()); + + Person p = new Person(); + p.setId(Person.getMaxId()); + p.setName("John Smith"); + p.setKids(2); + p.setSex(Person.MALE); + p.setDescription("worker in a huge factory"); + p.setSalary(1000); + p.setColor(Color.BLACK); + cal.set(1985, Calendar.MAY, 30); + p.setBirthdate(cal.getTime()); + people.add(p); + + p = new Person(); + p.setId(Person.getMaxId()); + p.setName("Isaac Newton"); + p.setKids(1); + p.setSex(Person.MALE); + p.setDescription("scientist, physician"); + p.setSalary(1342); + p.setColor(Color.YELLOW); + cal.set(1643, Calendar.JANUARY, 4); + p.setBirthdate(cal.getTime()); + people.add(p); + + p = new Person(); + p.setId(Person.getMaxId()); + p.setName("Laura Chinchilla"); + p.setKids(3); + p.setSex(Person.FEMALE); + p.setDescription("president of Costa Rica"); + p.setSalary(3568); + p.setColor(Color.BLUE); + cal.set(1959, Calendar.MAY, 28); + p.setBirthdate(cal.getTime()); + people.add(p); + + p = new Person(); + p.setId(Person.getMaxId()); + p.setName("Marie Curie"); + p.setKids(3); + p.setSex(Person.FEMALE); + p.setDescription("scientist"); + p.setSalary(1990); + p.setColor(Color.CYAN); + cal.set(1867, Calendar.NOVEMBER, 7); + p.setBirthdate(cal.getTime()); + people.add(p); + + p = new Person(); + p.setId(Person.getMaxId()); + p.setName("Kate Moss"); + p.setKids(0); + p.setSex(Person.FEMALE); + p.setDescription("actress"); + p.setSalary(8577); + p.setColor(Color.MAGENTA); + cal.set(1974, Calendar.JANUARY, 16); + p.setBirthdate(cal.getTime()); + people.add(p); + + p = new Person(); + p.setId(Person.getMaxId()); + p.setName("Milan Rastislav Štefánik"); + p.setKids(0); + p.setSex(Person.MALE); + p.setDescription("general of French army, scientist"); + p.setSalary(11244); + p.setColor(Color.RED); + cal.set(1880, Calendar.JULY, 21); + p.setBirthdate(cal.getTime()); + people.add(p); + } + + public void setPeople(List<Person> people) { + this.people = people; + } + + public List<Person> getPeople() { + return people; + } +} Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/Person.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/Person.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/Person.java 2010-07-10 18:05:04 UTC (rev 17810) @@ -0,0 +1,140 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ + +package org.richfaces.testapp.model; + +import java.awt.Color; +import java.util.Date; + +/** + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class Person { + + public static final int MALE = 0; + public static final int FEMALE = 1; + + private static int maxId = 0; + + private int id; + private String name; + private String shortName; + private String upperCaseName; + private Date birthdate; + private int kids; + private String description; + private int sex; + private int salary; + private Color color; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getShortName() { + return shortName; + } + + public void setShortName(String shortName) { + this.shortName = shortName; + } + + public String getUpperCaseName() { + return upperCaseName; + } + + public void setUpperCaseName(String upperCaseName) { + this.upperCaseName = upperCaseName; + } + + public Date getBirthdate() { + return birthdate; + } + + public void setBirthdate(Date birthdate) { + this.birthdate = birthdate; + } + + public int getKids() { + return kids; + } + + public void setKids(int kids) { + if (kids > 4) { + this.kids = 5; + } else if (kids < 0) { + this.kids = 0; + } else { + this.kids = kids; + } + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public void setId(int id) { + this.id = id; + } + + public int getId() { + return id; + } + + public int getSalary() { + return salary; + } + + public void setSalary(int salary) { + this.salary = salary; + } + + public void setColor(Color color) { + this.color = color; + } + + public Color getColor() { + return color; + } + + public static int getMaxId() { + return maxId++; + } +} Modified: root/tests/metamer/trunk/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/WEB-INF/faces-config.xml 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/webapp/WEB-INF/faces-config.xml 2010-07-10 18:05:04 UTC (rev 17810) @@ -3,6 +3,6 @@ <faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> <lifecycle> - <phase-listener>org.richfaces.testapp.RichPhaseListener</phase-listener> +<!-- <phase-listener>org.richfaces.testapp.RichPhaseListener</phase-listener>--> </lifecycle> </faces-config> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -2,15 +2,20 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> - <h:panelGrid id="attributes" columns="2" style="padding-top: 30px;"> + <h:panelGrid id="attributes" columns="2"> <h:outputLabel id="disabledLabel" value="disabled" for="disabledCheckbox" /> <h:selectBooleanCheckbox id="disabledCheckbox" value="#{linkBean.attrs.disabled}"> - <f:ajax even="change" render="commandLink disabledCheckbox" execute="@this"/> + <a4j:ajax even="change" render="panel" execute="@this" /> </h:selectBooleanCheckbox> + <h:outputLabel id="renderedLabel" value="rendered" for="renderedCheckbox" /> + <h:selectBooleanCheckbox id="renderedCheckbox" value="#{linkBean.attrs.rendered}"> + <a4j:ajax even="change" render="commandLink" execute="@this" /> + </h:selectBooleanCheckbox> + <h:outputLabel id="valueLabel" value="value" for="valueInput" /> <h:inputText id="valueInput" value="#{linkBean.attrs.value}"> - <f:ajax event="blur" render="commandLink" execute="@this"/> + <a4j:ajax event="keyup" render="commandLink" execute="@this" /> </h:inputText> <h:outputLabel id="renderLabel" value="render" for="renderSelect" /> @@ -18,22 +23,27 @@ <f:selectItem itemLabel="none" itemValue="" /> <f:selectItem itemLabel="output1" itemValue="output1" /> <f:selectItem itemLabel="output2" itemValue="output2" /> - <f:selectItem itemLabel="all" itemValue="outputs" /> - <f:ajax even="change" render="commandLink" execute="@this"/> + <f:selectItem itemLabel="all" itemValue="output1,output2,output3,output4" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> </h:selectOneRadio> - + + <h:outputLabel id="focusLabel" value="focus" for="focusInput" /> + <h:inputText id="focusInput" value="#{linkBean.attrs.focus}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + <h:outputLabel id="styleLabel" value="style" for="styleInput" /> <h:inputText id="styleInput" value="#{linkBean.attrs.style}"> - <f:ajax event="blur" render="commandLink" execute="@this" /> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> <h:outputLabel id="styleClassLabel" value="styleClass" for="styleClassSelect" /> <h:selectOneRadio id="styleClassSelect" value="#{linkBean.attrs.styleClass}"> - <f:selectItem itemLabel="none" itemValue=" " /> + <f:selectItem itemLabel="none" itemValue="" /> <f:selectItem itemLabel="red" itemValue="red" /> <f:selectItem itemLabel="big" itemValue="big" /> <f:selectItem itemLabel="red + big" itemValue="red big" /> - <f:ajax even="change" render="commandLink" execute="@this" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> </h:selectOneRadio> <h:outputLabel id="langLabel" value="lang" for="langSelect" /> @@ -42,95 +52,157 @@ <f:selectItem itemLabel="en" itemValue="en" /> <f:selectItem itemLabel="sk" itemValue="sk" /> <f:selectItem itemLabel="ru" itemValue="ru" /> - <f:ajax even="change" render="commandLink" execute="@this" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> </h:selectOneRadio> - <h:outputLabel id="titleLabel" value="title" for="titleInput" /> - <h:inputText id="titleInput" value="#{linkBean.attrs.title}"> - <f:ajax event="blur" render="commandLink" execute="@this" /> - </h:inputText> + <h:outputLabel id="hreflangLabel" value="hreflang" for="hreflangSelect" /> + <h:selectOneRadio id="hreflangSelect" value="#{linkBean.attrs.hreflang}"> + <f:selectItem itemLabel="none" itemValue="" /> + <f:selectItem itemLabel="en" itemValue="en" /> + <f:selectItem itemLabel="sk" itemValue="sk" /> + <f:selectItem itemLabel="ru" itemValue="ru" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> + </h:selectOneRadio> + <h:outputLabel id="charsetLabel" value="charset" for="charsetSelect" /> + <h:selectOneRadio id="charsetSelect" value="#{linkBean.attrs.charset}"> + <f:selectItem itemLabel="none" itemValue="" /> + <f:selectItem itemLabel="utf-8" itemValue="utf-8" /> + <f:selectItem itemLabel="iso-8859-1" itemValue="iso-8859-1" /> + <f:selectItem itemLabel="iso-8859-2" itemValue="iso-8859-2" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> + </h:selectOneRadio> + <h:outputLabel id="dirLabel" value="dir" for="dirSelect" /> <h:selectOneRadio id="dirSelect" value="#{linkBean.attrs.dir}"> <f:selectItem itemLabel="none" itemValue="" /> <f:selectItem itemLabel="ltr" itemValue="ltr" /> <f:selectItem itemLabel="rtl" itemValue="rtl" /> - <f:ajax even="change" render="commandLink" execute="@this" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> </h:selectOneRadio> - + <h:outputLabel id="targetLabel" value="target" for="targetSelect" /> <h:selectOneRadio id="targetSelect" value="#{linkBean.attrs.target}"> <f:selectItem itemLabel="none" itemValue="" /> <f:selectItem itemLabel="_self" itemValue="_self" /> <f:selectItem itemLabel="_blank" itemValue="_blank" /> - <f:ajax even="change" render="commandLink" execute="@this" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> </h:selectOneRadio> - + + <h:outputLabel id="shapeLabel" value="shape" for="shapeSelect" /> + <h:selectOneRadio id="shapeSelect" value="#{linkBean.attrs.shape}"> + <f:selectItem itemLabel="default" itemValue="default" /> + <f:selectItem itemLabel="rect" itemValue="rect" /> + <f:selectItem itemLabel="circle" itemValue="circle" /> + <f:selectItem itemLabel="poly" itemValue="poly" /> + <a4j:ajax even="change" render="commandLink" execute="@this" /> + </h:selectOneRadio> + + <h:outputLabel id="typeLabel" value="type" for="typeInput" /> + <h:inputText id="typeInput" value="#{linkBean.attrs.type}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + + <h:outputLabel id="titleLabel" value="title" for="titleInput" /> + <h:inputText id="titleInput" value="#{linkBean.attrs.title}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + + <h:outputLabel id="accesskeyLabel" value="accesskey" for="accesskeyInput" /> + <h:inputText id="accesskeyInput" value="#{linkBean.attrs.accesskey}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + + <h:outputLabel id="coordsLabel" value="coords" for="coordsInput" /> + <h:inputText id="coordsInput" value="#{linkBean.attrs.coords}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + + <h:outputLabel id="relLabel" value="rel" for="relInput" /> + <h:inputText id="relInput" value="#{linkBean.attrs.rel}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + + <h:outputLabel id="revLabel" value="rev" for="revInput" /> + <h:inputText id="revInput" value="#{linkBean.attrs.rev}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + + <h:outputLabel id="tabindexLabel" value="tabindex" for="tabindexInput" /> + <h:inputText id="tabindexInput" value="#{linkBean.attrs.tabindex}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + <h:outputLabel id="onbeforedomupdateLabel" value="onbeforedomupdate" for="onbeforedomupdateInput" /> <h:inputText id="onbeforedomupdateInput" value="#{linkBean.attrs.onbeforedomupdate}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onblurLabel" value="onblur" for="onblurInput" /> <h:inputText id="onblurInput" value="#{linkBean.attrs.onblur}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onclickLabel" value="onclick" for="onclickInput" /> <h:inputText id="onclickInput" value="#{linkBean.attrs.onclick}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="oncompleteLabel" value="oncomplete" for="oncompleteInput" /> <h:inputText id="oncompleteInput" value="#{linkBean.attrs.oncomplete}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="ondblclickLabel" value="ondblclick" for="ondblclickInput" /> <h:inputText id="ondblclickInput" value="#{linkBean.attrs.ondblclick}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onfocusLabel" value="onfocus" for="onfocusInput" /> <h:inputText id="onfocusInput" value="#{linkBean.attrs.onfocus}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onkeydownLabel" value="onkeydown" for="onkeydownInput" /> <h:inputText id="onkeydownInput" value="#{linkBean.attrs.onkeydown}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onkeypressLabel" value="onkeypress" for="onkeypressInput" /> <h:inputText id="onkeypressInput" value="#{linkBean.attrs.onkeypress}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onkeyupLabel" value="onkeyup" for="onkeyupInput" /> <h:inputText id="onkeyupInput" value="#{linkBean.attrs.onkeyup}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + + <h:outputLabel id="onmousedownLabel" value="onmousedown" for="onmousedownInput" /> + <h:inputText id="onmousedownInput" value="#{linkBean.attrs.onmousedown}"> + <a4j:ajax event="blur" render="commandLink" execute="@this" /> + </h:inputText> + <h:outputLabel id="onmousemoveLabel" value="onmousemove" for="onmousemoveInput" /> <h:inputText id="onmousemoveInput" value="#{linkBean.attrs.onmousemove}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onmouseoutLabel" value="onmouseout" for="onmouseoutInput" /> <h:inputText id="onmouseoutInput" value="#{linkBean.attrs.onmouseout}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onmouseoverLabel" value="onmouseover" for="onmouseoverInput" /> <h:inputText id="onmouseoverInput" value="#{linkBean.attrs.onmouseover}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + <h:outputLabel id="onmouseupLabel" value="onmouseup" for="onmouseupInput" /> <h:inputText id="onmouseupInput" value="#{linkBean.attrs.onmouseup}"> <a4j:ajax event="blur" render="commandLink" execute="@this" /> </h:inputText> - + </h:panelGrid> </ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/component.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/component.xhtml 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/component.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -1,40 +0,0 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> - - <h:outputStylesheet library="css" name="commandLink.css" /> - - <a4j:queue name="myQ" /> - - <h:panelGrid id="panel" columns="2"> - <h:inputText id="nameInput" value="#{linkBean.input}" /> - - <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" - actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" - value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" - lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" - hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" - onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" - onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" - oncomplete="#{linkBean.attrs.oncomplete}" ondblclick="#{linkBean.attrs.ondblclick}" - onfocus="#{linkBean.attrs.onfocus}" onkeydown="#{linkBean.attrs.onkeydown}" - onkeypress="#{linkBean.attrs.onkeypress}" onkeyup="#{linkBean.attrs.onkeyup}" - onmousedown="#{linkBean.attrs.onmousedown}" onmousemove="#{linkBean.attrs.onmousemove}" - onmouseout="#{linkBean.attrs.onmouseout}" onmouseover="#{linkBean.attrs.onmouseover}" - onmouseup="#{linkBean.attrs.onmouseup}" accesskey="#{linkBean.attrs.accesskey}" - ajaxSingle="#{linkBean.attrs.ajaxSingle}" bypassUpdates="#{linkBean.attrs.bypassUpdates}" - charset="#{linkBean.attrs.charset}" rendered="#{linkBean.attrs.rendered}" status="a4jStatus" - target="#{linkBean.attrs.target}"/> - - </h:panelGrid> - - <h:panelGrid id="outputs" columns="2"> - output1: <h:outputText value="#{linkBean.input}" id="output1" /> - output2: <h:outputText value="#{linkBean.input}" id="output2" /> - action (first 6 chars): <h:outputText value="#{linkBean.input2}" id="output3" /> - action listener (upper case):<h:outputText value="#{linkBean.input3}" id="output4" /> - </h:panelGrid> - - <a4j:commandButton value="Rerender" render="panel, outputs" /> - -</ui:composition> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -0,0 +1,79 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> + + <h:panelGrid id="panel"> + <h:dataTable id="linkDataTable" value="#{linkBean.people}" var="person"> + <f:facet name="header"> + <h:outputText value="List of famous people" /> + </f:facet> + + <h:column> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:inputText id="input" value="#{person.name}" style="width: 200px;" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="Update" /> + </f:facet> + <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" + actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" + value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" + styleClass="#{linkBean.attrs.styleClass}" lang="#{linkBean.attrs.lang}" + title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" hreflang="#{linkBean.attrs.hreflang}" + render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" onsubmit="alert('onsubmit')" + onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" onblur="#{linkBean.attrs.onblur}" + onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" + ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" + onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" + onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" + onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" + onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" + accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" + bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" + rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" + coords="#{linkBean.attrs.coords}" rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" + shape="#{linkBean.attrs.shape}" tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="output1" /> + </f:facet> + <h:outputText id="output1" value="#{person.name}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="output2" /> + </f:facet> + <h:outputText id="output2" value="#{person.name}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="action (first 6 chars)" /> + </f:facet> + <h:outputText id="output3" value="#{person.shortName}" /> + </h:column> + + <h:column> + <f:facet name="header"> + <h:outputText value="action listener (upper case)" /> + </f:facet> + <h:outputText id="output4" value="#{person.upperCaseName}" /> + </h:column> + + <f:facet name="footer"> + <h:outputText value="List of famous people" /> + </f:facet> + + </h:dataTable> + + </h:panelGrid> + + +</ui:composition> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -0,0 +1,25 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> + + There will be a command link inside extended data table. + + <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" + actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" + value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" + lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" + hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" + onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" + onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" + ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" + onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" + onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" + onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" + onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" + accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" + bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" + rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" coords="#{linkBean.attrs.coords}" + rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" shape="#{linkBean.attrs.shape}" + tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> + +</ui:composition> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -0,0 +1,25 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> + + There will be a command link inside modal panel. + + <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" + actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" + value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" + lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" + hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" + onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" + onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" + ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" + onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" + onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" + onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" + onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" + accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" + bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" + rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" coords="#{linkBean.attrs.coords}" + rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" shape="#{linkBean.attrs.shape}" + tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> + +</ui:composition> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -0,0 +1,25 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> + + There will be a command link inside panel. + + <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" + actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" + value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" + lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" + hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" + onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" + onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" + ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" + onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" + onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" + onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" + onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" + accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" + bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" + rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" coords="#{linkBean.attrs.coords}" + rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" shape="#{linkBean.attrs.shape}" + tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> + +</ui:composition> \ No newline at end of file Copied: root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml (from rev 17809, root/tests/metamer/trunk/src/main/webapp/commandLink/component.xhtml) =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -0,0 +1,39 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> + + <h:outputStylesheet library="css" name="commandLink.css" /> + + <h:panelGrid id="panel" columns="2"> + <h:inputText id="input" value="#{linkBean.input}" /> + + <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" + actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" + value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" + lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" + hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" + onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" + onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" + oncomplete="#{linkBean.attrs.oncomplete}" ondblclick="#{linkBean.attrs.ondblclick}" + onfocus="#{linkBean.attrs.onfocus}" onkeydown="#{linkBean.attrs.onkeydown}" + onkeypress="#{linkBean.attrs.onkeypress}" onkeyup="#{linkBean.attrs.onkeyup}" + onmousedown="#{linkBean.attrs.onmousedown}" onmousemove="#{linkBean.attrs.onmousemove}" + onmouseout="#{linkBean.attrs.onmouseout}" onmouseover="#{linkBean.attrs.onmouseover}" + onmouseup="#{linkBean.attrs.onmouseup}" accesskey="#{linkBean.attrs.accesskey}" + ajaxSingle="#{linkBean.attrs.ajaxSingle}" bypassUpdates="#{linkBean.attrs.bypassUpdates}" + charset="#{linkBean.attrs.charset}" rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" + coords="#{linkBean.attrs.coords}" rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" + shape="#{linkBean.attrs.shape}" tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> + + </h:panelGrid> + + <h:panelGrid id="outputs" columns="2"> + output1: <h:outputText value="#{linkBean.input}" id="output1" /> + output2: <h:outputText value="#{linkBean.input}" id="output2" /> + action (first 6 chars): <h:outputText value="#{linkBean.input2}" id="output3" /> + action listener (upper case):<h:outputText value="#{linkBean.input3}" id="output4" /> + </h:panelGrid> + + <a4j:commandButton value="Rerender" render="panel, outputs" /> + +</ui:composition> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -2,13 +2,23 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> - <h:outputText value="Select component:" /> + <h:outputLabel id="componentLabel" for="componentSelect" value="Component:" /> - <h:selectOneMenu id="componentSelect" value="#{richBean.component}" immediate="true"> + <h:selectOneMenu id="componentSelect" value="#{richBean.component}" immediate="true" style="width: 100%;"> <f:selectItem itemLabel="-- None --" itemValue="none" /> <f:selectItem itemLabel="Command Link" itemValue="commandLink" /> </h:selectOneMenu> + <h:outputLabel id="containerLabel" for="containerSelect" value="Container:" /> + + <h:selectOneMenu id="containerSelect" value="#{richBean.container}" immediate="true"> + <f:selectItem itemLabel="-- None --" itemValue="plain" /> + <f:selectItem itemLabel="Data Table" itemValue="dataTable" /> + <f:selectItem itemLabel="Extended Data Table" itemValue="extendedDataTable" /> + <f:selectItem itemLabel="Modal Panel" itemValue="modalPanel" /> + <f:selectItem itemLabel="Panel" itemValue="panel" /> + </h:selectOneMenu> + <h:commandButton action="/index" value="Submit" /> - + </ui:composition> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -16,9 +16,9 @@ </h:panelGrid> <h:panelGrid columns="2" style="width: 120px;"> - <h:outputLabel id="a4jLogLabel" for="a4jLog" value="a4j:log" /> + <h:outputLabel id="a4jLogLabel" for="a4jLogCheckbox" value="a4j:log" /> <h:selectBooleanCheckbox id="a4jLogCheckbox" value="#{richBean.log}"> - <a4j:ajax event="change" execute="@this" render="a4jLog"/> +<!-- <a4j:ajax event="change" execute="@this" render="a4jLog"/>--> </h:selectBooleanCheckbox> <h:outputLabel id="a4jStatusLabel" for="a4jStatus" value="a4j:status" /> <a4j:status id="a4jStatus"> @@ -53,8 +53,9 @@ </h:selectOneMenu> </h:panelGrid> - <h:panelGrid columns="1"> + <h:panelGrid columns="2"> <ui:include src="/includes/components.xhtml" /> + <ui:include src="/blank.xhtml" /> </h:panelGrid> <h:panelGrid columns="1"> Modified: root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml 2010-07-10 18:04:01 UTC (rev 17809) +++ root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml 2010-07-10 18:05:04 UTC (rev 17810) @@ -1,3 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> @@ -11,27 +13,30 @@ <div class="header"><ui:include src="/includes/header.xhtml" /></div> - <div class="content"><rich:messages id="msgs" /> <h:form id="testsForm" prependId="false"> - <a4j:outputPanel id="testsPanel" rendered="#{richBean.reTests}"> + <div class="content"><rich:messages id="msgs" /> <h:form id="contentForm" > + + <a4j:outputPanel id="testsPanel" rendered="#{richBean.reTests}" layout="block"> <ui:include src="#{richBean.testsPage}" /> <hr /> </a4j:outputPanel> - </h:form> <h:form id="componentForm" prependId="false"> - <a4j:outputPanel id="componentPanel" rendered="#{richBean.reComponent}"> + + <a4j:outputPanel id="componentPanel" rendered="#{richBean.reComponent}" layout="block"> <ui:include src="#{richBean.componentPage}" /> + <hr /> </a4j:outputPanel> -<!-- </h:form> <h:form id="attributesForm" prependId="false">--> - <a4j:outputPanel id="attributesPanel" rendered="#{richBean.reAttributes}"> + + <a4j:outputPanel id="attributesPanel" rendered="#{richBean.reAttributes}" layout="block"> <ui:include src="#{richBean.attributesPage}" /> + <hr /> </a4j:outputPanel> + </h:form></div> - - <div class="log"> - <a4j:log id="a4jlog" style="width: 800px; height: 300px;" popup="false" level="ALL" rendered="#{richBean.log}"/> - </div> - + + <!-- <div class="log"><a4j:log id="a4jLog" style="width: 800px; height: 300px;" popup="false" level="ALL"--> + <!-- rendered="#{richBean.log}" /></div>--> + <div class="footer"><ui:insert name="footer"> - <hr />RichFaces #{a4j.version}</ui:insert></div> + RichFaces #{a4j.version}</ui:insert></div> </h:body> </html> \ No newline at end of file