Author: Alex.Kolonitsky
Date: 2010-05-28 09:44:31 -0400 (Fri, 28 May 2010)
New Revision: 17360
Modified:
root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
Log:
fix taglib namespaces
Modified: root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml
===================================================================
--- root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml 2010-05-28 12:53:44
UTC (rev 17359)
+++ root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml 2010-05-28 13:44:31
UTC (rev 17360)
@@ -3,8 +3,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:ds="http://richfaces.org/datascroller"
+
xmlns:it="http://richfaces.org/iteration"
xmlns:cc="http://richfaces.org/componentControl">
<f:view contentType="text/html" />
@@ -14,10 +13,10 @@
<h:body>
<h:form id="form1">
- <ds:dataScroller id="scroller1" for="richTable"
- page="#{dataBean.page}" maxPages="7"></ds:dataScroller>
+ <it:dataScroller id="scroller1" for="richTable"
+ page="#{dataBean.page}" maxPages="7"></it:dataScroller>
- <rich:dataTable keepSaved="true" id="richTable"
var="record"
+ <it:dataTable keepSaved="true" id="richTable"
var="record"
rowKeyVar="rowKey" value="#{dataBean.employeeList}"
rows="20"
sortMode="single">
<f:facet name="caption">
@@ -26,7 +25,7 @@
<f:facet name="header">
<h:outputText value="header facet" />
</f:facet>
- <rich:column id="column_name" sortBy="#{record.name}"
+ <it:column id="column_name" sortBy="#{record.name}"
sortIconAsc="resources/images/asc.gif"
sortIconDesc="resources/images/desc.gif"
sortIconUnsort="resources/images/unsort.gif">
@@ -34,19 +33,19 @@
<h:outputText id="columnHeader1" value="Column Header Facet"
/>
</f:facet>
- <rich:toggleControl for="expandedSubTable"
+ <it:toggleControl for="expandedSubTable"
expandControl="resources/images/+.gif"
collapseControl="resources/images/-.gif">
- </rich:toggleControl>
+ </it:toggleControl>
<h:outputText value="#{record.name}" />
<f:facet name="footer">
<h:outputText id="columnFooter1" value="Column Footer Facet
1" />
</f:facet>
- </rich:column>
+ </it:column>
- <rich:column id="column_title" sortBy="#{record.title}"
+ <it:column id="column_title" sortBy="#{record.title}"
sortIconAsc="resources/images/asc.gif"
sortIconDesc="resources/images/desc.gif"
sortIconUnsort="resources/images/unsort.gif">
@@ -54,43 +53,43 @@
<h:outputText id="columnHeader2" value="Column Header Facet
2" />
</f:facet>
<h:outputText value="#{record.title}" />
- </rich:column>
+ </it:column>
- <rich:column id="column_email">
+ <it:column id="column_email">
<h:outputText value="#{record.EMail}" />
- </rich:column>
+ </it:column>
- <rich:subTable id="expandedSubTable" var="company"
+ <it:subTable id="expandedSubTable" var="company"
value="#{record.companies}" rows="1" switchType="ajax"
expanded="true">
<f:facet name="header">
- <ds:dataScroller id="subscroller" for="expandedSubTable"
- maxPages="3"></ds:dataScroller>
+ <it:dataScroller id="subscroller" for="expandedSubTable"
+ maxPages="3"></it:dataScroller>
</f:facet>
<f:facet name="footer">
<h:outputText value="footer" />
</f:facet>
- <rich:column id="column_company_name">
+ <it:column id="column_company_name">
<h:outputText value="#{company.name}" />
- </rich:column>
+ </it:column>
- <rich:column id="column_company_state">
+ <it:column id="column_company_state">
<h:outputText value="#{company.state}" />
- </rich:column>
+ </it:column>
- <rich:column id="column_company_phone">
+ <it:column id="column_company_phone">
<h:outputText value="#{company.phone}" />
- </rich:column>
- </rich:subTable>
+ </it:column>
+ </it:subTable>
<f:facet name="footer">
- <ds:dataScroller id="scroller3" for="richTable"
- page="#{dataBean.page}"
maxPages="7"></ds:dataScroller>
+ <it:dataScroller id="scroller3" for="richTable"
+ page="#{dataBean.page}"
maxPages="7"></it:dataScroller>
</f:facet>
- </rich:dataTable>
+ </it:dataTable>
<br />
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,8 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich"
-
xmlns:ds="http://richfaces.org/datascroller">
+
xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<style>
@@ -34,7 +33,7 @@
<h:graphicImage value="/images/icons/scroller/arr_right.png"
onclick="document.getElementById('form:ds').richfaces.component.next()"
/>
</h:panelGrid>
- <ds:dataScroller for="pics" id="ds" render="repeat"
stepControls="false" boundaryControls="false"
fastControls="false" maxPages="10"/>
+ <it:dataScroller for="pics" id="ds" render="repeat"
stepControls="false" boundaryControls="false"
fastControls="false" maxPages="10"/>
</h:panelGrid>
</h:form>
</ui:composition>
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,47 +4,46 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich"
-
xmlns:ds="http://richfaces.org/datascroller"
+
xmlns:it="http://richfaces.org/iteration"
<ui:composition>
<h:form id="form">
- <ds:dataScroller for="table"/>
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataScroller for="table"/>
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="10">
- <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <it:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:outputText value="Vendor " />
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Mileage" />
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="VIN " />
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
- <ds:dataScroller for="table"/>
+ </it:column>
+ </it:dataTable>
+ <it:dataScroller for="table"/>
</h:form>
</ui:composition>
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,48 +4,47 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich"
-
xmlns:ds="http://richfaces.org/datascroller">
+
xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<p>This sample shows simple master-detail table implemented using<b>
tbl:dataTable</b> and<b> tbl:subtable</b> components</p>
- <tbl:dataTable width="700" var="record"
+ <it:dataTable width="700" var="record"
value="#{reportBean.expReport.records}">
<f:facet name="header">
- <tbl:columnGroup>
- <tbl:column rowspan="2">
- </tbl:column>
- <tbl:column colspan="3">
+ <it:columnGroup>
+ <it:column rowspan="2">
+ </it:column>
+ <it:column colspan="3">
<h:outputText value="Expenses" />
- </tbl:column>
- <tbl:column rowspan="2">
+ </it:column>
+ <it:column rowspan="2">
<h:outputText value="subtotals" />
- </tbl:column>
- <tbl:column breakBefore="true">
+ </it:column>
+ <it:column breakBefore="true">
<h:outputText value="Meals" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Hotels" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Transport" />
- </tbl:column>
- </tbl:columnGroup>
+ </it:column>
+ </it:columnGroup>
</f:facet>
- <tbl:column colspan="5">
+ <it:column colspan="5">
<h:outputText value="#{record.city}" />
- </tbl:column>
+ </it:column>
- <tbl:subTable var="expense" value="#{record.items}">
- <tbl:column>
+ <it:subTable var="expense" value="#{record.items}">
+ <it:column>
<h:outputText value="#{expense.day}"></h:outputText>
<f:facet name="footer">
<div></div>
</f:facet>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{expense.meals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -54,8 +53,8 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{expense.hotels}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -64,9 +63,9 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
+ </it:column>
- <tbl:column>
+ <it:column>
<h:outputText value="#{expense.transport}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -75,46 +74,46 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="footer">
<h:outputText value="#{record.total}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
+ </it:column>
- </tbl:subTable>
+ </it:subTable>
<f:facet name="footer">
- <tbl:columnGroup>
- <tbl:column>Totals</tbl:column>
- <tbl:column>
+ <it:columnGroup>
+ <it:column>Totals</it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.totalMeals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.totalHotels}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.totalTransport}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.grandTotal}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- </tbl:columnGroup>
+ </it:column>
+ </it:columnGroup>
</f:facet>
- </tbl:dataTable>
+ </it:dataTable>
</ui:composition>
</html>
\ No newline at end of file
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,14 +4,14 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich"
+
xmlns:it="http://richfaces.org/iteration"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<ui:composition>
<h:form id="form">
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20">
- <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <it:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Vendor " />
@@ -22,20 +22,20 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column filter="#{carsFilteringBean.mileageFilterImpl}">
+ </it:column>
+ <it:column filter="#{carsFilteringBean.mileageFilterImpl}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage < " />
@@ -47,8 +47,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column
+ </it:column>
+ <it:column
filterExpression="#{fn:containsIgnoreCase(car.vin,carFilteringBean.vinFilter)}">
<f:facet name="header">
<h:panelGroup>
@@ -59,8 +59,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich"
+
xmlns:it="http://richfaces.org/iteration"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:rich="http://java.sun.com/jsf/composite/rich">
@@ -25,9 +25,9 @@
</ul>
</fieldset>
</rich:panel>
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20">
- <tbl:column id="vendor"
+ <it:column id="vendor"
filterExpression="#{carsFilteringBean.vendorFilter == '' or
carsFilteringBean.vendorFilter == null or carsFilteringBean.vendorFilter ==
car.vendor}">
<f:facet name="header">
<h:panelGroup>
@@ -35,44 +35,44 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage" />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Days Live" />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.daysLive}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="VIN " />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:panelGrid>
</h:form>
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,38 +4,38 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich">
+
xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<h:form>
- <tbl:dataTable value="#{carsBean.allCars}" var="car"
id="table">
- <tbl:column>
+ <it:dataTable value="#{carsBean.allCars}" var="car"
id="table">
+ <it:column>
<f:facet name="header">
<h:outputText value="Make" />
</f:facet>
<h:outputText value="#{car.make}"/>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}"/>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}"/>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Actions" />
</f:facet>
<a4j:commandLink value="Edit" action="#{carsBean.edit}"
render="table"/>
<h:outputText value=" " />
<a4j:commandLink value="Remove" action="#{carsBean.remove}"
render="table"/>
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich"
+
xmlns:it="http://richfaces.org/iteration"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<ui:composition>
@@ -23,9 +23,9 @@
<p>This sample shows simple table styling. The table appears in zebra-style and
has
highlighting of hovered row.</p>
<h:form id="form">
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20" rowClasses = "odd-row, even-row"
styleClass="stable">
- <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <it:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Vendor " />
@@ -36,20 +36,20 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column filter="#{carsFilteringBean.mileageFilterImpl}">
+ </it:column>
+ <it:column filter="#{carsFilteringBean.mileageFilterImpl}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage < " />
@@ -61,8 +61,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column
+ </it:column>
+ <it:column
filterExpression="#{fn:containsIgnoreCase(car.vin,carFilteringBean.vinFilter)}">
<f:facet name="header">
<h:panelGroup>
@@ -73,8 +73,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:form>
<script>
$('.stable tr').mouseover(function(){$(this).addClass('active-row')});
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml 2010-05-28
12:53:44 UTC (rev 17359)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml 2010-05-28
13:44:31 UTC (rev 17360)
@@ -4,8 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
-
xmlns:tbl="http://richfaces.org/rich"
-
xmlns:ds="http://richfaces.org/datascroller">
+
xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<p>This sample shows simple master-detail table implemented using<b>
rich:dataTable</b> and<b> rich:subtable</b> components</p>
@@ -18,67 +17,67 @@
<li>The developer could get control on current states of subTables using its
<b>expanded</b> attribute.</li>
</ul>
<h:form>
- <tbl:dataTable value="#{carsBean.inventoryVendorLists}"
var="list">
+ <it:dataTable value="#{carsBean.inventoryVendorLists}"
var="list">
<f:facet name="header">
- <tbl:columnGroup>
- <tbl:column colspan="6">
+ <it:columnGroup>
+ <it:column colspan="6">
<h:outputText value="Cars marketplace" />
- </tbl:column>
- <tbl:column breakBefore="true">
+ </it:column>
+ <it:column breakBefore="true">
<h:outputText value="Model" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Price" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Mileage" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="VIN Code" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Items stock" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Days Live" />
- </tbl:column>
- </tbl:columnGroup>
+ </it:column>
+ </it:columnGroup>
</f:facet>
- <tbl:column colspan="6">
+ <it:column colspan="6">
<h:outputText value="#{list.vendor}" />
- <tbl:toggleControl for="sbtbl">
+ <it:toggleControl for="sbtbl">
<f:facet name="expand">
<a href="#">(show details)</a>
</f:facet>
<f:facet name="collapse">
<a href="#">(hide details)</a>
</f:facet>
- </tbl:toggleControl>
- </tbl:column>
- <tbl:subTable value="#{list.vendorItems}" var="item"
id="sbtbl" expandMode="client">
- <tbl:column>
+ </it:toggleControl>
+ </it:column>
+ <it:subTable value="#{list.vendorItems}" var="item"
id="sbtbl" expandMode="client">
+ <it:column>
<h:outputText value="#{item.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.price}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.mileage}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.vin}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.stock}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.daysLive}" />
- </tbl:column>
+ </it:column>
<f:facet name="footer">
<h:outputText value="Total of #{list.vendor} Cars: #{list.count}"
/>
</f:facet>
- </tbl:subTable>
- </tbl:dataTable>
+ </it:subTable>
+ </it:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 12:53:44 UTC
(rev 17359)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 13:44:31 UTC
(rev 17360)
@@ -99,10 +99,7 @@
<transformer
implementation="org.richfaces.build.shade.resource.TaglibXmlResourceTransformer">
<taglibs>
<taglib>
-
<
targetNamespace>http://richfaces.org/a4j</targetNamespace>
- </taglib>
- <taglib>
-
<
targetNamespace>http://richfaces.org/rich</targetNamespace>
+
<
targetNamespace>http://richfaces.org/iteration</targetNamespace>
<sourceNamespacesPattern>.*</sourceNamespacesPattern>
</taglib>
</taglibs>
Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 12:53:44 UTC (rev
17359)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 13:44:31 UTC (rev
17360)
@@ -100,10 +100,7 @@
<transformer
implementation="org.richfaces.build.shade.resource.TaglibXmlResourceTransformer">
<taglibs>
<taglib>
-
<
targetNamespace>http://richfaces.org/a4j</targetNamespace>
- </taglib>
- <taglib>
-
<
targetNamespace>http://richfaces.org/rich</targetNamespace>
+
<
targetNamespace>http://richfaces.org/misc</targetNamespace>
<sourceNamespacesPattern>.*</sourceNamespacesPattern>
</taglib>
</taglibs>