8 a.m.
Author: andrei_exadel
Date: 2008-10-08 08:59:59 -0400 (Wed, 08 Oct 2008)
New Revision: 10693
Modified:
trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml
trunk/samples/columnsDemo/src/main/webapp/index.jsp
trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp
trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml
Log:
Update column demo
Modified: trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml 2008-10-08 11:31:59
UTC (rev 10692)
+++ trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml 2008-10-08 12:59:59
UTC (rev 10693)
@@ -4,14 +4,10 @@
<faces-config>
<managed-bean>
<managed-bean-name>bean</managed-bean-name>
-
<managed-bean-class>org.richfaces.sandbox.samples.Bean</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
+ <managed-bean-class>org.richfaces.samples.Bean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
- <managed-bean>
- <managed-bean-name>columns</managed-bean-name>
-
<managed-bean-class>org.richfaces.sandbox.samples.Columns</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- </managed-bean>
+
<navigation-rule>
<display-name>xhtml</display-name>
<navigation-case>
Modified: trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml 2008-10-08 11:31:59 UTC (rev
10692)
+++ trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml 2008-10-08 12:59:59 UTC (rev
10693)
@@ -26,7 +26,20 @@
<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
<param-value>com.sun.facelets.FaceletViewHandler</param-value>
</context-param>
-
+
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_STYLE</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <!--context-param>
+ <param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
+ <param-value>TIDY</param-value>
+ </context-param-->
<!--
-->
<filter>
@@ -42,7 +55,7 @@
<dispatcher>INCLUDE</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <!-- Faces Servlet -->
+ <!-- Faces Servlet -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Modified: trunk/samples/columnsDemo/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/index.jsp 2008-10-08 11:31:59 UTC (rev
10692)
+++ trunk/samples/columnsDemo/src/main/webapp/index.jsp 2008-10-08 12:59:59 UTC (rev
10693)
@@ -6,7 +6,9 @@
<body>
<a href="faces/pages/index.jsp">JSP</a><br/>
- <a href="faces/pages/index.xhtml">XHTML</a>
+ <a href="faces/pages/index.xhtml">XHTML</a><br/>
+ <a href="faces/pages/test.jsp">TestJSP</a>
+ <a href="faces/pages/test.xhtml">TestXHTML</a>
</body>
</html>
\ No newline at end of file
Modified: trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp 2008-10-08 11:31:59 UTC (rev
10692)
+++ trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp 2008-10-08 12:59:59 UTC (rev
10693)
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
@@ -7,45 +9,71 @@
<html>
- <head>
- <title></title>
- </head>
<body>
<f:view>
- <h:form>
+ <h3>Test Facelets</h3>
+ <br/><br/>
+ <h:form id="_form">
+ <table>
+ <tr>
+ <td>Row Count:</td>
+ <td>
+ <h:inputText value="#{bean.rowsCount}">
+ <a4j:support event="onchange"
actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <td>Name:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.name}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Type:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.type}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Description:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.description}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+
+ <dt:dataTable id="_data" value="#{bean.data}"
var="row">
+ <dt:column sortBy="#{row[0]}">
+ <f:facet name="header">
+ <h:outputText value="#"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[0]}"></h:outputText>
+ </dt:column>
+ <columns:columns value="#{bean.columns}" var="column"
index="index" begin="2"
+ sortBy="#{row[index]}" sortOrder="#{column.ordering}"
+ filterBy="#{row[index]}" filterValue="#{column.filterValue}"
filterEvent="onkeyup">
+ <f:facet name="header">
+ <h:outputText value="#{column.name}"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[index]}" rendered="#{column.name !=
'Description'}"></h:outputText>
+ <h:inputText value="#{row[index]}" rendered="#{column.name eq
'Description'}"></h:inputText>
+ </columns:columns>
+ </dt:dataTable>
+ <br/>
+ <a4j:commandLink value="Ajax Submit"
reRender="_data"></a4j:commandLink><br/>
+ <h:commandLink value="Form Submit"
action="xhtml"></h:commandLink>
+
+ </h:form>
- Columns: <h:inputText
value="#{bean.columnsCountStr}"></h:inputText> <br/>
- Rows: <h:inputText value="#{bean.rowCountStr}"></h:inputText>
<br/>
-
-
- <a4j:commandButton value="Submit" action="#{bean.jsp}"
reRender="tb"></a4j:commandButton>
-
- <br/>
-
-
- <dt:dataTable value="#{bean.model}" var="var"
id="tb">
- <columns:columns value="#{bean.columns}" var="col"
index="counter"
- style="color: Green;">
- <f:facet name="header">
- <h:outputText value="#{col.header}"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="#{col.footer}"></h:outputText>
- </f:facet>
- <h:outputText value="#{var[counter]}"></h:outputText>
- <h:inputText value="#{var[counter]}"></h:inputText>
- </columns:columns>
- </dt:dataTable>
-
- <dt:dataTable value="#{bean.model}" var="var"
id="tb2">
- <columns:columns end="#{bean.columnsCountStr}" var="col"
index="counter"
- style="color: Red;" width="100px;">
- <h:outputText value="#{var[counter]}"></h:outputText>
- </columns:columns>
- </dt:dataTable>
-
-
- </h:form>
- </f:view>
+ </f:view>
</body>
</html>
Modified: trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2008-10-08 11:31:59 UTC
(rev 10692)
+++ trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2008-10-08 12:59:59 UTC
(rev 10693)
@@ -8,57 +8,67 @@
xmlns:dt="http://labs.jboss.com/jbossrichfaces/ui/dataTable"
xmlns:columns="http://labs.jboss.com/jbossrichfaces/ui/columns"...
<f:view>
- XHTML
- <h:form>
-
-
- Columns: <h:inputText
value="#{bean.columnsCountStr}"></h:inputText> <br/>
- Rows: <h:inputText value="#{bean.rowCountStr}"></h:inputText>
<br/>
-
-
- <a4j:commandButton value="Submit" action="#{bean.xhtml}"
reRender="tb"></a4j:commandButton>
-
- <br/>
-
-
- <dt:dataTable value="#{bean.model}" var="var"
id="tb">
- <dt:column>
- <f:facet name="header">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <h:outputText value="crack"></h:outputText>
- </dt:column>
- <columns:columns value="#{bean.columns}" var="col"
index="counter"
- style="color: Blue; text-align: right;" width="200px;"
- begin="0" end="10"
- sortBy="#{var[counter]}" sortOrder="#{col.ordering}">
- <f:facet name="header">
- <h:outputText value="#{col.header}"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="#{col.footer}"></h:outputText>
- </f:facet>
- <h:outputText value="#{var[counter]}"></h:outputText>
- </columns:columns>
+ <h3>Test Facelets</h3>
+ <br/><br/>
+ <h:form id="_form">
+ <table>
+ <tr>
+ <td>Row Count:</td>
+ <td>
+ <h:inputText value="#{bean.rowsCount}">
+ <a4j:support event="onchange"
actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <td>Name:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.name}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Type:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.type}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Description:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.description}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}"
reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+
+ <dt:dataTable id="_data" value="#{bean.data}"
var="row">
+ <dt:column sortBy="#{row[0]}">
+ <f:facet name="header">
+ <h:outputText value="#"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[0]}"></h:outputText>
+ </dt:column>
+ <columns:columns value="#{bean.columns}" var="column"
index="index" begin="2"
+ sortBy="#{row[index]}" sortOrder="#{column.ordering}"
+ filterBy="#{row[index]}" filterValue="#{column.filterValue}"
filterEvent="onkeyup">
+ <f:facet name="header">
+ <h:outputText value="#{column.name}"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[index]}" rendered="#{column.name !=
'Description'}"></h:outputText>
+ <h:inputText value="#{row[index]}" rendered="#{column.name eq
'Description'}"></h:inputText>
+ </columns:columns>
+ </dt:dataTable>
+ <br/>
+ <a4j:commandLink value="Ajax Submit"
reRender="_data"></a4j:commandLink><br/>
+ <h:commandLink value="Form Submit"
action="xhtml"></h:commandLink>
- <dt:column>
- <f:facet name="header">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <h:outputText value="crack"></h:outputText>
- </dt:column>
- </dt:dataTable>
-
- <h:commandButton value="Submit"
action="xhtml"></h:commandButton>
-
- </h:form>
-
+ </h:form>
</f:view>
-
</html>
\ No newline at end of file