Author: ilya_shaikovsky Date: 2010-05-30 07:10:00 -0400 (Sun, 30 May 2010) New Revision: 17399 Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.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 Log: dataTable samples corrections according to attributes refactoring. 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-30 11:07:02 UTC (rev 17398) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-30 11:10:00 UTC (rev 17399) @@ -21,7 +21,7 @@ <it:column rowspan="2"> <h:outputText value="subtotals" /> </it:column> - <it:column breakBefore="true"> + <it:column breakRowBefore="true"> <h:outputText value="Meals" /> </it:column> <it:column> 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-30 11:07:02 UTC (rev 17398) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-05-30 11:10:00 UTC (rev 17399) @@ -8,32 +8,29 @@ xmlns:fn="http://java.sun.com/jsp/jstl/functions"> <ui:composition> -<style> -.stable tr:nth-child(even){ - background-color: #FCFFFE; + <style> +.stable tr:nth-child(even) { + background-color: #FCFFFE; } -.stable tr:nth-child(odd){ + +.stable tr:nth-child(odd) { background-color: #ECF3FE; } -.active-row{ + +.active-row { background-color: #FFEBDA !important; - cursor:pointer; + cursor: pointer; } </style> - <p>This sample shows simple table styling. The table appears in zebra-style and has - highlighting of hovered row.</p> + <p>This sample shows simple table styling. The table appears in + zebra-style and has highlighting of hovered row.</p> <h:form id="form"> <it:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="20" rowClasses = "odd-row, even-row" styleClass="stable"> + id="table" rows="20" rowClasses="odd-row, even-row" + styleClass="stable"> <it:column accept="#{carsFiteringBean.acceptVendor}"> <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Vendor " /> - <h:selectOneMenu value="#{carsFilteringBean.vendorFilter}"> - <f:selectItems value="#{carsBean.vendorOptions}" /> - <a4j:ajax render="form:table" execute="@this" event="change"/> - </h:selectOneMenu> - </h:panelGroup> + <h:outputText value="Vendor " /> </f:facet> <h:outputText value="#{car.vendor}" /> </it:column> @@ -51,14 +48,7 @@ </it:column> <it:column filter="#{carsFilteringBean.mileageFilterImpl}"> <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Mileage &lt; " /> - <h:inputText value="#{carsFilteringBean.mileageFilter}"> - <f:convertNumber groupingUsed="true"/> - <f:validateLongRange maximum="500000"/> - <a4j:ajax event="blur" render="form:table" execute="@this" /> - </h:inputText> - </h:panelGroup> + <h:outputText value="Mileage" /> </f:facet> <h:outputText value="#{car.mileage}" /> </it:column> 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-30 11:07:02 UTC (rev 17398) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml 2010-05-30 11:10:00 UTC (rev 17399) @@ -23,7 +23,7 @@ <it:column colspan="6"> <h:outputText value="Cars marketplace" /> </it:column> - <it:column breakBefore="true"> + <it:column breakRowBefore="true"> <h:outputText value="Model" /> </it:column> <it:column> @@ -45,14 +45,14 @@ </f:facet> <it:column colspan="6"> <h:outputText value="#{list.vendor}" /> - <it:toggleControl for="sbtbl"> + <it:subTableToggleControl for="sbtbl"> <f:facet name="expand"> <a href="#">(show details)</a> </f:facet> <f:facet name="collapse"> <a href="#">(hide details)</a> </f:facet> - </it:toggleControl> + </it:subTableToggleControl> </it:column> <it:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client"> <it:column>