Author: ilya_shaikovsky Date: 2010-05-19 10:12:29 -0400 (Wed, 19 May 2010) New Revision: 17126 Added: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml Removed: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button/ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/usage.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/usage.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link/ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml Modified: root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml Log: https://jira.jboss.org/browse/RF-8663 Modified: root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- NOTES(TODO: move to some readme in future): id for sample should equals to xhtml page name with the sample --> <root> <group> <name>Ajax Action</name> @@ -6,26 +7,25 @@ <demo> <id>ajax</id> <name>a4j:ajax</name> - <page>ajax</page> + <samples-folder>ajax/</samples-folder> <samples> <sample> - <id>simple</id> + <id>ajax</id> <name>Simple sample</name> - <src>ajax/ajax.xhtml</src> </sample> <sample> - <id>selects</id> + <id>selectsUpdates</id> <name>Dynamic Selects</name> - <src>ajax/ajax.xhtml</src> </sample> </samples> </demo> <demo new="true"> <id>commandButton</id> <name>a4j:commandButton</name> - <page>commandButton</page> + <samples-folder>commandButton/</samples-folder> <samples> <sample> + <id>commandButton</id> <name>Command Button Simple</name> </sample> </samples> @@ -33,9 +33,10 @@ <demo new="true"> <id>commandLink</id> <name>a4j:commandLink</name> - <page>commandLink</page> + <samples-folder>commandLink/</samples-folder> <samples> <sample> + <id>commandLink</id> <name>Command Link Simple</name> </sample> </samples> @@ -43,9 +44,10 @@ <demo new="true"> <id>jsFunction</id> <name>a4j:jsFunction</name> - <page>jsFunction</page> + <samples-folder>jsFunction/</samples-folder> <samples> <sample> + <id>jsFunction</id> <name>jsFunction Simple</name> </sample> </samples> @@ -53,9 +55,10 @@ <demo new="true"> <id>poll</id> <name>a4j:poll</name> - <page>poll</page> + <samples-folder>poll/</samples-folder> <samples> <sample> + <id>poll</id> <name>Poll Simple</name> </sample> </samples> @@ -63,9 +66,10 @@ <demo new="true"> <id>push</id> <name>a4j:push</name> - <page>push</page> + <samples-folder>push/</samples-folder> <samples> <sample> + <id>push</id> <name>push Simple</name> </sample> </samples> @@ -78,9 +82,10 @@ <demo new="true"> <id>queue</id> <name>a4j:queue</name> - <page>queue</page> + <samples-folder>queue/</samples-folder> <samples> <sample> + <id>queue</id> <name>queue</name> </sample> </samples> @@ -88,9 +93,10 @@ <demo new="true"> <id>attachQueue</id> <name>a4j:attachQueue</name> - <page>attachQueue</page> + <samples-folder>attachQueue/</samples-folder> <samples> <sample> + <id>attachQueue</id> <name>attachQueue</name> </sample> </samples> @@ -103,40 +109,60 @@ <demo new="true"> <id>outputPanel</id> <name>a4j:outputPanel</name> - <page>outputPanel</page> + <samples-folder>outputPanel/</samples-folder> <samples> <sample> + <id>simple</id> <name>outputPanel Simple</name> </sample> + <sample> + <id>compositemessages</id> + <name>Auto update for h:messages component</name> + </sample> </samples> </demo> <demo new="true"> <id>status</id> <name>a4j:status</name> - <page>status</page> + <samples-folder>status</samples-folder> <samples> <sample> - <name>status Simple</name> + <id>simple</id> + <name>Status Simple</name> </sample> + <sample> + <id>referencedusage</id> + <name>Referenced status</name> + </sample> + <sample> + <id>viewusage</id> + <name>Common status for view</name> + </sample> </samples> </demo> <demo new="true"> <id>mediaoutput</id> <name>a4j:mediaOutput</name> - <page>mediaOutput</page> + <samples-folder>mediaOutput</samples-folder> <samples> <sample> - <name>mediaOutput Simple</name> + <id>imgUsage</id> + <name>mediaOutput for image output</name> </sample> + <sample> + <id>imgUsage</id> + <name>mediaOutput for flash output</name> + </sample> </samples> </demo> <demo new="true"> <id>log</id> <name>a4j:log</name> - <page>log</page> + <samples-folder>log</samples-folder> <samples> <sample> - <name>log</name> + <id>log</id> + <name>Log usage</name> </sample> </samples> </demo> @@ -148,7 +174,6 @@ <demo> <id>dataTable</id> <name>rich:dataTable</name> - <page>dataTable</page> <samples> <sample> <name>Data Table Basic</name> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -6,13 +6,17 @@ xmlns:a4j="http://richfaces.org/a4j"> <ui:composition> - + <p>The behavior that adds javascript call for sending Ajax request + to specified event on parent component</p> <h:form> <h:inputText value="#{userBean.name}"> <a4j:ajax event="keyup" render="out"/> </h:inputText> <h:outputText value="#{userBean.name}" id="out"/> - </h:form> + </h:form> + <p>Typical use-case of dependent select components. When you + choosing the type in the first select - corresponding items appears in + second one.</p> </ui:composition> </html> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -6,6 +6,9 @@ xmlns:a4j="http://richfaces.org/a4j"> <ui:composition> + <p>Typical use-case of dependent select components. When you choosing + the type in the first select - corresponding items appears in second one. + </p> <h:form> <h:selectOneMenu value="#{selectsBean.currentType}" valueChangeListener="#{selectsBean.valueChanged}"> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,42 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> - - <ui:composition template="/templates/main.xhtml"> - <ui:define name="demoSampleParameters"> - <f:metadata> - <f:viewParam name="demoName" value="#{demoNavigator.demoName}" converter="#{demoNavigator.demoViewConverter}" /> - <f:event listener="#{demoNavigator.preRenderEvent}" type="javax.faces.event.PreRenderViewEvent" /> - </f:metadata> - </ui:define> - <ui:define name="body"> - <h:link value="Ajax" includeViewParams="false"> - <f:param name="demoName" value="ajax/ajax" /> - </h:link> - <h:outputText value=" | "/> - - <h:link value="Selects updates" includeViewParams="false"> - <f:param name="demoName" value="ajax/selectsUpdates" /> - </h:link> - - - <p> - The behavior that adds javascript call for sending Ajax request - to specified event on parent component - </p> - <fieldset> - <legend>Simple sample</legend> - <ui:include src="#{demoNavigator.demoName}" /> - </fieldset> - - <p>Typical use-case of dependent select components. When you choosing - the type in the first select - corresponding items appears in second one. - </p> - - - </ui:define> - </ui:composition> - + 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"> + +<ui:composition template="/templates/component-sample.xhtml"> + + <fieldset><legend>#{demoNavigator.currentSample.name}</legend> <ui:include + src="#{demoNavigator.sampleURI}" /></fieldset> +</ui:composition> + </html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button) Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button/usage.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> + +<ui:composition> + <style> + <!-- + .outhello { + font-weight: bold; + } + --> + </style> + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Name:" /> + <h:inputText value="#{userBean.name}" /> + <a4j:commandButton value="Say Hello" render="out" /> + </h:panelGrid> + </h:form> + <br /> + <a4j:outputPanel id="out"> + <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" /> + </a4j:outputPanel> +</ui:composition> + +</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/usage.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button/usage.xhtml 2010-05-17 20:23:29 UTC (rev 17093) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,29 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> - -<ui:composition> - <style> - <!-- - .outhello { - font-weight: bold; - } - --> - </style> - <h:form> - <h:panelGrid columns="3"> - <h:outputText value="Name:" /> - <h:inputText value="#{userBean.name}" /> - <a4j:commandButton value="Say Hello" render="out" /> - </h:panelGrid> - </h:form> - <br /> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" /> - </a4j:outputPanel> -</ui:composition> - -</html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link) Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link/usage.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> + + <ui:composition> + <style> + <!-- + .outhello { + font-weight: bold; + } + --> + </style> + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Name:" /> + <h:inputText value="#{userBean.name}" /> + <a4j:commandLink value="Say Hello" render="out" /> + </h:panelGrid> + </h:form> + <br /> + <a4j:outputPanel id="out"> + <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" /> + </a4j:outputPanel> +</ui:composition> +</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/usage.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link/usage.xhtml 2010-05-17 20:23:29 UTC (rev 17093) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> - - <ui:composition> - <style> - <!-- - .outhello { - font-weight: bold; - } - --> - </style> - <h:form> - <h:panelGrid columns="3"> - <h:outputText value="Name:" /> - <h:inputText value="#{userBean.name}" /> - <a4j:commandLink value="Say Hello" render="out" /> - </h:panelGrid> - </h:form> - <br /> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" /> - </a4j:outputPanel> -</ui:composition> -</html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,27 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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:rich="http://java.sun.com/jsf/composite/rich"> + +<ui:composition template="/templates/main.xhtml"> + <ui:define name="demoSampleParameters"> + <f:metadata> + <f:viewParam name="sample" value="#{demoNavigator.sample}" /> + <f:viewParam name="demo" value="#{demoNavigator.demo}" /> + </f:metadata> + </ui:define> + <ui:define name="body"> + <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s"> + <h:link value="#{s.name}" includeViewParams="true"> + <f:param name="sample" value="#{s.id}" /> + </h:link> + <h:outputText value=" | " /> + </ui:repeat> + <fieldset><legend>#{demoNavigator.currentSample.name}</legend> + <ui:include src="#{demoNavigator.sampleURI}" /></fieldset> + </ui:define> +</ui:composition> + +</html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,33 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> + + <ui:composition> + <table width="400"> + <tbody> + <tr> + <td><span onmouseover="updateName('Kate')" + onmouseout="updateName('')">Kate</span></td> + <td><span onmouseover="updateName('John')" + onmouseout="updateName('')">John</span></td> + <td><span onmouseover="updateName('Alex')" + onmouseout="updateName('')">Alex</span></td> + </tr> + <tr> + <td colspan="3">Name: <b><h:outputText id="showname" + value="#{functionBean.text}" /></b></td> + </tr> + </tbody> + </table> + <h:form> + <a4j:jsFunction name="updateName" render="showname" + action="#{functionBean.processHover}"> + <f:param name="name" /> + </a4j:jsFunction> + </h:form> + </ui:composition> + +</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,33 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> - - <ui:composition> - <table width="400"> - <tbody> - <tr> - <td><span onmouseover="updateName('Kate')" - onmouseout="updateName('')">Kate</span></td> - <td><span onmouseover="updateName('John')" - onmouseout="updateName('')">John</span></td> - <td><span onmouseover="updateName('Alex')" - onmouseout="updateName('')">Alex</span></td> - </tr> - <tr> - <td colspan="3">Name: <b><h:outputText id="showname" - value="#{functionBean.text}" /></b></td> - </tr> - </tbody> - </table> - <h:form> - <a4j:jsFunction name="updateName" render="showname" - action="#{functionBean.processHover}"> - <f:param name="name" /> - </a4j:jsFunction> - </h:form> - </ui:composition> - -</html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> + + <ui:composition> + <h:form> + <h:inputText value="#{userBean.name}" /> + <a4j:commandButton value="Submit" render="out"/> + <br/> + <a4j:outputPanel id="out"> + <h:outputText value="Hello #{userBean.name}!" rendered="#{not empty userBean.name}"/> + </a4j:outputPanel> + </h:form> + <a4j:log/> + </ui:composition> +</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,19 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> - - <ui:composition> - <h:form> - <h:inputText value="#{userBean.name}" /> - <a4j:commandButton value="Submit" render="out"/> - <br/> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name}!" rendered="#{not empty userBean.name}"/> - </a4j:outputPanel> - </h:form> - <a4j:log/> - </ui:composition> -</html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,70 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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:rich="http://java.sun.com/jsf/composite/rich" + xmlns:a4j="http://richfaces.org/a4j"> + +<ui:composition> + <style type="text/css"> + .col { + width:50%; + padding:10px; + padding: 0px 30px 0px 0px; + vertical-align: top; + } + </style> + <h:panelGrid columns="2" width="100%" columnClasses="col"> + + <f:verbatim> + This code does not work as expected. The expected echo text does not appear + below even the condition for <code>'renderer'</code> returns <code>true</code>. + Also, the error message does not appear when the length of the text reaches the limit. + </f:verbatim> + <f:verbatim> + This code works properly. The <code>h:message</code> is marked for update during + each Ajaxrequest/response. The place for bottom label is reserved with + <code>outputPanel</code> while the component is not rendered. + </f:verbatim> + + <a4j:outputPanel layout="block"> + + + <a4j:outputPanel layout="block"> + <h:form> + <h:message for="text1" style="color:red" /> + + <h:outputText style="font-weight: bold;" value="Enter Text: "/> + <h:inputText id="text1" label="text1" value="#{opBean1.text}"> + <f:validateLength maximum="10"/> + <a4j:ajax event="keyup" execute="@this" render="out1" onerror="function(){return false}"/> + </h:inputText> + + <h:outputText id="out1" rendered="#{not empty opBean1.text}" value="Approved Text: #{opBean1.text}" /> + </h:form> + </a4j:outputPanel> + + </a4j:outputPanel> + + <a4j:outputPanel layout="block"> + <h:form> + <a4j:outputPanel layout="block"> + <h:message for="text2" style="color:red" /> + </a4j:outputPanel> + + <h:outputText style="font-weight: bold;" value="Enter Text: "/> + <h:inputText id="text2" label="text2" value="#{opBean2.text}"> + <f:validateLength maximum="10"/> + <a4j:ajax event="keyup" execute="@this" render="out2" /> + </h:inputText> + + <a4j:outputPanel id="out2" layout="block"> + <h:outputText rendered="#{not empty opBean2.text}" value="Approved Text: #{opBean2.text}" /> + </a4j:outputPanel> + </h:form> + </a4j:outputPanel> + </h:panelGrid> +</ui:composition> + +</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,70 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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:rich="http://java.sun.com/jsf/composite/rich" - xmlns:a4j="http://richfaces.org/a4j"> - -<ui:composition> - <style type="text/css"> - .col { - width:50%; - padding:10px; - padding: 0px 30px 0px 0px; - vertical-align: top; - } - </style> - <h:panelGrid columns="2" width="100%" columnClasses="col"> - - <f:verbatim> - This code does not work as expected. The expected echo text does not appear - below even the condition for <code>'renderer'</code> returns <code>true</code>. - Also, the error message does not appear when the length of the text reaches the limit. - </f:verbatim> - <f:verbatim> - This code works properly. The <code>h:message</code> is marked for update during - each Ajaxrequest/response. The place for bottom label is reserved with - <code>outputPanel</code> while the component is not rendered. - </f:verbatim> - - <a4j:outputPanel layout="block"> - - - <a4j:outputPanel layout="block"> - <h:form> - <h:message for="text1" style="color:red" /> - - <h:outputText style="font-weight: bold;" value="Enter Text: "/> - <h:inputText id="text1" label="text1" value="#{opBean1.text}"> - <f:validateLength maximum="10"/> - <a4j:ajax event="keyup" execute="@this" render="out1" onerror="function(){return false}"/> - </h:inputText> - - <h:outputText id="out1" rendered="#{not empty opBean1.text}" value="Approved Text: #{opBean1.text}" /> - </h:form> - </a4j:outputPanel> - - </a4j:outputPanel> - - <a4j:outputPanel layout="block"> - <h:form> - <a4j:outputPanel layout="block"> - <h:message for="text2" style="color:red" /> - </a4j:outputPanel> - - <h:outputText style="font-weight: bold;" value="Enter Text: "/> - <h:inputText id="text2" label="text2" value="#{opBean2.text}"> - <f:validateLength maximum="10"/> - <a4j:ajax event="keyup" execute="@this" render="out2" /> - </h:inputText> - - <a4j:outputPanel id="out2" layout="block"> - <h:outputText rendered="#{not empty opBean2.text}" value="Approved Text: #{opBean2.text}" /> - </a4j:outputPanel> - </h:form> - </a4j:outputPanel> - </h:panelGrid> -</ui:composition> - -</html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,48 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> + +<ui:composition> + <h:form> + <h:dataTable value="#{choicesBean.choices}" var="choice" id="choiceVotes"> + <f:facet name="header"> + <h:outputText value="Voting for favorite fruit" /> + </f:facet> + <h:column> + <f:facet name="header"> + <h:outputText value="Choice name" /> + </f:facet> + <h:outputText value="#{choice.label}" id="choiceLabel" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Current Votes" /> + </f:facet> + <h:outputText value="#{choice.votesCount}" id="choiceVotes" /> + </h:column> + </h:dataTable> + + <a4j:jsFunction name="startPush" action="#{choicesBean.start}" execute="@this" render="push, stop, start"/> + <a4j:jsFunction name="stopPush" action="#{choicesBean.stop}" execute="@this" render="push, stop, start"/> + + <h:commandButton onclick="startPush()" value="Start" id="start" disabled="#{choicesBean.enabled}" type="button"/> + + <h:commandButton onclick="stopPush()" type="button" value="Stop" id="stop" disabled="#{!choicesBean.enabled}"/> + + <a4j:outputPanel layout="block" id="tempResults"> + <h:outputText + value="Latest update votes was: #{choicesBean.updateInfo} at #{choicesBean.timeStamp}" + rendered="#{choicesBean.enabled}" /> + </a4j:outputPanel> + + <a4j:push enabled="#{choicesBean.enabled}" interval="1000" + eventProducer="#{choicesBean.addListener}" id="push" action="#{choicesBean.processUpdates}"> + <a4j:ajax render="choiceVotes push tempResults" /> + </a4j:push> + </h:form> +</ui:composition> + +</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,48 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"> - -<ui:composition> - <h:form> - <h:dataTable value="#{choicesBean.choices}" var="choice" id="choiceVotes"> - <f:facet name="header"> - <h:outputText value="Voting for favorite fruit" /> - </f:facet> - <h:column> - <f:facet name="header"> - <h:outputText value="Choice name" /> - </f:facet> - <h:outputText value="#{choice.label}" id="choiceLabel" /> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Current Votes" /> - </f:facet> - <h:outputText value="#{choice.votesCount}" id="choiceVotes" /> - </h:column> - </h:dataTable> - - <a4j:jsFunction name="startPush" action="#{choicesBean.start}" execute="@this" render="push, stop, start"/> - <a4j:jsFunction name="stopPush" action="#{choicesBean.stop}" execute="@this" render="push, stop, start"/> - - <h:commandButton onclick="startPush()" value="Start" id="start" disabled="#{choicesBean.enabled}" type="button"/> - - <h:commandButton onclick="stopPush()" type="button" value="Stop" id="stop" disabled="#{!choicesBean.enabled}"/> - - <a4j:outputPanel layout="block" id="tempResults"> - <h:outputText - value="Latest update votes was: #{choicesBean.updateInfo} at #{choicesBean.timeStamp}" - rendered="#{choicesBean.enabled}" /> - </a4j:outputPanel> - - <a4j:push enabled="#{choicesBean.enabled}" interval="1000" - eventProducer="#{choicesBean.addListener}" id="push" action="#{choicesBean.processUpdates}"> - <a4j:ajax render="choiceVotes push tempResults" /> - </a4j:push> - </h:form> -</ui:composition> - -</html> \ No newline at end of file Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml) =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -0,0 +1,38 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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:rich="http://java.sun.com/jsf/composite/rich" + xmlns:a4j="http://richfaces.org/a4j"> + + <ui:composition> + <h:form> + <rich:panel id="psnel"> + <f:facet name="header"> + <h:outputText value="Panel with status" /> + </f:facet> + <h:panelGrid columns="2"> + <h:panelGrid columns="2"> + <f:ajax event="keyup"> + <h:outputText value="User name:" /> + <h:inputText value="#{userBean.name}"/> + <h:outputText value="Adress:" /> + <h:inputText value="#{userBean.address}"/> + </f:ajax> + </h:panelGrid> + <a4j:status> + <f:facet name="start"> + <h:graphicImage value="/images/ai.gif"/> + </f:facet> + </a4j:status> + </h:panelGrid> + <h:commandButton value="Submit" type="button" action="#{userBean.store}"> + <f:ajax render="out"/> + </h:commandButton> + <h:outputText value="#{userBean.recordStatus}" id="out"/> + </rich:panel> + </h:form> + </ui:composition> + +</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,38 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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:rich="http://java.sun.com/jsf/composite/rich" - xmlns:a4j="http://richfaces.org/a4j"> - - <ui:composition> - <h:form> - <rich:panel id="psnel"> - <f:facet name="header"> - <h:outputText value="Panel with status" /> - </f:facet> - <h:panelGrid columns="2"> - <h:panelGrid columns="2"> - <f:ajax event="keyup"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}"/> - <h:outputText value="Adress:" /> - <h:inputText value="#{userBean.address}"/> - </f:ajax> - </h:panelGrid> - <a4j:status> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif"/> - </f:facet> - </a4j:status> - </h:panelGrid> - <h:commandButton value="Submit" type="button" action="#{userBean.store}"> - <f:ajax render="out"/> - </h:commandButton> - <h:outputText value="#{userBean.recordStatus}" id="out"/> - </rich:panel> - </h:form> - </ui:composition> - -</html> \ No newline at end of file Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -1,17 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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:rich="http://java.sun.com/jsf/composite/rich"> - -<ui:composition template="/templates/main.xhtml"> - <ui:define name="body"> - <fieldset> - <legend></legend> - </fieldset> - <ui:insert/> - </ui:define> -</ui:composition> - -</html> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-05-19 14:10:24 UTC (rev 17125) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-05-19 14:12:29 UTC (rev 17126) @@ -17,7 +17,7 @@ <ul> <a4j:repeat value="#{gr.demos}" var="d"> <li> - <h:link outcome="#{d.demoURI}" value="#{d.name}" includeViewParams="false"> + <h:link outcome="/richfaces/component-sample.xhtml" value="#{d.name}" includeViewParams="false"> <f:param name="demo" value="#{d.id}"/> </h:link> <h:outputText value="NEW!" rendered="#{d.newItem or gr.newItem}" style="color:red"/>