Author: ilya_shaikovsky Date: 2008-03-18 13:20:00 -0400 (Tue, 18 Mar 2008) New Revision: 6924 Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/externalFilteringUsage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml Removed: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeature.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/examples/externalFiltering.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/examples/simpleFiltering.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/filteringUsage.xhtml Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties Log: split filtering and sorting features Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2008-03-18 17:12:14 UTC (rev 6923) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2008-03-18 17:20:00 UTC (rev 6924) @@ -77,5 +77,6 @@ comboBox= richInputs, Combo Box, \t\t/images/ico_ComboBox.gif, \t\t/images/cn_ComboBox.gif, RichFacesComponentsLibrary.html\#comboBox, jbossrichfaces/freezone/docs/tlddoc/rich/comboBox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIcomboBox.html, \t\t\t\t\t/richfaces/comboBox.jsf inplaceInput= richInputs, Inplace Input, \t\t/images/ico_InplaceInput.gif, \t\t/images/cn_InplaceInput.gif, RichFacesComponentsLibrary.html\#inplaceInput, jbossrichfaces/freezone/docs/tlddoc/rich/inplaceInput.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIinplaceInput.html, \t\t\t\t\t/richfaces/inplaceInput.jsf inplaceSelect= richInputs, Inplace Select, \t\t/images/ico_InplaceSelect.gif, \t\t/images/cn_InplaceSelect.gif, RichFacesComponentsLibrary.html\#inplaceSelect, jbossrichfaces/freezone/docs/tlddoc/rich/inplaceSelect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIinplaceSelect.html, \t\t\t\t\t/richfaces/inplaceSelect.jsf -sortingFiltering= richDataIterators, Sorting and Filtering Features, \t\t/images/ico_DataTable.gif, \t\t/images/cn_DataTable.gif, RichFacesComponentsLibrary.html\#dataTable, jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIdataTable.html, \t\t\t\t\t/richfaces/sortingFilteringFeature.jsf -columns= richDataIterators, \t\tColumns, \t\t/images/ico_columns.gif, \t\t/images/cn_Columns.gif, \t\t\tRichFacesComponentsLibrary.html\#columns, jbossrichfaces/freezone/docs/tlddoc/rich/columns.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIColumns.html, \t\t\t\t\t/richfaces/columns.jsf \ No newline at end of file +sorting= richDataIterators, Sorting Feature, \t\t/images/ico_DataTable.gif, \t\t/images/cn_DataTable.gif, RichFacesComponentsLibrary.html\#dataTable, jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIdataTable.html, \t\t\t\t\t/richfaces/sortingFeature.jsf +filtering= richDataIterators, Filtering Feature, \t\t/images/ico_DataTable.gif, \t\t/images/cn_DataTable.gif, RichFacesComponentsLibrary.html\#dataTable, jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIdataTable.html, \t\t\t\t\t/richfaces/filteringFeature.jsf +columns = richDataIterators, \t\tColumns, \t\t/images/ico_columns.gif, \t\t/images/cn_Columns.gif, \t\t\tRichFacesComponentsLibrary.html\#columns, jbossrichfaces/freezone/docs/tlddoc/rich/columns.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIColumns.html, \t\t\t\t\t/richfaces/columns.jsf \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml =================================================================== Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml 2008-03-18 17:20:00 UTC (rev 6924) @@ -0,0 +1,32 @@ +<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:form> + <style> + .rich-inplace-view{ + color:gray; + border-bottom-color:gray; + } + </style> + <rich:dataTable value="#{capitalsBean.capitals}" var="cap" width="500px"> + <f:facet name="header"> + <h:outputText value="Filtering Example"/> + </f:facet> + <rich:column> + <f:facet name="header"> + <h:graphicImage value="/images/ico_DataTable.gif"></h:graphicImage> + </f:facet> + <h:graphicImage value="#{cap.stateFlag}"/> + </rich:column> + <rich:column filterBy="#{cap.state}" filterDefaultLabel="click to filter"> + <h:outputText value="#{cap.state}"></h:outputText> + </rich:column> + <rich:column filterBy="#{cap.name}" filterDefaultLabel="click to filter"> + <h:outputText value="#{cap.name}"/> + </rich:column> + </rich:dataTable> + </h:form> +</ui:composition> \ No newline at end of file Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/externalFilteringUsage.xhtml =================================================================== Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml 2008-03-18 17:20:00 UTC (rev 6924) @@ -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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <p> + SHORT DESCRIPTION + </p> + + <div class="sample-container" > + + <ui:include src="/richfaces/filteringFeature/examples/simpleFiltering.xhtml"/> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/filteringFeature/examples/simpleFiltering.xhtml"/> + </ui:include> + </div> + + <p> + DESCRIPTION + </p> + + </ui:define> + + </ui:composition> +</html> Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml 2008-03-18 17:20:00 UTC (rev 6924) @@ -0,0 +1,20 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> +<ui:composition template="/templates/main.xhtml"> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Filtering Feature</ui:define> + <ui:define name="body"> + <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tab label="Built-In Filtering Usage"> + <ui:include src="/richfaces/filteringFeature/filteringUsage.xhtml"/> + </rich:tab> + <ui:include src="/templates/include/tagInfo.xhtml"> + <ui:param name="path" value="rich/filtering"/> + </ui:include> + </rich:tabPanel> + </ui:define> +</ui:composition> +</html> Copied: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml (from rev 6889, trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeature.xhtml) =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml 2008-03-18 17:20:00 UTC (rev 6924) @@ -0,0 +1,20 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> +<ui:composition template="/templates/main.xhtml"> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Sorting and Filtering Features</ui:define> + <ui:define name="body"> + <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tab label="Built-in Sorting Feature"> + <ui:include src="/richfaces/sortingFilteringFeatures/sortingUsage.xhtml"/> + </rich:tab> + <rich:tab label="External Sorting"> + <ui:include src="/richfaces/sortingFilteringFeatures/externalSortingUsage.xhtml"/> + </rich:tab> + </rich:tabPanel> + </ui:define> +</ui:composition> +</html> Deleted: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeature.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeature.xhtml 2008-03-18 17:12:14 UTC (rev 6923) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeature.xhtml 2008-03-18 17:20:00 UTC (rev 6924) @@ -1,23 +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:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> -<ui:composition template="/templates/main.xhtml"> - <ui:define name="title">RichFaces - Open Source Rich JSF Components - Sorting and Filtering Features</ui:define> - <ui:define name="body"> - <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> - <rich:tab label="Filtering Feature"> - <ui:include src="/richfaces/sortingFilteringFeatures/filteringUsage.xhtml"/> - </rich:tab> - <rich:tab label="Built-in Sorting Feature"> - <ui:include src="/richfaces/sortingFilteringFeatures/sortingUsage.xhtml"/> - </rich:tab> - <rich:tab label="External Sorting"> - <ui:include src="/richfaces/sortingFilteringFeatures/externalSortingUsage.xhtml"/> - </rich:tab> - </rich:tabPanel> - </ui:define> -</ui:composition> -</html> Deleted: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/examples/externalFiltering.xhtml =================================================================== Deleted: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/examples/simpleFiltering.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/examples/simpleFiltering.xhtml 2008-03-18 17:12:14 UTC (rev 6923) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/examples/simpleFiltering.xhtml 2008-03-18 17:20:00 UTC (rev 6924) @@ -1,32 +0,0 @@ -<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:form> - <style> - .rich-inplace-view{ - color:gray; - border-bottom-color:gray; - } - </style> - <rich:dataTable value="#{capitalsBean.capitals}" var="cap" width="500px"> - <f:facet name="header"> - <h:outputText value="Filtering Example"/> - </f:facet> - <rich:column> - <f:facet name="header"> - <h:graphicImage value="/images/ico_DataTable.gif"></h:graphicImage> - </f:facet> - <h:graphicImage value="#{cap.stateFlag}"/> - </rich:column> - <rich:column filterBy="#{cap.state}" filterDefaultLabel="click to filter"> - <h:outputText value="#{cap.state}"></h:outputText> - </rich:column> - <rich:column filterBy="#{cap.name}" filterDefaultLabel="click to filter"> - <h:outputText value="#{cap.name}"/> - </rich:column> - </rich:dataTable> - </h:form> -</ui:composition> \ No newline at end of file Deleted: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/filteringUsage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/filteringUsage.xhtml 2008-03-18 17:12:14 UTC (rev 6923) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFilteringFeatures/filteringUsage.xhtml 2008-03-18 17:20:00 UTC (rev 6924) @@ -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:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> - <ui:composition template="/templates/component-sample.xhtml"> - <ui:define name="sample"> - - <p> - SHORT DESCRIPTION - </p> - - <div class="sample-container" > - - <ui:include src="/richfaces/sortingFilteringFeatures/examples/simpleFiltering.xhtml"/> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/sortingFilteringFeatures/examples/simpleFiltering.xhtml"/> - </ui:include> - </div> - - <p> - DESCRIPTION - </p> - - </ui:define> - - </ui:composition> -</html>