Author: ilya_shaikovsky Date: 2008-03-31 11:49:30 -0400 (Mon, 31 Mar 2008) New Revision: 7482 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/examples/cleaner.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml Log: minor demosite fixes Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml 2008-03-31 15:24:00 UTC (rev 7481) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml 2008-03-31 15:49:30 UTC (rev 7482) @@ -7,11 +7,6 @@ <h:form> <a4j:outputPanel id="progressPanel"> - <br /> - <a4j:commandButton action="#{progressBarBean.startProcess}" - value="startProcess" reRender="progressPanel" - rendered="#{progressBarBean.buttonRendered}" - style="margin: 9px 0px 5px;" /> <rich:progressBar value="#{progressBarBean.currentValue}" interval="2000" label="#{progressBarBean.currentValue} %" enabled="#{progressBarBean.enabled}" minValue="-1" maxValue="100" @@ -19,10 +14,18 @@ <f:facet name="initial"> <br /> <h:outputText value="Process doesn't started yet" /> + <a4j:commandButton action="#{progressBarBean.startProcess}" + value="Start Process" reRender="progressPanel" + rendered="#{progressBarBean.buttonRendered}" + style="margin: 9px 0px 5px;" /> </f:facet> <f:facet name="complete"> <br /> <h:outputText value="Process Done" /> + <a4j:commandButton action="#{progressBarBean.startProcess}" + value="Restart Process" reRender="progressPanel" + rendered="#{progressBarBean.buttonRendered}" + style="margin: 9px 0px 5px;" /> </f:facet> </rich:progressBar> </a4j:outputPanel> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/examples/cleaner.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/examples/cleaner.xhtml 2008-03-31 15:24:00 UTC (rev 7481) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/examples/cleaner.xhtml 2008-03-31 15:49:30 UTC (rev 7482) @@ -1,47 +1,47 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <a4j:region id="extr"> <h:form> <h:outputText value="Status:" /> - <a4j:status id="commonstatus" startText="In Progress...." stopText=""/> + <a4j:status id="commonstatus" startText="In Progress...." stopText="" /> - <h:panelGrid columns="2"> - <h:outputText value="Name"/> - <h:inputText id="name" value="#{userBean.name}"> - <a4j:support event="onkeyup" reRender="out" /> - </h:inputText> + <a4j:region id="intr"> + <h:panelGrid columns="2"> + <h:outputText value="Name" /> + <h:inputText id="name" value="#{userBean.name}"> + <a4j:support event="onkeyup" reRender="out" status="commonstatus" /> + </h:inputText> - <h:outputText value="Job"/> - <a4j:region id="intr"> + <h:outputText value="Job" /> <h:inputText id="job" value="#{userBean.job}"> - <a4j:support event="onkeyup" reRender="out" status="commonstatus"/> + <a4j:support event="onkeyup" reRender="out" status="commonstatus" /> </h:inputText> - </a4j:region> - <h:panelGroup /> + <h:panelGroup /> - - - </h:panelGrid> + </h:panelGrid> + </a4j:region> <a4j:region> <br /> - <rich:spacer height="5"/> - <b><h:outputText id="out" value="Name: #{userBean.name}, Job: #{userBean.job}" /></b> + <rich:spacer height="5" /> + <b><h:outputText id="out" + value="Name: #{userBean.name}, Job: #{userBean.job}" /></b> <br /> - <rich:spacer height="5"/> + <rich:spacer height="5" /> <br /> - <a4j:commandButton ajaxSingle="true" value="Clean Up Form" reRender="name, job, out" status="commonstatus"> - <a4j:actionparam name="n" value="" assignTo="#{userBean.name}" /> - <a4j:actionparam name="j" value="" assignTo="#{userBean.job}" /> + <a4j:commandButton ajaxSingle="true" value="Clean Up Form" + reRender="name, job, out" status="commonstatus"> + <a4j:actionparam name="n" value="" assignTo="#{userBean.name}" /> + <a4j:actionparam name="j" value="" assignTo="#{userBean.job}" /> </a4j:commandButton> </a4j:region> </h:form> </a4j:region> - <br /> + <br /> </ui:composition> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml 2008-03-31 15:24:00 UTC (rev 7481) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml 2008-03-31 15:49:30 UTC (rev 7482) @@ -27,17 +27,21 @@ <h:panelGrid columns="2"> <rich:panel id="sample1" styleClass="tooltip-text"> + <p> + Here you can see <b>default client-side</b> tool-tip + </p> <rich:toolTip> <span style="white-space:nowrap"> This tool-tip content was <strong>pre-rendered</strong> to the page.<br/> The look of this tool-tip is 100% defined by skin. </span> </rich:toolTip> + </rich:panel> + <rich:panel id="sample2" styleClass="tooltip-text"> <p> - Here you can see <b>default client-side</b> tool-tip + This tool-tip will <b>follow mouse</b>. Also this tool-tip has a <b>delay 0.5 sec</b>, + so be patient! </p> - </rich:panel> - <rich:panel id="sample2" styleClass="tooltip-text"> <rich:toolTip followMouse="true" direction="top-right" showDelay="500" styleClass="tooltip"> <span style="white-space:nowrap"> This tool-tip content also <strong>pre-rendered</strong> to the page.<br/> @@ -45,13 +49,12 @@ by styleClass attribute. </span> </rich:toolTip> - <p> - This tool-tip will <b>follow mouse</b>. Also this tool-tip has a <b>delay 0.5 sec</b>, - so be patient! - </p> </rich:panel> <h:form> <rich:panel id="sample3" styleClass="tooltip-text"> + <p> + This tool-tip rendered on server <b>in separate request</b>. + </p> <rich:toolTip direction="top-right" mode="ajax" styleClass="tooltip" layout="block"> <f:facet name="defaultContent"> <strong>Wait...</strong> @@ -63,13 +66,13 @@ <h:outputText value="#{toolTipData.tooltipCounter}" styleClass="tooltipData" /> </h:panelGrid> </rich:toolTip> - <p> - This tool-tip rendered on server <b>in separate request</b>. - </p> </rich:panel> </h:form> <h:form> <rich:panel id="sample4" styleClass="tooltip-text"> + <p> + This tool-tip will be <b>activated on mouse click</b>. It also has a <b>bottom-left</b> position. + </p> <rich:toolTip showEvent="onclick" direction="bottom-left" mode="ajax" styleClass="tooltip" layout="block"> <f:facet name="defaultContent"> <strong>Wait...</strong> @@ -80,9 +83,6 @@ <h:outputText value="#{toolTipData.tooltipCounter}" styleClass="tooltipData" /> </h:panelGrid> </rich:toolTip> - <p> - This tool-tip will be <b>activated on mouse click</b>. It also has a <b>bottom-left</b> position. - </p> </rich:panel> </h:form> </h:panelGrid>