Author: SeanRogers Date: 2011-03-15 18:34:22 -0400 (Tue, 15 Mar 2011) New Revision: 22235 Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml Log: Moving iteration showcase updates to 4.0.x branch: RFPL-1215 Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,11 +5,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>The component takes iterates a model as any other iteration - component and outputs it the same way as &lt;h:PanelGrid&gt; does for - inline data. To define grid properties and styles, use the same - definitions as for &lt;h:panelGrid&gt;.</p> - <p>The following example shows the dataGrid component in use:</p> + <p>The <b>rich:dataGrid</b> component accepts the same data sources as other iteration components + and renders them in a grid format, the same way as the <b>h:PanelGrid</b> component does for + in-line data. To define the grid's properties and styles, use the same + definitions as for the <b>h:panelGrid</b> component.</p> + <p>This example demonstrates basic use of the <b>rich:dataGrid</b> component.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -18,4 +18,4 @@ <ui:param name="hideLabel" value="Hide Source" /> </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,17 +5,17 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>dataScroller provides cliens side API functions in order to - provide control from your JavaScript custom handlers. List of api - methods:</p> + <p>The <b>rich:dataScroller</b> component provides client-side API functions to + control the scroller through custom JavaScript handlers. The API includes + the following methods:</p> <ul style="font-style: italic"> <li>next</li> <li>previous</li> <li>first</li> <li>last</li> </ul> - <p>This simple sample shows how the scroller could be controlled - via API from external controls(arrows images)</p> + <p>This example shows how the data scroller could be controlled + through the API using external controls (the arrow images).</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -25,4 +25,4 @@ </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,11 +5,12 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>dataScroller component provided in order to implement Ajax - pagination for data iteration components.</p> - <p>Starting from 4.x version - no more additional updated should be - defined by end-developer in order to synchronize different - dataScrollers attached to the same table as in example below.</p> + <p>The <b>rich:dataScroller</b> component implements Ajax + pagination for data iteration components such as tables.</p> + <p>In RichFaces 4.x, no additional updating is + required in order to synchronize different + <b>rich:dataScroller</b> components attached to the same table. + This is demonstrated in the example below.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -19,4 +20,4 @@ </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/dataTableEdit.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -6,6 +6,10 @@ xmlns:a4j="http://richfaces.org/a4j"> <ui:composition> + <p>This example demonstrates a table with row editing and deletion. + The controls to delete or edit the row display <b>rich:popupPanel</b> + components. The pop-up panels then call functions in the bean to + manage the table contents.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -22,4 +26,4 @@ </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/dataTableEdit-sample.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -67,11 +67,11 @@ <rich:popupPanel id="statPane" autosized="true"> <h:graphicImage value="/images/ai.gif" /> - Wait please... + Please wait... </rich:popupPanel> <rich:popupPanel id="confirmPane" autosized="true"> - Sure to delete row? + Are you sure you want to delete the row? <a4j:commandButton value="Cancel" onclick="#{rich:component('confirmPane')}.hide(); return false;" /> <a4j:commandButton value="Delete" onclick="remove(); return false;" /> @@ -116,4 +116,4 @@ onclick="#{rich:component('editPane')}.hide(); return false;" /> </rich:popupPanel> </h:form> -</ui:composition> \ No newline at end of file +</ui:composition> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,8 +5,8 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>This sample shows simple master-detail table implemented using<b> - tbl:dataTable</b> and<b> tbl:collapsibleSubTable</b> components</p> + <p>This example shows a simple master-detail table implemented using + <b>rich:dataTable</b> and <b>rich:collapsibleSubTable</b> components.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -39,4 +39,4 @@ <ui:param name="hideLabel" value="Hide ExpenseReportRecordItem Source" /> </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,6 +5,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> + <p>This example demonstrates content filtering for RichFaces table components. + A variety of controls are used in the header facet of the table to filter the contents + of the columns below them. The <b>value</b> attributes of these controls adjust the + values linked to the <b>filterValue</b> attribute of the columns. + The <b>filterExpression</b> attribute defines the expression used to filter the column.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -19,4 +24,4 @@ <ui:param name="hideLabel" value="Hide CarsFilteringBean Source" /> </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,14 +5,13 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>Here is simple example of sorting feature of RichFaces Table - component.</p> - <p>Object property which should be used for sorting should be - defined in sortBy attribute.</p> - <p>Currently you could only control sortOrder in your actions, and - in near versions we're planning to add special sort controls</p> - <p>Also you could use # - {rich:component('tableId')}.sort('columnId', ['sortOrder']) JS api</p> + <p>This example demonstrates the sorting feature for the RichFaces table + components.</p> + <p>The object property which is used for sorting should be + defined for each column with the <b>sortBy</b> attribute.</p> + <p>Use the <b>sortOrder</b> attribute together with user actions + to determine the sorting order. Alternatively, you can use + <b>#{rich:component('tableId')}.sort('columnId', ['sortOrder'])</b> with the JavaScript API.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -27,4 +26,4 @@ <ui:param name="hideLabel" value="Hide CapitalsSortingBean Source" /> </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -6,8 +6,8 @@ <ui:composition> - <p>This sample shows simple table styling. The table appears in - zebra-style and has highlighting of hovered row.</p> + <p>This example demonstrates simple table styling. The table rows appear in + a zebra-style, and a row is highlighted when it is hovered over.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -16,4 +16,4 @@ <ui:param name="hideLabel" value="Hide Source" /> </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,18 +5,16 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> -<p>This sample shows the selection management using built-in selection functionality.</p> -<p><b>selectionMode</b> attribute which controls selection mode has three values:</p> -<p> +<p>This example demonstrates selection management using the built-in selection functionality.</p> +<p>The <b>selectionMode</b> attribute, which controls the selection mode, has three possible values:</p> <ul> -<li>multi</li> +<li>multiple</li> <li>single</li> <li>none</li> </ul> -</p> -<p>And in order to manage your selection - use <b>selection</b> attribute which should be pointed to -some <b>collection of objects</b>. It will <b>hold rowKeys</b> of currently selected rows.</p> -<p>Look to next simple sample:</p> +<p>To manage your selection, use the <b>selection</b> attribute, which points to +a collection of objects. The collection holds <b>rowKey</b> identifiers of the currently selected rows.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -32,4 +30,4 @@ </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,15 +5,15 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>ExtendedDataTable component provides next set of features:</p> + <p>The <b>rich:extendedDataTable</b> component provides the following features:</p> <ul> - <li>Horizontal/Vertical scrolling</li> - <li>Ajax lazy loading on vertical scroll</li> - <li>Support "frozen" columns which are not scrolled on using + <li>Horizontal and vertical scrolling</li> + <li>Ajax lazy loading for vertical scrolling</li> + <li>"Frozen" columns which are not scrolled with a horizontal scroll</li> </ul> - <p>The component not requires special model usage but supports all the standard ones and all the - models which rich:dataTable supports.</p> + <p>The component does not require the use of a special model; it supports all the standard + models supported by the <b>rich:dataTable</b> component.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -25,4 +25,4 @@ attribute with number of rows to be loaded on the client</p> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,10 +5,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p><b>rich:list</b> component allows to build one of the HTML lists - (UL, OL, DL) dynamically from backend data</p> - <p>It accepts the same data types as the other iteration components - and renders them according to <b>type</b> attribute.</p> + <p>The <b>rich:list</b> component allows to build lists + dynamically from back-end data. The lists can be + ordered lists, unordered lists, or definition lists.</p> + <p>The <b>rich:list</b> component accepts the same data sources as other iteration components + and renders them according to the <b>type</b> attribute.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> @@ -19,4 +20,4 @@ </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,9 +5,9 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>a4j:repeat is a base iteration component of RichFaces. It allows - to create any markups based on iterative data. This sample shows simple - grid from capitals list.</p> + <p>The <b>a4j:repeat</b> component is the basic iteration component of RichFaces. It allows + the creation of any markup based on iterative data. This example shows a simple + grid produced from a list of capital cities.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -22,4 +22,4 @@ <ui:param name="hideLabel" value="Hide Bean Source" /> </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml =================================================================== --- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2011-03-15 22:28:06 UTC (rev 22234) +++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2011-03-15 22:34:22 UTC (rev 22235) @@ -5,17 +5,17 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>This sample shows simple master-detail table implemented using<b> - rich:dataTable</b> and<b> rich:collapsibleSubTable</b> components</p> - <p>There is one feature which is completely new for 4.x - subtables - now could be collapsed/expanded by using new component <b>rich:collapsibleSubTableToggler</b></p> - <p>Switching customization:</p> + <p>This example shows a simple master-detail table implemented using the + <b>rich:dataTable</b> and <b>rich:collapsibleSubTable</b> components</p> + <p>New in <i>RichFaces 4.x</i> is the ability to collapse and expand sub-tables + using the <b>rich:collapsibleSubTable</b> and <b>rich:collapsibleSubTableToggler</b> components.</p> + <p>You can customize expanding and collapsing sub-tables in several ways:</p> <ul> - <li>subTable's could be collapsed/expanded in different modes - defined via subTable expandMode attribute - "<i>client</i>", "<i>ajax</i>" - and "<i>server</i>"</li> - <li>The developer could get control on current states of - subTables using its <b>expanded</b> attribute.</li> + <li>Sub-tables can be collapsed and expanded in different modes. + Use the <b>rich:collapsibleSubTable</b> component's <b>expandMode</b> attribute + to specify <i>client</i>, <i>ajax</i> or <i>server</i> mode.</li> + <li>You can control the current state of + sub-tables by using the <b>expanded</b> attribute.</li> </ul> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml">