7:22 p.m.
Author: nbelaevski
Date: 2010-06-07 20:22:44 -0400 (Mon, 07 Jun 2010)
New Revision: 17572
Modified:
root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml
root/examples/iteration-demo/trunk/src/main/webapp/filteringAndSorting.xhtml
Log:
https://jira.jboss.org/browse/RF-8737
Modified: root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml
===================================================================
--- root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml 2010-06-07
19:31:04 UTC (rev 17571)
+++ root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml 2010-06-08
00:22:44 UTC (rev 17572)
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:it="http://richfaces.org/iteration">
<!--
JBoss, Home of Professional Open Source
Copyright ${year}, Red Hat, Inc. and individual contributors
@@ -67,7 +67,7 @@
<input id="js_api_function_string_input" type="text"
value="sort('column_title')" size="60"/>
<input type="button" value="Run"
onclick="invokeJSAPI()" />
<input id="js_api_result" type="text"
readonly="readonly" size="60"/>
- <rich:extendedDataTable id="extendedDataTable" clientRows="40"
rows="100" frozenColumns="2"
+ <it:extendedDataTable id="extendedDataTable" clientRows="40"
rows="100" frozenColumns="2"
value="#{dataBean.state ? dataBean.employeeList : null}"
var="record" noDataLabel="There isn't data."
styleClass="extendedDataTable" rowKeyVar="rkv"
filterVar="fv" sortMode="multi">
<f:facet name="header">
@@ -79,7 +79,7 @@
<f:facet name="noData">
<h:outputText value="There isn't data." style="border: solid
black 1px;"/>
</f:facet>
- <rich:column id="rkv">
+ <it:column id="rkv">
<f:facet name="header">
<h:outputText value="Index"/>
</f:facet>
@@ -89,8 +89,8 @@
<h:outputText id="footerFacet" value="index"/>
</f:facet>
</c:if>
- </rich:column>
- <rich:column id="column_name"
filterExpression="#{fn:containsIgnoreCase(record.name, fv)}"
sortBy="#{record.name}">
+ </it:column>
+ <it:column id="column_name"
filterExpression="#{fn:containsIgnoreCase(record.name, fv)}"
sortBy="#{record.name}">
<f:facet name="header">
<h:outputText id="columnHeader1" value="Column Header
Facet"/>
</f:facet>
@@ -100,30 +100,30 @@
<h:outputText id="columnFooter1" value="Column Footer
Facet"/>
</f:facet>
</c:if>
- </rich:column>
+ </it:column>
- <rich:column id="column_title" width="200px"
sortBy="#{record.title}">
+ <it:column id="column_title" width="200px"
sortBy="#{record.title}">
<h:outputText value="#{record.title}" />
<c:if test="#{dataBean.rendered}">
<f:facet name="footer">
<h:outputText id="columnFooter2" value="Column Footer
Facet2"/>
</f:facet>
</c:if>
- </rich:column>
+ </it:column>
- <rich:column id="column_email" width="300px">
+ <it:column id="column_email" width="300px">
<h:outputText value="#{record.EMail}" />
- </rich:column>
- <rich:column id="column_company_name" width="300px">
+ </it:column>
+ <it:column id="column_company_name" width="300px">
<h:outputText value="#{record.companies[0].name}" />
- </rich:column>
- <rich:column id="column_company_state">
+ </it:column>
+ <it:column id="column_company_state">
<h:outputText value="#{record.companies[0].state}" />
- </rich:column>
- <rich:column id="column_company_phone">
+ </it:column>
+ <it:column id="column_company_phone">
<h:outputText value="#{record.companies[0].phone}" />
- </rich:column>
- </rich:extendedDataTable>
+ </it:column>
+ </it:extendedDataTable>
<input type="submit" />
</h:form>
</h:body>
Modified: root/examples/iteration-demo/trunk/src/main/webapp/filteringAndSorting.xhtml
===================================================================
---
root/examples/iteration-demo/trunk/src/main/webapp/filteringAndSorting.xhtml 2010-06-07
19:31:04 UTC (rev 17571)
+++
root/examples/iteration-demo/trunk/src/main/webapp/filteringAndSorting.xhtml 2010-06-08
00:22:44 UTC (rev 17572)
@@ -27,7 +27,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:it="http://richfaces.org/iteration">
<f:view contentType="text/html"/>
<h:head>
@@ -40,17 +40,17 @@
<h:selectBooleanCheckbox value="#{dataBean.state}">
<f:ajax render="dataTable" />
</h:selectBooleanCheckbox>
- <rich:dataTable id="dataTable" value="#{dataBean.state ?
dataBean.employeeList : null}" var="record" rowKeyVar="rkv"
filterVar="fv">
+ <it:dataTable id="dataTable" value="#{dataBean.state ?
dataBean.employeeList : null}" var="record" rowKeyVar="rkv"
filterVar="fv">
<f:facet name="noData">
<h:outputText value="There isn't data." style="border: solid
black 1px;"/>
</f:facet>
- <rich:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="rkv"/>
</f:facet>
<h:outputText value="#{rkv}" />
- </rich:column>
- <rich:column id="column_name"
filterValue="#{filteringAndSortingBean.nameFilterValue}"
+ </it:column>
+ <it:column id="column_name"
filterValue="#{filteringAndSortingBean.nameFilterValue}"
filterExpression="#{fv == null || fv == '' ||fv == record.name}"
comparator="#{filteringAndSortingBean.comparator}"
sortOrder="#{filteringAndSortingBean.nameSortOrder}">
<f:facet name="header">
@@ -70,9 +70,9 @@
<f:facet name="footer">
<h:outputText id="columnFooter1" value="Column Footer
Facet"/>
</f:facet>
- </rich:column>
+ </it:column>
- <rich:column id="column_title" width="200px"
filter="#{filteringAndSortingBean.filter}">
+ <it:column id="column_title" width="200px"
filter="#{filteringAndSortingBean.filter}">
<f:facet name="header">
<h:outputText value="Title"/>
<h:inputText
value="#{filteringAndSortingBean.titleFilterValue}">
@@ -83,9 +83,9 @@
<f:facet name="footer">
<h:outputText id="columnFooter2" value="Column Footer
Facet2"/>
</f:facet>
- </rich:column>
+ </it:column>
- <rich:column id="column_email" width="300px"
sortBy="#{record.EMail}"
sortOrder="#{filteringAndSortingBean.emailSortOrder}">
+ <it:column id="column_email" width="300px"
sortBy="#{record.EMail}"
sortOrder="#{filteringAndSortingBean.emailSortOrder}">
<f:facet name="header">
<h:outputText value="E-mail"/>
<h:selectOneMenu
value="#{filteringAndSortingBean.emailSortOrder}">
@@ -96,8 +96,8 @@
</h:selectOneMenu>
</f:facet>
<h:outputText value="#{record.EMail}" />
- </rich:column>
- </rich:dataTable>
+ </it:column>
+ </it:dataTable>
<input type="submit" />
</h:form>
</h:body>