Author: alexsmirnov Date: 2007-10-03 19:32:12 -0400 (Wed, 03 Oct 2007) New Revision: 3243 Modified: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/attributes.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/snippets/usecases.html branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/finalStep.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep2.xhtml Log: Merge demo from branch. Modified: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-10-03 23:32:12 UTC (rev 3243) @@ -26,7 +26,7 @@ panelBar= richOutputs, Panel Bar, /images/ico_PanelBar.gif, /images/cn_PanelBar.gif, RichFacesComponentsLibrary.html#panelBar, jbossrichfaces/freezone/docs/tlddoc/rich/panelBar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelBar.html, /richfaces/panelBar.jsf modalPanel= richOutputs, Modal Panel, /images/ico_ModalPanel.gif, /images/cn_ModalPanel.gif, RichFacesComponentsLibrary.html#modalPanel, jbossrichfaces/freezone/docs/tlddoc/rich/modalPanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIModalPanel.html, /richfaces/modalPanel.jsf togglePanel= richOutputs, Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, RichFacesComponentsLibrary.html#togglePanel, jbossrichfaces/freezone/docs/tlddoc/rich/togglePanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITogglePanel.html, /richfaces/togglePanel.jsf -panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, RichFacesComponentsLibrary.html#panelMenu, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf +panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, RichFacesComponentsLibrary.html#panelMenu, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, RichFacesComponentsLibrary.html#suggestionbox, jbossrichfaces/freezone/docs/tlddoc/rich/suggestionbox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISuggestionBox.html, /richfaces/suggestionBox.jsf dataTableScroller= richDataIterators, Data Table Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, RichFacesComponentsLibrary.html#datascroller, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf dropDownMenu= richMenu, Drop Down Menu, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, RichFacesComponentsLibrary.html#dropDownMenu, jbossrichfaces/freezone/docs/tlddoc/rich/dropDownMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropDownMenu.html, /richfaces/dropDownMenu.jsf @@ -34,14 +34,14 @@ menuItem= richMenu, Menu Item, /images/ico_dropDownMenu.gif, /images/cn_MenuItem.gif, RichFacesComponentsLibrary.html#menuItem, jbossrichfaces/freezone/docs/tlddoc/rich/menuItem.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuItem.html, /richfaces/dropDownMenu.jsf menuSeparator= richMenu, Menu Separator, /images/ico_dropDownMenu.gif, /images/cn_MenuSeparator.gif, RichFacesComponentsLibrary.html#menuSeparator, jbossrichfaces/freezone/docs/tlddoc/rich/menuSeparator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuSeparator.html, /richfaces/dropDownMenu.jsf calendar= richInputs, Calendar, /images/ico_common.gif, /images/cn_Calendar.gif, RichFacesComponentsLibrary.html#calendar, jbossrichfaces/freezone/docs/tlddoc/rich/calendar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UICalendar.html, /richfaces/calendar.jsf -message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, RichFacesComponentsLibrary.html#message, jbossrichfaces/freezone/docs/tlddoc/rich/message.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMessage.html, /richfaces/message.jsf -messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, RichFacesComponentsLibrary.html#messages, jbossrichfaces/freezone/docs/tlddoc/rich/messages.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMessages.html, /richfaces/messages.jsf +message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, RichFacesComponentsLibrary.html#message, jbossrichfaces/freezone/docs/tlddoc/rich/message.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRichMessage.html, /richfaces/message.jsf +messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, RichFacesComponentsLibrary.html#messages, jbossrichfaces/freezone/docs/tlddoc/rich/messages.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRichMessages.html, /richfaces/messages.jsf virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, RichFacesComponentsLibrary.html#virtualEarth, jbossrichfaces/freezone/docs/tlddoc/rich/virtualEarth.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIVirtualEarth.html, /richfaces/virtualEarth.jsf -insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, RichFacesComponentsLibrary.html#insert, jbossrichfaces/freezone/docs/tlddoc/rich/insert.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInsert.html, /richfaces/insert.jsf -scrollableDataTable= richDataIterators, Scrollable Data Table, /images/ico_common.gif, /images/cn_ScrollableDataTable.gif, RichFacesComponentsLibrary.html#scrollableDataTable, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableDataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIScrollableDataTable.html, /richfaces/scrollableDataTable.jsf -tree= richTree, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, RichFacesComponentsLibrary.html#tree, jbossrichfaces/freezone/docs/tlddoc/rich/tree.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITree.html, /richfaces/tree.jsf -treeNodesAdaptor= richTree, Tree Adaptor, /images/ico_Tree.gif, /images/cn_treeNodesAdaptor.gif, RichFacesComponentsLibrary.html#treeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/treeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf -recursiveTreeNodesAdaptor= richTree, Recursive Tree Adaptor, /images/ico_Tree.gif, /images/cn_recursiveTreeNodesAdaptor.gif, RichFacesComponentsLibrary.html#recursiveTreeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/recursiveTreeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRecursiveTreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf +insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, RichFacesComponentsLibrary.html#insert, jbossrichfaces/freezone/docs/tlddoc/rich/insert.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInsert.html, /richfaces/insert.jsf +scrollableDataTable= richDataIterators, Scrollable Data Table,/images/ico_common.gif, /images/cn_ScrollableDataTable.gif, RichFacesComponentsLibrary.html#scrollableDataTable, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableDataTable.html,jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIScrollableDataTable.html, /richfaces/scrollableDataTable.jsf +tree= richTree, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, RichFacesComponentsLibrary.html#tree, jbossrichfaces/freezone/docs/tlddoc/rich/tree.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITree.html, /richfaces/tree.jsf +treeNodesAdaptor= richTree, Tree Adaptor, /images/ico_Tree.gif, /images/cn_treeNodesAdaptor.gif, RichFacesComponentsLibrary.html#treeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/treeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf +recursiveTreeNodesAdaptor= richTree, Recursive Tree Adaptor,/images/ico_Tree.gif, /images/cn_recursiveTreeNodesAdaptor.gif,RichFacesComponentsLibrary.html#recursiveTreeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/recursiveTreeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRecursiveTreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf ajaxattributes= ajaxSupport, Ajax Attributes, /images/ico_common.gif, /images/cn_ajaxAttributes.gif, ArchitectureOverview.html, jbossajax4jsf/freezone/docs/tlddoc/overview-summary.html, jbossajax4jsf/freezone/docs/apidoc/overview-summary.html, /richfaces/ajaxAttributes.jsf actionparam= ajaxSupport, Action Parameter, /images/ico_common.gif, /images/cn_actionParameter.gif, RichFacesComponentsLibrary.html#actionparam, jbossajax4jsf/freezone/docs/tlddoc/a4j/actionparam.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIActionParameter.html, /richfaces/actionparam.jsf commandButton= ajaxSupport, Command Button, /images/ico_common.gif, /images/cn_commandButton.gif, RichFacesComponentsLibrary.html#commandButton, jbossajax4jsf/freezone/docs/tlddoc/a4j/commandButton.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxCommandButton.html, /richfaces/commandButton.jsf @@ -66,4 +66,4 @@ log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, RichFacesComponentsLibrary.html#log, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/log.jsf page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, RichFacesComponentsLibrary.html#page, jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html, /richfaces/page.jsf portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, RichFacesComponentsLibrary.html#portlet, jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html, /richfaces/portlet.jsf -effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIeffect.html, /richfaces/effect.jsf +effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/attributes.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/attributes.xhtml 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/attributes.xhtml 2007-10-03 23:32:12 UTC (rev 3243) @@ -26,7 +26,7 @@ of the component if such component is found. If not, the value is left as is for possible wiring with on the DOM element's id on the client side.<br/> By default, the target of the effect is the same element that effect pointed to. - However, the target element is might be overridden with 'effectId' option passed + However, the target element is might be overridden with 'targetId' option passed with 'params' attribute of with function paramenter. </p> <p> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/snippets/usecases.html =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/snippets/usecases.html 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/snippets/usecases.html 2007-10-03 23:32:12 UTC (rev 3243) @@ -18,4 +18,4 @@ <!-- attaching to window on load and applying on particular page element --> <rich:effect for="window" event="onload" - type="Appear" params="id:'contentDiv',duration:0.8,from:0.3,to:1.0" /> \ No newline at end of file + type="Appear" params="targetId:'contentDiv',duration:0.8,from:0.3,to:1.0" /> \ No newline at end of file Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/effect/usage.xhtml 2007-10-03 23:32:12 UTC (rev 3243) @@ -11,7 +11,7 @@ <p>rich:effect utilizes the set of effects provided by scriptaculous javascript library. It allows to attach effects to JSF components and html tags. For the reference of the available effects and their parameters see the scriptaculous documentation and wiki. There are - some of many possible effects available out-of-the-box: + <b>some of many</b> possible effects available out-of-the-box: </p> <div class="sample-container"> <ui:include src="/richfaces/effect/examples/diffTypes.xhtml" /> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/finalStep.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/finalStep.xhtml 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/finalStep.xhtml 2007-10-03 23:32:12 UTC (rev 3243) @@ -1,22 +1,26 @@ <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"> - - <h:panelGrid columns="2" columnClasses="wfcol1"> - <h:outputText value="First Name:" /> - <h:outputText value="#{profile.firstName}"/> - <h:outputText value="Last Name:" /> - <h:outputText value="#{profile.lastName}"/> - <h:outputText value="Company:" /> - <h:outputText value="#{profile.company}"/> - <h:outputText value="Notes:" /> - <h:outputText value="#{profile.notes}"/> - - - </h:panelGrid> - <a4j:commandButton value="&lt;&lt;Previous" immediate="true" action="previous"/> + 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"> -</ui:composition> \ No newline at end of file + <div style="position:relative;height:140px"> + <h:panelGrid + columns="2" columnClasses="wfcol1"> + <h:outputText value="First Name:" /> + <h:outputText value="#{profile.firstName}" /> + <h:outputText value="Last Name:" /> + <h:outputText value="#{profile.lastName}" /> + <h:outputText value="Company:" /> + <h:outputText value="#{profile.company}" /> + <h:outputText value="Notes:" /> + <h:outputText value="#{profile.notes}" /> + </h:panelGrid> + <div class="navPanel"> + <a4j:commandButton value="&lt;&lt;Previous" style="float:left" immediate="true" + action="previous" /> + </div> + </div> + +</ui:composition> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2007-10-03 23:32:12 UTC (rev 3243) @@ -15,6 +15,19 @@ .wfcol3 { vertical-align:top; } .s1row td { height:30px; } .rich-message { color:red; } + + .navPanel { + position:absolute; + bottom:0; + height:23px; + margin:0; + padding:2px; + } + + .navPanel input[type="button"] { + background-color: #{richSkin.additionalBackgroundColor}; + } + </style> <rich:separator height="1" style="padding:10px"/> Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml 2007-10-03 23:32:12 UTC (rev 3243) @@ -5,6 +5,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> + <div style="position:relative;height:140px"> <h:panelGrid rowClasses="s1row" columns="3" columnClasses="wfcol1,wfcol2,wfcol3"> <h:outputText value="First Name:" /> <h:inputText id="fn" value="#{profile.firstName}" label="First Name" required="true" /> @@ -21,6 +22,8 @@ </h:panelGrid> - <a4j:commandButton value="Next &gt;&gt;" action="next"/> - + <div class="navPanel"> + <a4j:commandButton value="Next &gt;&gt;" style="float:right" action="next"/> + </div> + </div> </ui:composition> \ No newline at end of file Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep2.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep2.xhtml 2007-10-03 23:01:14 UTC (rev 3242) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep2.xhtml 2007-10-03 23:32:12 UTC (rev 3243) @@ -4,7 +4,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - + + <div style="position:relative;height:140px"> <h:panelGrid columns="3" columnClasses="wfcol1,wfcol2,wfcol3"> <h:outputText value="Notes:" /> <h:inputTextarea cols="20" rows="4" id="notes" value="#{profile.notes}" label="Notes" required="true" /> @@ -12,7 +13,11 @@ </h:panelGrid> - <a4j:commandButton value="&lt;&lt;Previous" immediate="true" action="previous"/> - <a4j:commandButton value="Next &gt;&gt;" action="next"/> + <div class="navPanel"> + <a4j:commandButton value="&lt;&lt;Previous" style="float:left" immediate="true" action="previous"/> + <a4j:commandButton value="Next &gt;&gt;" style="float:right" action="next"/> + </div> + + </div> </ui:composition> \ No newline at end of file