Author: ilya_shaikovsky
Date: 2008-07-07 08:12:04 -0400 (Mon, 07 Jul 2008)
New Revision: 9422
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
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/sortingFeature/examples/externalMultipleSorting.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-3854
http://jira.jboss.com/jira/browse/RF-3831
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-07-07
11:56:34 UTC (rev 9421)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-07-07
12:12:04 UTC (rev 9422)
@@ -7,7 +7,20 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components -
Data Table</ui:define>
<ui:define name="body">
- <ui:include src="/templates/include/tab-panel.xhtml" />
+ <rich:tabPanel switchType="server" styleClass="top_tab"
contentClass="content_tab" headerClass="header_tabs_class"
inactiveTabClass="inactive_tab" activeTabClass="active_tab"
+ selectedTab="#{componentNavigator.currentComponent.activeTab}">
+ <rich:tab label="Usage" name="usage">
+ <ui:include src="/richfaces/dataTable/usage.xhtml"/>
+ </rich:tab>
+ <rich:tab label="Extended Data Model" name="dataModel">
+ <ui:include src="/richfaces/dataTable/extended-data-model.xhtml"/>
+ </rich:tab>
+ <rich:tab name="info" label="Tag Information">
+ <rich:insert
+ src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}"
+ errorContent="/templates/include/tagInfoNotes.xhtml" />
+ </rich:tab>
+ </rich:tabPanel>
</ui:define>
</ui:composition>
</html>
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml 2008-07-07
11:56:34 UTC (rev 9421)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml 2008-07-07
12:12:04 UTC (rev 9422)
@@ -6,7 +6,7 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<h:form>
- <rich:dataTable value="#{capitalsBean.capitals}" var="cap"
id="table">
+ <rich:dataTable value="#{capitalsBean.capitals}" var="cap"
id="table" rows="20">
<f:facet name="header">
<rich:columnGroup>
<rich:column colspan="2">
@@ -23,7 +23,7 @@
<rich:column filterMethod="#{filteringBean.filterStates}">
<f:facet name="header">
<h:inputText value="#{filteringBean.filterValue}"
id="input">
- <a4j:support event="onkeyup" reRender="table"
+ <a4j:support event="onkeyup" reRender="table , ds"
ignoreDupResponses="true" requestDelay="700"
focus="input" />
</h:inputText>
</f:facet>
@@ -34,11 +34,12 @@
<f:facet name="header">
<h:selectOneMenu value="#{filteringBean.filterZone}">
<f:selectItems value="#{filteringBean.filterZones}" />
- <a4j:support event="onchange" reRender="table" />
+ <a4j:support event="onchange" reRender="table, ds" />
</h:selectOneMenu>
</f:facet>
<h:outputText value="#{cap.timeZone}" />
</rich:column>
</rich:dataTable>
+ <rich:datascroller id="ds2" for="table"
renderIfSinglePage="false"></rich:datascroller>
</h:form>
</ui:composition>
\ No newline at end of file
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml 2008-07-07
11:56:34 UTC (rev 9421)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml 2008-07-07
12:12:04 UTC (rev 9422)
@@ -5,7 +5,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
<h:form>
- <rich:dataTable value="#{capitalsBean.capitals}" var="cap">
+ <rich:dataTable value="#{capitalsBean.capitals}" var="cap"
rows="20" reRender="ds" id="simpletable">
<f:facet name="header">
<rich:columnGroup>
<rich:column colspan="2" >
@@ -29,5 +29,6 @@
<h:outputText value="#{cap.name}"/>
</rich:column>
</rich:dataTable>
+ <rich:datascroller id="ds" for="simpletable"
renderIfSinglePage="false"></rich:datascroller>
</h:form>
</ui:composition>
\ No newline at end of file
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml 2008-07-07
11:56:34 UTC (rev 9421)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml 2008-07-07
12:12:04 UTC (rev 9422)
@@ -17,7 +17,7 @@
<h:panelGrid columns="2" columnClasses="top">
<h:form>
<rich:dataTable value="#{dataTableScrollerBean.allCars}"
- var="category" rows="25" id="table"
+ var="category" rows="20" id="table"
reRender="ds2"
sortPriorities="#{sortingBean.prioritList}">
<rich:column id="make" sortBy="#{category.make}"
sortOrder="#{sortingBean.makeDirection}" selfSorted="false">
@@ -59,6 +59,9 @@
</f:facet>
<h:outputText value="#{category.stock}" />
</rich:column>
+ <f:facet name="footer">
+ <rich:datascroller id="ds2"></rich:datascroller>
+ </f:facet>
</rich:dataTable>
</h:form>
<h:form>
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml 2008-07-07
11:56:34 UTC (rev 9421)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml 2008-07-07
12:12:04 UTC (rev 9422)
@@ -11,7 +11,7 @@
</style>
<h:form>
<rich:dataTable value="#{capitalsBean.capitals}" var="cap"
width="300px" columnClasses="center"
- rows="25">
+ rows="15" reRender="ds">
<f:facet name="header">
<h:outputText value="Sorting Example"/>
</f:facet>
@@ -33,6 +33,9 @@
</f:facet>
<h:outputText value="#{cap.timeZone}"/>
</rich:column>
+ <f:facet name="footer">
+ <rich:datascroller id="ds"></rich:datascroller>
+ </f:facet>
</rich:dataTable>
</h:form>
</ui:composition>
\ No newline at end of file