[richfaces-svn-commits] JBoss Rich Faces SVN: r10422 - trunk/test-applications/jsp/src/main/webapp/Columns.
Author: mvitenkov
Date: 2008-09-12 07:16:58 -0400 (Fri, 12 Sep 2008)
New Revision: 10422
Modified:
trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp
trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-09-12 11:16:32
UTC (rev 10421)
+++ trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-09-12 11:16:58
UTC (rev 10422)
@@ -10,6 +10,8 @@
</h:selectBooleanCheckbox>
<h:outputText value="rich:dataTable:"
rendered="#{columns.dataTableRendered}"></h:outputText>
<h:outputText value="h:dataTable:"
rendered="#{!columns.dataTableRendered}"></h:outputText>
+ <br/>
+ <h:outputText value="#{columns.text}"/>
<rich:dataTable id="richColumnsID" value="#{columns.data1}"
var="d1" rendered="#{columns.dataTableRendered}">
<h:column>
@@ -32,11 +34,12 @@
</f:facet>
</rich:column>
+
<rich:columns value="#{columns.data2}" var="d2"
footerClass="#{style.footerClass}" headerClass="#{style.headerClass}"
breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}"
- columns="#{columns.columns}" index="index"
rowspan="#{columns.rowspan}"
- begin="#{columns.begin}" end="#{columns.end}"
width="#{columns.width}" style="#{style.style}"
styleClass="#{style.styleClass}"
- comparator="#{columns}" sortBy="#{d2.str0}"
selfSorted="true" sortOrder="#{columns.orderings[index]}"
dir="LTR" filterBy="#{d1.str0}"
- filterValue="#{columns.filterValue[index]}"
filterMethod="#{columns.filterMethod}"
filterEvent="#{columns.filterEvent}">
+ columns="#{columns.columns}" index="index"
rowspan="#{columns.rowspan}" begin="#{columns.begin}"
end="#{columns.end}" width="#{columns.width}"
style="#{style.style}" styleClass="#{style.styleClass}"
+ sortOrder="#{columns.orderings[index]}" sortBy="#{d1.str0}"
+ filterBy="#{d1.str0}"
+ filterValue="#{columns.filterValue[index]}"
filterMethod="#{columns.filterMethod}">
<f:facet name="header">
<h:outputText value="header #{d2.int0}"></h:outputText>
</f:facet>
Modified: trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp 2008-09-12
11:16:32 UTC (rev 10421)
+++ trunk/test-applications/jsp/src/main/webapp/Columns/ColumnsProperty.jsp 2008-09-12
11:16:58 UTC (rev 10422)
@@ -50,11 +50,6 @@
<h:inputText value="#{columns.width}" onchange="submit();">
</h:inputText>
- <h:outputText value="filterEvent" />
- <h:selectOneMenu value="#{columns.filterEvent}"
onchange="submit();">
- <f:selectItems value="#{columns.filterEvents}"/>
- </h:selectOneMenu>
-
<h:outputText value="breakBefore:"></h:outputText>
<h:selectBooleanCheckbox value="#{columns.breakBefore}"
onchange="submit();">
</h:selectBooleanCheckbox>