You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/11/10 09:14:02 UTC
svn commit: r1033391 [33/35] - in /myfaces/trinidad/trunk: scripts/
trinidad-examples/trinidad-blank/src/main/webapp/
trinidad-examples/trinidad-components-showcase/src/main/webapp/components/buttonsAndLinks/commandButton/
trinidad-examples/trinidad-co...
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_adf.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_adf.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_adf.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_adf.jspx Wed Nov 10 08:13:47 2010
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:trh="http://myfaces.apache.org/trinidad/html"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Table Editable ADF">
- <tr:form >
- <tr:messages/>
- <tr:table value="#{periodicTable.tableData}" var="row" rows="0">
- <tr:column>
- <f:facet name="header">
- <tr:outputText value="Name"/>
- </f:facet>
- <tr:inputText value="#{row.name}"/>
- </tr:column>
- <tr:column>
- <f:facet name="header">
- <tr:outputText value="Symbol"/>
- </f:facet>
- <tr:inputText value="#{row.symbol}"/>
- </tr:column>
- <tr:column>
- <f:facet name="header">
- <tr:outputText value="Action Column"/>
- </f:facet>
- <tr:commandButton text="Action" action="#{row.action}"/>
- </tr:column>
- </tr:table>
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:trh="http://myfaces.apache.org/trinidad/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Table Editable ADF">
+ <tr:form >
+ <tr:messages/>
+ <tr:table value="#{periodicTable.tableData}" var="row" rows="0">
+ <tr:column>
+ <f:facet name="header">
+ <tr:outputText value="Name"/>
+ </f:facet>
+ <tr:inputText value="#{row.name}"/>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ <tr:outputText value="Symbol"/>
+ </f:facet>
+ <tr:inputText value="#{row.symbol}"/>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ <tr:outputText value="Action Column"/>
+ </f:facet>
+ <tr:commandButton text="Action" action="#{row.action}"/>
+ </tr:column>
+ </tr:table>
+ </tr:form>
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_adf.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_jsf.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_jsf.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_jsf.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_jsf.jspx Wed Nov 10 08:13:47 2010
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:trh="http://myfaces.apache.org/trinidad/html"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Table Editable JSF">
- <h:form >
- <h:messages/>
- <h:dataTable value="#{periodicTable.tableData}" var="row" rows="0">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Name"/>
- </f:facet>
- <h:inputText value="#{row.name}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Symbol"/>
- </f:facet>
- <h:inputText value="#{row.symbol}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Action Column"/>
- </f:facet>
- <h:commandButton value="Action" action="#{row.action}"/>
- </h:column>
- </h:dataTable>
- </h:form>
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:trh="http://myfaces.apache.org/trinidad/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Table Editable JSF">
+ <h:form >
+ <h:messages/>
+ <h:dataTable value="#{periodicTable.tableData}" var="row" rows="0">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Name"/>
+ </f:facet>
+ <h:inputText value="#{row.name}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Symbol"/>
+ </f:facet>
+ <h:inputText value="#{row.symbol}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Action Column"/>
+ </f:facet>
+ <h:commandButton value="Action" action="#{row.action}"/>
+ </h:column>
+ </h:dataTable>
+ </h:form>
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_editable_jsf.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_adf.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_adf.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_adf.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_adf.jspx Wed Nov 10 08:13:47 2010
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:trh="http://myfaces.apache.org/trinidad/html"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <html>
- <head>
- <title>Table ReadOnly ADF</title>
- <trh:styleSheet/>
- </head>
- <body>
- <tr:form >
- <tr:messages/>
- <tr:table value="#{periodicTable.tableData}" var="row" rows="0">
- <tr:column headerText="Name">
- <tr:outputText value="#{row.name}"/>
- </tr:column>
- <tr:column headerText="Symbol">
- <tr:outputText value="#{row.symbol}"/>
- </tr:column>
- <tr:column headerText="Group">
- <tr:outputText value="#{row.group}"/>
- </tr:column>
- </tr:table>
- </tr:form>
- </body>
- </html>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:trh="http://myfaces.apache.org/trinidad/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <html>
+ <head>
+ <title>Table ReadOnly ADF</title>
+ <trh:styleSheet/>
+ </head>
+ <body>
+ <tr:form >
+ <tr:messages/>
+ <tr:table value="#{periodicTable.tableData}" var="row" rows="0">
+ <tr:column headerText="Name">
+ <tr:outputText value="#{row.name}"/>
+ </tr:column>
+ <tr:column headerText="Symbol">
+ <tr:outputText value="#{row.symbol}"/>
+ </tr:column>
+ <tr:column headerText="Group">
+ <tr:outputText value="#{row.group}"/>
+ </tr:column>
+ </tr:table>
+ </tr:form>
+ </body>
+ </html>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_adf.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_jsf.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_jsf.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_jsf.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_jsf.jspx Wed Nov 10 08:13:47 2010
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:trh="http://myfaces.apache.org/trinidad/html"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <html>
- <head>
- <title>Table ReadOnly JSF</title>
- <style>
-.TableContent {border-collapse:collapse;border-color:#9fa57d;border-style:solid;border-width:1px}
-.ColumnHeader {border-color:#f7f7e7;font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:bold;text-align:left;background-color:#d2d8b0;color:#336699;vertical-align:bottom; border-style:solid;border-width:0px 0px 0px 1px}
-.ColumnCellText {font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;vertical-align:baseline;background-color:#f7f7e7;border-color:#d2d8b0; border-style:solid;border-width:1px}
- </style>
- </head>
- <body>
- <h:form >
- <h:messages/>
- <h:dataTable styleClass="TableContent"
- headerClass="ColumnHeader"
- columnClasses="ColumnCellText"
- value="#{periodicTable.tableData}" var="row" rows="0">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Name"/>
- </f:facet>
- <h:outputText value="#{row.name}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Symbol"/>
- </f:facet>
- <h:outputText value="#{row.symbol}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Group"/>
- </f:facet>
- <h:outputText value="#{row.group}"/>
- </h:column>
- </h:dataTable>
- </h:form>
- </body>
- </html>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:trh="http://myfaces.apache.org/trinidad/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <html>
+ <head>
+ <title>Table ReadOnly JSF</title>
+ <style>
+.TableContent {border-collapse:collapse;border-color:#9fa57d;border-style:solid;border-width:1px}
+.ColumnHeader {border-color:#f7f7e7;font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:bold;text-align:left;background-color:#d2d8b0;color:#336699;vertical-align:bottom; border-style:solid;border-width:0px 0px 0px 1px}
+.ColumnCellText {font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;vertical-align:baseline;background-color:#f7f7e7;border-color:#d2d8b0; border-style:solid;border-width:1px}
+ </style>
+ </head>
+ <body>
+ <h:form >
+ <h:messages/>
+ <h:dataTable styleClass="TableContent"
+ headerClass="ColumnHeader"
+ columnClasses="ColumnCellText"
+ value="#{periodicTable.tableData}" var="row" rows="0">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Name"/>
+ </f:facet>
+ <h:outputText value="#{row.name}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Symbol"/>
+ </f:facet>
+ <h:outputText value="#{row.symbol}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Group"/>
+ </f:facet>
+ <h:outputText value="#{row.group}"/>
+ </h:column>
+ </h:dataTable>
+ </h:form>
+ </body>
+ </html>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/performance/table_readOnly_jsf.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/reorderTest.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/reorderTest.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/reorderTest.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/reorderTest.jspx Wed Nov 10 08:13:47 2010
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Reordering Test">
- <tr:form>
- <tr:panelGroupLayout binding="#{reorder.panel}" layout="vertical">
- <tr:outputText value="Item 1"/>
- <tr:outputText value="Item 2"/>
- <tr:outputText value="Item 3"/>
- <f:facet name="separator">
- <tr:outputText value="----------"/>
- </f:facet>
- </tr:panelGroupLayout>
- <f:verbatim><br /></f:verbatim>
- <tr:commandButton text="Add" actionListener="#{reorder.add}"/>
- <tr:commandButton text="Remove last" actionListener="#{reorder.remove}"/>
- <tr:commandButton text="Remove first" actionListener="#{reorder.removeFirst}"/>
- <tr:commandButton text="Remove Last" actionListener="#{reorder.remove}"/>
- <tr:commandButton text="Rotate" actionListener="#{reorder.rotate}"/>
- <tr:commandButton text="Remove Separator" actionListener="#{reorder.removeSeparator}"/>
- <tr:commandButton text="Set Separator" actionListener="#{reorder.setSeparator}"/>
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Reordering Test">
+ <tr:form>
+ <tr:panelGroupLayout binding="#{reorder.panel}" layout="vertical">
+ <tr:outputText value="Item 1"/>
+ <tr:outputText value="Item 2"/>
+ <tr:outputText value="Item 3"/>
+ <f:facet name="separator">
+ <tr:outputText value="----------"/>
+ </f:facet>
+ </tr:panelGroupLayout>
+ <f:verbatim><br /></f:verbatim>
+ <tr:commandButton text="Add" actionListener="#{reorder.add}"/>
+ <tr:commandButton text="Remove last" actionListener="#{reorder.remove}"/>
+ <tr:commandButton text="Remove first" actionListener="#{reorder.removeFirst}"/>
+ <tr:commandButton text="Remove Last" actionListener="#{reorder.remove}"/>
+ <tr:commandButton text="Rotate" actionListener="#{reorder.rotate}"/>
+ <tr:commandButton text="Remove Separator" actionListener="#{reorder.removeSeparator}"/>
+ <tr:commandButton text="Set Separator" actionListener="#{reorder.setSeparator}"/>
+ </tr:form>
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/reorderTest.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx Wed Nov 10 08:13:47 2010
@@ -1,100 +1,100 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey">
- <tr:form>
-
- <tr:panelPage>
- <tr:panelHeader text="Please review your answers and make any last changes:">
-
- <tr:panelFormLayout>
-<!-- question 1 -->
- <tr:selectOneRadio label="#{survey.q0.prompt}"
- required="true"
- value="#{survey.a0}">
- <tr:selectItem label="#{survey.q0.answerString}" value="0"/>
- <tr:selectItem label="#{survey.q0.answerString}" value="1"/>
- <tr:selectItem label="#{survey.q0.answerString}" value="2"/>
- <tr:selectItem label="#{survey.q0.answerString}" value="3"/>
- </tr:selectOneRadio >
-
-
-<!-- question 2 -->
- <tr:inputText label="#{survey.q1.prompt}"
- required="true"
- value="#{survey.a1}"/>
-
-
-<!-- question 3 -->
- <tr:selectOneRadio label="#{survey.q2.prompt}"
- required="true"
- value="#{survey.a2}">
- <tr:selectItem label="#{survey.q2.answerString}" value="0"/>
- <tr:selectItem label="#{survey.q2.answerString}" value="1"/>
- <tr:selectItem label="#{survey.q2.answerString}" value="2"/>
- <tr:selectItem label="#{survey.q2.answerString}" value="3"/>
- </tr:selectOneRadio >
-
-
-<!-- question 4 -->
- <tr:panelLabelAndMessage label="#{survey.q3.prompt}"
- labelStyle="vertical-align: top;">
- <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a30}" readOnly="false"/>
- <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a31}" readOnly="false"/>
- <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a32}" readOnly="false"/>
- <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a33}" readOnly="false"/>
- </tr:panelLabelAndMessage>
-
-
-<!-- question 5 -->
- <tr:selectOneRadio label="#{survey.q4.prompt}"
- required="true"
- value="#{survey.a4}">
- <tr:selectItem label="#{survey.q4.answerString}" value="0"/>
- <tr:selectItem label="#{survey.q4.answerString}" value="1"/>
- <tr:selectItem label="#{survey.q4.answerString}" value="2"/>
- <tr:selectItem label="#{survey.q4.answerString}" value="3"/>
- </tr:selectOneRadio >
-
- </tr:panelFormLayout>
- </tr:panelHeader>
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
-
- <tr:panelButtonBar>
- <tr:commandButton action="#{survey.check}" text="check answers" rendered="true" />
- </tr:panelButtonBar>
- </tr:panelPage>
-
-
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey">
+ <tr:form>
+
+ <tr:panelPage>
+ <tr:panelHeader text="Please review your answers and make any last changes:">
+
+ <tr:panelFormLayout>
+<!-- question 1 -->
+ <tr:selectOneRadio label="#{survey.q0.prompt}"
+ required="true"
+ value="#{survey.a0}">
+ <tr:selectItem label="#{survey.q0.answerString}" value="0"/>
+ <tr:selectItem label="#{survey.q0.answerString}" value="1"/>
+ <tr:selectItem label="#{survey.q0.answerString}" value="2"/>
+ <tr:selectItem label="#{survey.q0.answerString}" value="3"/>
+ </tr:selectOneRadio >
+
+
+<!-- question 2 -->
+ <tr:inputText label="#{survey.q1.prompt}"
+ required="true"
+ value="#{survey.a1}"/>
+
+
+<!-- question 3 -->
+ <tr:selectOneRadio label="#{survey.q2.prompt}"
+ required="true"
+ value="#{survey.a2}">
+ <tr:selectItem label="#{survey.q2.answerString}" value="0"/>
+ <tr:selectItem label="#{survey.q2.answerString}" value="1"/>
+ <tr:selectItem label="#{survey.q2.answerString}" value="2"/>
+ <tr:selectItem label="#{survey.q2.answerString}" value="3"/>
+ </tr:selectOneRadio >
+
+
+<!-- question 4 -->
+ <tr:panelLabelAndMessage label="#{survey.q3.prompt}"
+ labelStyle="vertical-align: top;">
+ <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a30}" readOnly="false"/>
+ <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a31}" readOnly="false"/>
+ <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a32}" readOnly="false"/>
+ <tr:selectBooleanCheckbox text="#{survey.q3.answerString}" value="#{survey.a33}" readOnly="false"/>
+ </tr:panelLabelAndMessage>
+
+
+<!-- question 5 -->
+ <tr:selectOneRadio label="#{survey.q4.prompt}"
+ required="true"
+ value="#{survey.a4}">
+ <tr:selectItem label="#{survey.q4.answerString}" value="0"/>
+ <tr:selectItem label="#{survey.q4.answerString}" value="1"/>
+ <tr:selectItem label="#{survey.q4.answerString}" value="2"/>
+ <tr:selectItem label="#{survey.q4.answerString}" value="3"/>
+ </tr:selectOneRadio >
+
+ </tr:panelFormLayout>
+ </tr:panelHeader>
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+
+ <tr:panelButtonBar>
+ <tr:commandButton action="#{survey.check}" text="check answers" rendered="true" />
+ </tr:panelButtonBar>
+ </tr:panelPage>
+
+
+ </tr:form>
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx Wed Nov 10 08:13:47 2010
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey Demo">
- <tr:form>
-
- <tr:panelPage>
-
- <tr:panelHeader text="Question 1 of 5">
- <tr:panelFormLayout>
-
- <tr:selectOneRadio label="#{survey.q0.prompt}"
- required="true"
- value="#{survey.a0}" >
- <tr:forEach var="item" varStatus="iter"
- items="#{survey.q0.answerStrings}">
- <!-- The strange EL syntax for "value" forces it to be a string -->
- <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
- </tr:forEach>
- </tr:selectOneRadio >
-
- </tr:panelFormLayout>
- </tr:panelHeader>
-
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
- <f:facet name="location">
- <tr:train value="#{surveyMenuModel}" var="surveyNode">
- <f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{surveyNode.label}"
- action="#{surveyNode.getOutcome}"
- disabled="true"/>
- </f:facet>
- </tr:train>
- </f:facet>
-
- <tr:singleStepButtonBar selectedStep="1" maxStep="5"
- nextAction="#{survey.next}"/>
- </tr:panelPage>
-
- </tr:form>
-
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey Demo">
+ <tr:form>
+
+ <tr:panelPage>
+
+ <tr:panelHeader text="Question 1 of 5">
+ <tr:panelFormLayout>
+
+ <tr:selectOneRadio label="#{survey.q0.prompt}"
+ required="true"
+ value="#{survey.a0}" >
+ <tr:forEach var="item" varStatus="iter"
+ items="#{survey.q0.answerStrings}">
+ <!-- The strange EL syntax for "value" forces it to be a string -->
+ <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
+ </tr:forEach>
+ </tr:selectOneRadio >
+
+ </tr:panelFormLayout>
+ </tr:panelHeader>
+
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+ <f:facet name="location">
+ <tr:train value="#{surveyMenuModel}" var="surveyNode">
+ <f:facet name="nodeStamp">
+ <tr:commandNavigationItem text="#{surveyNode.label}"
+ action="#{surveyNode.getOutcome}"
+ disabled="true"/>
+ </f:facet>
+ </tr:train>
+ </f:facet>
+
+ <tr:singleStepButtonBar selectedStep="1" maxStep="5"
+ nextAction="#{survey.next}"/>
+ </tr:panelPage>
+
+ </tr:form>
+
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx Wed Nov 10 08:13:47 2010
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey Demo">
- <tr:form>
-
- <tr:panelPage>
- <tr:panelHeader text="Question 2 of 5">
- <tr:panelFormLayout>
- <tr:inputText label="#{survey.q1.prompt}"
- required="true"
- value="#{survey.a1}"/>
- </tr:panelFormLayout>
- </tr:panelHeader>
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
-
- <f:facet name="location">
- <tr:train value="#{surveyMenuModel}" var="surveyNode">
- <f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{surveyNode.label}"
- action="#{surveyNode.getOutcome}"
- disabled="true"/>
- </f:facet>
- </tr:train>
- </f:facet>
-
- <tr:singleStepButtonBar selectedStep="2" maxStep="5"
- nextAction="#{survey.next}"
- previousAction="#{survey.back}"/>
- </tr:panelPage>
-
- </tr:form>
-
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey Demo">
+ <tr:form>
+
+ <tr:panelPage>
+ <tr:panelHeader text="Question 2 of 5">
+ <tr:panelFormLayout>
+ <tr:inputText label="#{survey.q1.prompt}"
+ required="true"
+ value="#{survey.a1}"/>
+ </tr:panelFormLayout>
+ </tr:panelHeader>
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+
+ <f:facet name="location">
+ <tr:train value="#{surveyMenuModel}" var="surveyNode">
+ <f:facet name="nodeStamp">
+ <tr:commandNavigationItem text="#{surveyNode.label}"
+ action="#{surveyNode.getOutcome}"
+ disabled="true"/>
+ </f:facet>
+ </tr:train>
+ </f:facet>
+
+ <tr:singleStepButtonBar selectedStep="2" maxStep="5"
+ nextAction="#{survey.next}"
+ previousAction="#{survey.back}"/>
+ </tr:panelPage>
+
+ </tr:form>
+
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx Wed Nov 10 08:13:47 2010
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey Demo">
- <tr:form>
-
- <tr:panelPage>
-
- <tr:panelHeader text="Question 3 of 5">
- <tr:panelFormLayout>
- <tr:selectOneRadio label="#{survey.q2.prompt}"
- required="true"
- value="#{survey.a2}">
- <tr:forEach var="item" varStatus="iter"
- items="#{survey.q2.answerStrings}">
- <!-- The strange EL syntax for "value" forces it to be a string -->
- <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
- </tr:forEach>
- </tr:selectOneRadio >
- </tr:panelFormLayout>
- </tr:panelHeader>
-
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
- <f:facet name="location">
- <tr:train value="#{surveyMenuModel}" var="surveyNode">
- <f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{surveyNode.label}"
- action="#{surveyNode.getOutcome}"
- disabled="true"/>
- </f:facet>
- </tr:train>
- </f:facet>
- <tr:panelButtonBar>
- <tr:singleStepButtonBar selectedStep="3" maxStep="5"
- nextAction="#{survey.next}" previousAction="#{survey.back}"/>
- </tr:panelButtonBar>
- </tr:panelPage>
-
- </tr:form>
-
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey Demo">
+ <tr:form>
+
+ <tr:panelPage>
+
+ <tr:panelHeader text="Question 3 of 5">
+ <tr:panelFormLayout>
+ <tr:selectOneRadio label="#{survey.q2.prompt}"
+ required="true"
+ value="#{survey.a2}">
+ <tr:forEach var="item" varStatus="iter"
+ items="#{survey.q2.answerStrings}">
+ <!-- The strange EL syntax for "value" forces it to be a string -->
+ <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
+ </tr:forEach>
+ </tr:selectOneRadio >
+ </tr:panelFormLayout>
+ </tr:panelHeader>
+
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+ <f:facet name="location">
+ <tr:train value="#{surveyMenuModel}" var="surveyNode">
+ <f:facet name="nodeStamp">
+ <tr:commandNavigationItem text="#{surveyNode.label}"
+ action="#{surveyNode.getOutcome}"
+ disabled="true"/>
+ </f:facet>
+ </tr:train>
+ </f:facet>
+ <tr:panelButtonBar>
+ <tr:singleStepButtonBar selectedStep="3" maxStep="5"
+ nextAction="#{survey.next}" previousAction="#{survey.back}"/>
+ </tr:panelButtonBar>
+ </tr:panelPage>
+
+ </tr:form>
+
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx Wed Nov 10 08:13:47 2010
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey Demo">
- <tr:form>
-
- <tr:panelPage>
-
- <tr:panelHeader text="Question 4 of 5">
- <tr:panelLabelAndMessage label="#{survey.q3.prompt}"
- labelStyle="vertical-align: top;">
- <tr:selectBooleanCheckbox text="#{survey.q3.text1}" value="#{survey.a30}" />
- <tr:selectBooleanCheckbox text="#{survey.q3.text2}" value="#{survey.a31}" />
- <tr:selectBooleanCheckbox text="#{survey.q3.text3}" value="#{survey.a32}" />
- <tr:selectBooleanCheckbox text="#{survey.q3.text4}" value="#{survey.a33}" />
- </tr:panelLabelAndMessage>
- </tr:panelHeader>
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
- <f:facet name="location">
- <tr:train value="#{surveyMenuModel}" var="surveyNode" >
- <f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{surveyNode.label}"
- action="#{surveyNode.getOutcome}"
- disabled="true"/>
- </f:facet>
- </tr:train>
- </f:facet>
- <tr:panelButtonBar>
- <tr:singleStepButtonBar selectedStep="4" maxStep="5"
- nextAction="#{survey.next}" previousAction="#{survey.back}"/>
- </tr:panelButtonBar>
- </tr:panelPage>
-
- </tr:form>
-
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey Demo">
+ <tr:form>
+
+ <tr:panelPage>
+
+ <tr:panelHeader text="Question 4 of 5">
+ <tr:panelLabelAndMessage label="#{survey.q3.prompt}"
+ labelStyle="vertical-align: top;">
+ <tr:selectBooleanCheckbox text="#{survey.q3.text1}" value="#{survey.a30}" />
+ <tr:selectBooleanCheckbox text="#{survey.q3.text2}" value="#{survey.a31}" />
+ <tr:selectBooleanCheckbox text="#{survey.q3.text3}" value="#{survey.a32}" />
+ <tr:selectBooleanCheckbox text="#{survey.q3.text4}" value="#{survey.a33}" />
+ </tr:panelLabelAndMessage>
+ </tr:panelHeader>
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+ <f:facet name="location">
+ <tr:train value="#{surveyMenuModel}" var="surveyNode" >
+ <f:facet name="nodeStamp">
+ <tr:commandNavigationItem text="#{surveyNode.label}"
+ action="#{surveyNode.getOutcome}"
+ disabled="true"/>
+ </f:facet>
+ </tr:train>
+ </f:facet>
+ <tr:panelButtonBar>
+ <tr:singleStepButtonBar selectedStep="4" maxStep="5"
+ nextAction="#{survey.next}" previousAction="#{survey.back}"/>
+ </tr:panelButtonBar>
+ </tr:panelPage>
+
+ </tr:form>
+
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx Wed Nov 10 08:13:47 2010
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey Demo">
- <tr:form>
-
- <tr:panelPage>
- <tr:panelHeader text="Question 5 of 5">
- <tr:panelFormLayout>
- <tr:selectOneRadio label="#{survey.q4.prompt}"
- required="true"
- value="#{survey.a4}">
- <tr:forEach var="item" varStatus="iter"
- items="#{survey.q4.answerStrings}">
- <!-- The strange EL syntax for "value" forces it to be a string -->
- <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
- </tr:forEach>
- </tr:selectOneRadio >
- </tr:panelFormLayout>
- </tr:panelHeader>
-
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
- <f:facet name="location">
- <tr:train value="#{surveyMenuModel}" var="surveyNode">
- <f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{surveyNode.label}"
- action="#{surveyNode.getOutcome}"
- disabled="true"/>
- </f:facet>
- </tr:train>
- </f:facet>
- <tr:panelButtonBar>
- <tr:singleStepButtonBar selectedStep="5" maxStep="5"
- nextAction="#{survey.next}" previousAction="#{survey.back}"/>
- <tr:commandButton action="#{survey.finish}" text="finish"
- rendered="#{survey.done}"/>
- </tr:panelButtonBar>
- </tr:panelPage>
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey Demo">
+ <tr:form>
+
+ <tr:panelPage>
+ <tr:panelHeader text="Question 5 of 5">
+ <tr:panelFormLayout>
+ <tr:selectOneRadio label="#{survey.q4.prompt}"
+ required="true"
+ value="#{survey.a4}">
+ <tr:forEach var="item" varStatus="iter"
+ items="#{survey.q4.answerStrings}">
+ <!-- The strange EL syntax for "value" forces it to be a string -->
+ <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
+ </tr:forEach>
+ </tr:selectOneRadio >
+ </tr:panelFormLayout>
+ </tr:panelHeader>
+
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+ <f:facet name="location">
+ <tr:train value="#{surveyMenuModel}" var="surveyNode">
+ <f:facet name="nodeStamp">
+ <tr:commandNavigationItem text="#{surveyNode.label}"
+ action="#{surveyNode.getOutcome}"
+ disabled="true"/>
+ </f:facet>
+ </tr:train>
+ </f:facet>
+ <tr:panelButtonBar>
+ <tr:singleStepButtonBar selectedStep="5" maxStep="5"
+ nextAction="#{survey.next}" previousAction="#{survey.back}"/>
+ <tr:commandButton action="#{survey.finish}" text="finish"
+ rendered="#{survey.done}"/>
+ </tr:panelButtonBar>
+ </tr:panelPage>
+ </tr:form>
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx Wed Nov 10 08:13:47 2010
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad"
- xmlns:survey="http://myfaces.apache.org/trinidad/demo" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey">
- <tr:form>
-
- <tr:panelPage>
- <tr:panelHeader text="Please review your responses:">
-
- <tr:panelFormLayout>
-<!-- question 1 -->
- <tr:selectOneRadio label="#{survey.q0.prompt}"
- required="true"
- value="#{survey.a0}">
- <tr:forEach var="item" varStatus="iter"
- items="#{survey.q0.answerStrings}">
- <!-- The strange EL syntax for "value" forces it to be a string -->
- <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
- </tr:forEach>
- <survey:validate_answer questionIndex="0"/>
- </tr:selectOneRadio >
-
-
-<!-- question 2 -->
- <tr:inputText label="#{survey.q1.prompt}"
- required="true"
- value="#{survey.a1}"
- immediate="true">
-
- <survey:validate_answer questionIndex="1"/>
- </tr:inputText>
-
-<!-- question 3 -->
- <tr:selectOneRadio label="#{survey.q2.prompt}"
- required="true"
- value="#{survey.a2}">
- <tr:forEach var="item" varStatus="iter"
- items="#{survey.q2.answerStrings}">
- <!-- The strange EL syntax for "value" forces it to be a string -->
- <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
- </tr:forEach>
-
- <survey:validate_answer questionIndex="2"/>
- </tr:selectOneRadio >
-
-
-<!-- question 4 -->
- <tr:panelLabelAndMessage label="#{survey.q3.prompt}"
- labelStyle="vertical-align: top;">
- <tr:selectBooleanCheckbox text="#{survey.q3.text1}" value="#{survey.a30}" >
- <survey:validate_answer questionIndex="3A"/>
- </tr:selectBooleanCheckbox>
-
- <tr:selectBooleanCheckbox text="#{survey.q3.text2}" value="#{survey.a31}" >
- <survey:validate_answer questionIndex="3B"/>
- </tr:selectBooleanCheckbox>
-
- <tr:selectBooleanCheckbox text="#{survey.q3.text3}" value="#{survey.a32}" >
- <survey:validate_answer questionIndex="3C"/>
- </tr:selectBooleanCheckbox>
-
- <tr:selectBooleanCheckbox text="#{survey.q3.text4}" value="#{survey.a33}" >
- <survey:validate_answer questionIndex="3D"/>
- </tr:selectBooleanCheckbox>
-
- </tr:panelLabelAndMessage>
-
-<!-- question 5 -->
- <tr:selectOneRadio label="#{survey.q4.prompt}"
- required="true"
- value="#{survey.a4}">
- <tr:forEach var="item" varStatus="iter"
- items="#{survey.q4.answerStrings}">
- <!-- The strange EL syntax for "value" forces it to be a string -->
- <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
- </tr:forEach>
-
- <survey:validate_answer questionIndex="4"/>
- </tr:selectOneRadio >
-
- </tr:panelFormLayout>
- </tr:panelHeader>
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
- <tr:panelButtonBar>
- <tr:commandButton action="#{survey.check}" text="check answers"
- rendered="true"/>
- </tr:panelButtonBar>
- </tr:panelPage>
- <tr:commandButton action="#{survey.start}" text="start over"
- rendered="true"/>
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ xmlns:survey="http://myfaces.apache.org/trinidad/demo" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey">
+ <tr:form>
+
+ <tr:panelPage>
+ <tr:panelHeader text="Please review your responses:">
+
+ <tr:panelFormLayout>
+<!-- question 1 -->
+ <tr:selectOneRadio label="#{survey.q0.prompt}"
+ required="true"
+ value="#{survey.a0}">
+ <tr:forEach var="item" varStatus="iter"
+ items="#{survey.q0.answerStrings}">
+ <!-- The strange EL syntax for "value" forces it to be a string -->
+ <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
+ </tr:forEach>
+ <survey:validate_answer questionIndex="0"/>
+ </tr:selectOneRadio >
+
+
+<!-- question 2 -->
+ <tr:inputText label="#{survey.q1.prompt}"
+ required="true"
+ value="#{survey.a1}"
+ immediate="true">
+
+ <survey:validate_answer questionIndex="1"/>
+ </tr:inputText>
+
+<!-- question 3 -->
+ <tr:selectOneRadio label="#{survey.q2.prompt}"
+ required="true"
+ value="#{survey.a2}">
+ <tr:forEach var="item" varStatus="iter"
+ items="#{survey.q2.answerStrings}">
+ <!-- The strange EL syntax for "value" forces it to be a string -->
+ <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
+ </tr:forEach>
+
+ <survey:validate_answer questionIndex="2"/>
+ </tr:selectOneRadio >
+
+
+<!-- question 4 -->
+ <tr:panelLabelAndMessage label="#{survey.q3.prompt}"
+ labelStyle="vertical-align: top;">
+ <tr:selectBooleanCheckbox text="#{survey.q3.text1}" value="#{survey.a30}" >
+ <survey:validate_answer questionIndex="3A"/>
+ </tr:selectBooleanCheckbox>
+
+ <tr:selectBooleanCheckbox text="#{survey.q3.text2}" value="#{survey.a31}" >
+ <survey:validate_answer questionIndex="3B"/>
+ </tr:selectBooleanCheckbox>
+
+ <tr:selectBooleanCheckbox text="#{survey.q3.text3}" value="#{survey.a32}" >
+ <survey:validate_answer questionIndex="3C"/>
+ </tr:selectBooleanCheckbox>
+
+ <tr:selectBooleanCheckbox text="#{survey.q3.text4}" value="#{survey.a33}" >
+ <survey:validate_answer questionIndex="3D"/>
+ </tr:selectBooleanCheckbox>
+
+ </tr:panelLabelAndMessage>
+
+<!-- question 5 -->
+ <tr:selectOneRadio label="#{survey.q4.prompt}"
+ required="true"
+ value="#{survey.a4}">
+ <tr:forEach var="item" varStatus="iter"
+ items="#{survey.q4.answerStrings}">
+ <!-- The strange EL syntax for "value" forces it to be a string -->
+ <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
+ </tr:forEach>
+
+ <survey:validate_answer questionIndex="4"/>
+ </tr:selectOneRadio >
+
+ </tr:panelFormLayout>
+ </tr:panelHeader>
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+ <tr:panelButtonBar>
+ <tr:commandButton action="#{survey.check}" text="check answers"
+ rendered="true"/>
+ </tr:panelButtonBar>
+ </tr:panelPage>
+ <tr:commandButton action="#{survey.start}" text="start over"
+ rendered="true"/>
+ </tr:form>
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx?rev=1033391&r1=1033390&r2=1033391&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx Wed Nov 10 08:13:47 2010
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:trh="http://myfaces.apache.org/trinidad/html"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Survey">
- <tr:form>
-
- <tr:panelPage>
- <f:facet name="navigationGlobal">
- <tr:navigationPane hint="buttons">
- <tr:commandNavigationItem text="Return to Index"
- immediate="true"
- action="home"/>
- </tr:navigationPane>
- </f:facet>
-
- <tr:panelHeader text="Welcome to the Survey Demo">
- <tr:outputText value="Test your knowledge of California Driving Laws"
- styleClass="AFInstructionText"/>
-
- <tr:spacer height="20"/>
- <tr:commandButton action="#{survey.start}" text="begin survey"/>
- </tr:panelHeader>
- </tr:panelPage>
-
-
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:trh="http://myfaces.apache.org/trinidad/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad" >
+ <jsp:directive.page contentType="text/html;charset=utf-8"/>
+ <f:view>
+ <tr:document title="Survey">
+ <tr:form>
+
+ <tr:panelPage>
+ <f:facet name="navigationGlobal">
+ <tr:navigationPane hint="buttons">
+ <tr:commandNavigationItem text="Return to Index"
+ immediate="true"
+ action="home"/>
+ </tr:navigationPane>
+ </f:facet>
+
+ <tr:panelHeader text="Welcome to the Survey Demo">
+ <tr:outputText value="Test your knowledge of California Driving Laws"
+ styleClass="AFInstructionText"/>
+
+ <tr:spacer height="20"/>
+ <tr:commandButton action="#{survey.start}" text="begin survey"/>
+ </tr:panelHeader>
+ </tr:panelPage>
+
+
+ </tr:form>
+ </tr:document>
+ </f:view>
+</jsp:root>
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx
------------------------------------------------------------------------------
svn:eol-style = native