You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/02/03 22:05:00 UTC
svn commit: r906241 [2/4] - in
/myfaces/tomahawk/trunk/examples/simple20/src/main:
java/org/apache/myfaces/examples/inputtextdisabled/
java/org/apache/myfaces/examples/listexample/
java/org/apache/myfaces/examples/picklist/ java/org/apache/myfaces/exam...
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/crossDataTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/crossDataTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/crossDataTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/crossDataTable.jsp Wed Feb 3 21:04:57 2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,22 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<!--
-managed beans used:
- countryList
--->
-
-<f:view>
-
- <f:loadBundle
- basename="org.apache.myfaces.examples.resource.example_messages"
- var="example_messages" />
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form>
<h:panelGroup id="body">
@@ -63,7 +52,7 @@
</h:commandLink>
</h:panelGrid>
<f:verbatim>
- <br>
+ <br/>
</f:verbatim>
<t:dataTable id="data" styleClass="standardTable"
@@ -97,16 +86,12 @@
</t:dataTable>
<f:verbatim>
- <br>
+ <br/>
</f:verbatim>
</h:panelGroup>
</h:form>
- <jsp:include page="inc/mbean_source.jsp"/>
-</f:view>
-
-<%@include file="inc/page_footer.jsp"%>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/css.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/css.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/css.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/css.jsp Wed Feb 3 21:04:57 2010
@@ -1,6 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,28 +26,12 @@
* under the License.
*/
//-->
-<html>
-
-<%-- Unnecessary, as we define head below --%>
-<%-- <%@include file="inc/head.inc" %> --%>
-
-<f:view>
- <head>
- <meta HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=iso-8859-1">
- <title>MyFaces - the free JSF Implementation</title>
- <t:stylesheet path="/css/basic.css"/>
- </head>
-
- <body>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
- <h:outputText value="#{example_messages['css_msg']}"/><code>stylesheet</code>-Component<br />
- <a href='http://myfaces.apache.org'>The MyFaces-Team</a>.
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
- <%@include file="inc/page_footer.jsp" %>
-
- </body>
-</f:view>
+<body>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
+ <h:outputText value="#{example_messages['css_msg']}"/><code>stylesheet</code>-Component<br />
+ <a href='http://myfaces.apache.org'>The MyFaces-Team</a>.
+ </ui:define>
+ </ui:composition>
+</body>
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataList.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataList.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataList.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataList.jsp Wed Feb 3 21:04:57 2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,15 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:outputText value="#{example_messages['dataList_simple']}" styleClass="standard_bold" />
<f:verbatim><br/></f:verbatim>
@@ -47,7 +43,7 @@
rowCountVar="rowCount"
rowIndexVar="rowIndex">
<h:outputText value="#{country.name}" />
- <h:outputText value=", " rendered="#{rowIndex + 1 < rowCount}" />
+ <h:outputText value=", " rendered="#{rowIndex + 1 < rowCount}" />
</t:dataList>
<f:verbatim><br/><br/></f:verbatim>
@@ -85,13 +81,7 @@
<h:commandButton value="Submit" action="test"/>
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataScroller.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataScroller.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataScroller.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataScroller.jsp Wed Feb 3 21:04:57 2010
@@ -1,10 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,118 +26,108 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
+ <h:form>
+ <h:outputText value="Rows to show"/>
+ <h:inputText value="#{scrollerList.rowCount}" />
+ <h:commandButton value="set rowCount"/>
+
+ <h:panelGroup id="body">
+
+ <t:dataTable id="data"
+ styleClass="scrollerTable"
+ headerClass="standardTable_Header"
+ footerClass="standardTable_Header"
+ rowClasses="standardTable_Row1,standardTable_Row2"
+ columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
+ var="car"
+ value="#{scrollerList.list}"
+ preserveDataModel="false"
+ rows="#{scrollerList.rowCount}"
+ >
+ <h:column>
+ <f:facet name="header">
+ </f:facet>
+ <h:outputText value="#{car.id}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{example_messages['label_cars']}" />
+ </f:facet>
+ <h:outputText value="#{car.type}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{example_messages['label_color']}" />
+ </f:facet>
+ <h:outputText value="#{car.color}" />
+ </h:column>
+
+ </t:dataTable>
+
+ <h:panelGrid columns="1" styleClass="scrollerTable2" columnClasses="standardTable_ColumnCentered" >
+ <t:dataScroller id="scroll_1"
+ for="data"
+ fastStep="10"
+ pageCountVar="pageCount"
+ pageIndexVar="pageIndex"
+ styleClass="scroller"
+ paginator="true"
+ paginatorMaxPages="9"
+ paginatorTableClass="paginator"
+ paginatorActiveColumnStyle="font-weight:bold;"
+ immediate="true"
+ actionListener="#{scrollerList.scrollerAction}"
+ >
+ <f:facet name="first" >
+ <t:graphicImage url="images/arrow-first.gif" border="1" />
+ </f:facet>
+ <f:facet name="last">
+ <t:graphicImage url="images/arrow-last.gif" border="1" />
+ </f:facet>
+ <f:facet name="previous">
+ <t:graphicImage url="images/arrow-previous.gif" border="1" />
+ </f:facet>
+ <f:facet name="next">
+ <t:graphicImage url="images/arrow-next.gif" border="1" />
+ </f:facet>
+ <f:facet name="fastforward">
+ <t:graphicImage url="images/arrow-ff.gif" border="1" />
+ </f:facet>
+ <f:facet name="fastrewind">
+ <t:graphicImage url="images/arrow-fr.gif" border="1" />
+ </f:facet>
+ </t:dataScroller>
+ <t:dataScroller id="scroll_2"
+ for="data"
+ rowsCountVar="rowsCount"
+ displayedRowsCountVar="displayedRowsCountVar"
+ firstRowIndexVar="firstRowIndex"
+ lastRowIndexVar="lastRowIndex"
+ pageCountVar="pageCount"
+ immediate="true"
+ pageIndexVar="pageIndex"
+ >
+ <h:outputFormat value="#{example_messages['dataScroller_pages']}" styleClass="standard" >
+ <f:param value="#{rowsCount}" />
+ <f:param value="#{displayedRowsCountVar}" />
+ <f:param value="#{firstRowIndex}" />
+ <f:param value="#{lastRowIndex}" />
+ <f:param value="#{pageIndex}" />
+ <f:param value="#{pageCount}" />
+ </h:outputFormat>
+ </t:dataScroller>
+ </h:panelGrid>
-<f:view>
-<h:form>
+ </h:panelGroup>
+ <t:commandLink value="test" immediate="true" />
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
- <h:outputText value="Rows to show"/>
- <h:inputText value="#{scrollerList.rowCount}" />
- <h:commandButton value="set rowCount"/>
-
- <h:panelGroup id="body">
-
- <t:dataTable id="data"
- styleClass="scrollerTable"
- headerClass="standardTable_Header"
- footerClass="standardTable_Header"
- rowClasses="standardTable_Row1,standardTable_Row2"
- columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
- var="car"
- value="#{scrollerList.list}"
- preserveDataModel="false"
- rows="#{scrollerList.rowCount}"
- >
- <h:column>
- <f:facet name="header">
- </f:facet>
- <h:outputText value="#{car.id}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{example_messages['label_cars']}" />
- </f:facet>
- <h:outputText value="#{car.type}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{example_messages['label_color']}" />
- </f:facet>
- <h:outputText value="#{car.color}" />
- </h:column>
-
- </t:dataTable>
-
- <h:panelGrid columns="1" styleClass="scrollerTable2" columnClasses="standardTable_ColumnCentered" >
- <t:dataScroller id="scroll_1"
- for="data"
- fastStep="10"
- pageCountVar="pageCount"
- pageIndexVar="pageIndex"
- styleClass="scroller"
- paginator="true"
- paginatorMaxPages="9"
- paginatorTableClass="paginator"
- paginatorActiveColumnStyle="font-weight:bold;"
- immediate="true"
- actionListener="#{scrollerList.scrollerAction}"
- >
- <f:facet name="first" >
- <t:graphicImage url="images/arrow-first.gif" border="1" />
- </f:facet>
- <f:facet name="last">
- <t:graphicImage url="images/arrow-last.gif" border="1" />
- </f:facet>
- <f:facet name="previous">
- <t:graphicImage url="images/arrow-previous.gif" border="1" />
- </f:facet>
- <f:facet name="next">
- <t:graphicImage url="images/arrow-next.gif" border="1" />
- </f:facet>
- <f:facet name="fastforward">
- <t:graphicImage url="images/arrow-ff.gif" border="1" />
- </f:facet>
- <f:facet name="fastrewind">
- <t:graphicImage url="images/arrow-fr.gif" border="1" />
- </f:facet>
- </t:dataScroller>
- <t:dataScroller id="scroll_2"
- for="data"
- rowsCountVar="rowsCount"
- displayedRowsCountVar="displayedRowsCountVar"
- firstRowIndexVar="firstRowIndex"
- lastRowIndexVar="lastRowIndex"
- pageCountVar="pageCount"
- immediate="true"
- pageIndexVar="pageIndex"
- >
- <h:outputFormat value="#{example_messages['dataScroller_pages']}" styleClass="standard" >
- <f:param value="#{rowsCount}" />
- <f:param value="#{displayedRowsCountVar}" />
- <f:param value="#{firstRowIndex}" />
- <f:param value="#{lastRowIndex}" />
- <f:param value="#{pageIndex}" />
- <f:param value="#{pageCount}" />
- </h:outputFormat>
- </t:dataScroller>
- </h:panelGrid>
-
- </h:panelGroup>
- <t:commandLink value="test" immediate="true" />
-
</h:form>
- <jsp:include page="inc/mbean_source.jsp"/>
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/dataTable.jsp Wed Feb 3 21:04:57 2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,42 +26,11 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<!--
-managed beans used:
- countryList
--->
-
-<f:view>
-<h:form>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
- <t:panelLayout id="page" layout="#{globalOptions.pageLayout}"
- styleClass="pageLayout"
- headerClass="pageHeader"
- navigationClass="pageNavigation"
- bodyClass="pageBody"
- footerClass="pageFooter" >
-
- <f:facet name="header">
- <f:subview id="header">
- <jsp:include page="inc/page_header.jsp" />
- </f:subview>
- </f:facet>
-
- <f:facet name="navigation">
- <f:subview id="menu" >
- <jsp:include page="inc/navigation.jsp" />
- </f:subview>
- </f:facet>
-
- <f:facet name="body">
- <h:panelGroup id="body">
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
+ <h:form>
+ <h:panelGroup id="body">
<h:panelGrid columns="1">
<h:commandLink action="go_country" immediate="true">
@@ -69,7 +40,7 @@
<h:outputText value="#{example_messages['country_edit_table']}" styleClass="standard" />
</h:commandLink>
</h:panelGrid>
- <f:verbatim><br></f:verbatim>
+ <f:verbatim><br/></f:verbatim>
<t:dataTable id="data"
styleClass="standardTable"
@@ -116,19 +87,11 @@
</t:dataTable>
- <f:verbatim><br></f:verbatim>
+ <f:verbatim><br/></f:verbatim>
</h:panelGroup>
- </f:facet>
-
- <%@include file="inc/page_footer.jsp" %>
-
- </t:panelLayout>
-
-</h:form>
-<jsp:include page="inc/mbean_source.jsp"/>
-</f:view>
-
+ </h:form>
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/date.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/date.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/date.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/date.jsp Wed Feb 3 21:04:57 2010
@@ -1,10 +1,11 @@
-<%@ page import="java.util.Random"%>
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,53 +26,49 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:panelGroup id="body">
<h:messages id="messageList" showSummary="true" showDetail="true" />
- <f:verbatim>
- <h:outputText escape="false" value="<h4> #{example_messages['date_comp_header']}</h4>"/>
- </f:verbatim>
+
+ <h4>
+ <h:outputText value="#{example_messages['date_comp_header']}"/>
+ </h4>
+
<h:form>
- <f:verbatim><p></f:verbatim>
- <h:outputText value="#{example_messages['date_comp_text1']}"/> <h:message for="date1"/>
+ <p>
+ <h:outputText value="#{example_messages['date_comp_text1']}"/>
+ <h:message for="date1"/>
<t:inputDate id="date1" value="#{date1}" popupCalendar="true"/>
- <f:verbatim><br></f:verbatim>
- <h:outputText value="#{example_messages['date_comp_text2']} #{date1}"/> <%-- TODO : print date part only --%>
- <f:verbatim></p></f:verbatim>
+ <br/>
+ <h:outputText value="#{example_messages['date_comp_text2']} #{date1}"/>
+ </p>
+ <p>
<h:outputText value="#{example_messages['date_comp_text3']}"/>
- <t:inputDate id="date2" value="#{date2}" type="time"/> <h:message for="date2"/>
- <f:verbatim><br></f:verbatim>
- <h:outputText value="#{example_messages['date_comp_text4']} #{date2}"/> <%-- TODO : print time part only --%>
- <f:verbatim></p></f:verbatim>
+ <t:inputDate id="date2" value="#{date2}" type="time"/>
+ <h:message for="date2"/>
+ <br/>
+ <h:outputText value="#{example_messages['date_comp_text4']} #{date2}"/>
+ </p>
+ <p>
<h:outputText value="#{example_messages['date_comp_text5']}"/>
- <t:inputDate id="date3" value="#{date3}" type="both"/> <h:message for="date3"/>
- <f:verbatim><br></f:verbatim>
+ <t:inputDate id="date3" value="#{date3}" type="both"/>
+ <h:message for="date3"/>
+ <br/>
<h:outputText value="#{example_messages['date_comp_text6']} #{date3}"/>
- <f:verbatim></p></f:verbatim>
+ </p>
<h:commandButton value="#{example_messages['date_comp_button']}"/>
</h:form>
</h:panelGroup>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/displayValueOnly.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/displayValueOnly.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/displayValueOnly.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/displayValueOnly.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
-<%@include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,14 +26,12 @@
* under the License.
*/
//-->
-
<body>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
-<f:view>
+ <h1>Usage of the displayValueOnly attribute</h1>
- <f:verbatim>
- <h1>Usage of the displayValueOnly attribute</h1>
- </f:verbatim>
<h:form id="form" >
<t:saveState id="ss1" value="#{dvoFace.attribute}"/>
@@ -43,7 +41,7 @@
value="#{dvoFace.attribute}"/>
<h:outputLabel id="displayValueOnlyCheckBoxL" for="displayValueOnlyCheckBox" value="displayValueOnly attribute"/>
- <f:verbatim><br/></f:verbatim>
+ <br/>
<h:panelGrid id="firstGrid" columns="2">
<h:outputLabel id="inputTextL" for="inputText" value="inputText"/>
@@ -59,13 +57,6 @@
<f:selectItem itemLabel="Value 3" itemValue="3"/>
</t:selectManyCheckbox>
- <%--h:outputLabel for="selectOneMenu" value="selectOneMenu"/>
- <t:selectOneMenu id="selectOneMenu" value="#{dvoFace.map['selectOneMenu']}" displayValueOnly="#{dvoFace.attribute}">
- <f:selectItem itemLabel="Value 1" itemValue="1"/>
- <f:selectItem itemLabel="Value 2" itemValue="2"/>
- <f:selectItem itemLabel="Value 3" itemValue="3"/>
- </t:selectOneMenu--%>
-
<h:outputLabel id="selectManyMenuL" for="selectManyMenu" value="selectManyMenu"/>
<t:selectManyMenu id="selectManyMenu" value="#{dvoFace.map['selectManyMenuList']}" displayValueOnly="#{dvoFace.attribute}">
<f:selectItem itemLabel="Value 1" itemValue="1"/>
@@ -73,26 +64,19 @@
<f:selectItem itemLabel="Value 3" itemValue="3"/>
</t:selectManyMenu>
- <%--h:outputLabel for="selectOneListbox" value="selectOneListbox"/>
- <t:selectOneListbox id="selectOneListbox" value="#{dvoFace.map['selectOneListbox']}" displayValueOnly="#{dvoFace.attribute}">
- <f:selectItem itemLabel="Value 1" itemValue="1"/>
- <f:selectItem itemLabel="Value 2" itemValue="2"/>
- <f:selectItem itemLabel="Value 3" itemValue="3"/>
- </t:selectOneListbox--%>
-
<h:outputLabel id="inputHtmlL" for="inputHtml" value="inputHtml"/>
<t:inputHtml id="inputHtml" value="#{dvoFace.map['inputHtml']}" displayValueOnly="#{dvoFace.attribute}"/>
</h:panelGrid>
- <f:verbatim><br/><br/>
+ <br/><br/>
<h2>The attribute can also be set for a whole section</h2>
- </f:verbatim>
+
<t:panelGrid id="secondGrid" columns="2" displayValueOnly="#{dvoFace.attribute}">
<h:outputLabel id="inputText2L" for="inputText2" value="inputText"/>
<t:inputText id="inputText2" value="#{dvoFace.map['inputText2']}"/>
-
+
<h:outputLabel id="inputSecret2L" for="inputSecret2" value="inputSecret"/>
<t:inputSecret id="inputSecret2" value="secret" />
@@ -101,13 +85,7 @@
</t:panelGrid>
<h:commandButton id="submitBtn" />
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/div.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/div.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/div.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/div.jsp Wed Feb 3 21:04:57 2010
@@ -1,10 +1,11 @@
-<%@ page import="java.util.Random"%>
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,15 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:panelGroup id="body">
<h:messages id="messageList" showSummary="true" showDetail="true" />
@@ -74,13 +69,7 @@
</h:form>
</h:panelGroup>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/features.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/features.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/features.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/features.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page import="java.math.BigDecimal,
- java.util.Date"%>
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,50 +26,72 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
+ <ui:composition template="/META-INF/templates/pageLayout.xhtml">
+ <ui:define name="body">
+ <h1>MyFaces Components and Features
+ </h1><h3>What is it, that makes MyFaces different?
+ </h3>
+
+ <br/><hr/><b>Tiles support in MyFaces</b>
+ <br/>You can easily use <a class='wiki' target="_blank" href='http://struts.apache.org'>struts/tiles</a> in JSF projects by using myfaces-tiles extension.
+
+ <br/><a title="no description" href='tiki-index.php?page=TilesSupport' class='wiki'>learn more...</a>
+ <br/><hr/><b>JSCook Menu component</b> '' - Javascript navigation menu"
+ <br/>This component renders a Javascript menu based on the excellent JSCookMenu by Heng Yuan
+ <br/><a title="no description" href='tiki-index.php?page=JSCookMenu' class='wiki'>learn more...</a>
+ <br/><hr/><b>Data Scroller component</b> <i> - scroll through UIData</i>
+ <br/>This component renders a scroller to run over the pages of an UIData (eg. <h:dataTable>).
+
+ <br/><a title="no description" href='tiki-index.php?page=DataScroller' class='wiki'>learn more...</a>
+ <br/><hr/><b>Navigation component</b> <i> - convenient navigation menu</i>
+ <br/>This component renders a hierarchical (vertical) navigation menu and remembers it's open/close/active state over different pages.
+ <br/><a title="no description" href='tiki-index.php?page=PanelNavigation' class='wiki'>learn more...</a>
+ <br/><hr/><b>Calendar component</b> <i>with localisation support</i>
+ <br/>A (not yet ;) sophisticated calendar component with localisation support.
+ <br/><a title="no description" href='tiki-index.php?page=InputCalendar' class='wiki'>learn more...</a>
+
+ <br/><hr/><b>File Upload component</b>
+ <br/>Convenient component for uploading files.
+ <br/><a title="no description" href='tiki-index.php?page=InputFileUpload' class='wiki'>learn more...</a>
+ <br/><hr/><b>UISaveState component</b> <i> - saving model state in the client response</i>
+ <br/>Traditional JSP/Servlet applications save their state information within HttpSession objects. This is an easy to use but not always satisfying approach. <a title="no description" href='tiki-index.php?page=UISaveState' class='wiki'>learn more...</a>
+ <br/><hr/><b>SortHeader component</b> <i>- clickable list column header with sort direction arrow</i>
+
+ <br/>Convenient support for writing lists, that can be (re)sorted by a click on a column header.
+ <br/><a title="no description" href='tiki-index.php?page=SortHeader' class='wiki'>learn more...</a>
+ <br/><hr/><b>Extended DataTable component</b> <i>- list sort support and preserve DataModel option</i>
+ <br/>Extends the standard <h:dataTable> by support for sorting (see SortHeader) and an option to save the DataModel state.
+ <br/>To avoid unwanted sideeffects when having a DataModel backed by a database result, state of such a DataModel sometimes must be saved.
+ <br/><a title="no description" href='tiki-index.php?page=ExtDataTable' class='wiki'>learn more...</a>
+ <br/><hr/><b>Layout component</b> <i>- dynamic page layout control</i>
+
+ <br/>Support for switchable page layout.
+ <br/>Try the example and change the layout under "Options" to see the magic!
+ <br/><hr/><b>TabbedPane component</b>
+ <br/>A swing like tabbed pane renderer.
+ <br/>(see web\example\tabbedPane.jsp)
+ <br/><hr/><b>DataList component</b>
+ <br/>A UIData based list that can be used do simple iteration over a group of components or to render a HTML <ul> or <ol> list.
+
+ <br/><hr/><b>RssTicker component</b>
+ <br/>Displays the value of rss-files.
+ <br/><a title="no description" href='tiki-index.php?page=RssTicker' class='wiki'>learn more...</a>
+ <br/><hr/><b>EmailValidator</b>
+ <br/>Component for validating syntax of emails.
+ <br/><a title="no description" href='tiki-index.php?page=EmailValidator' class='wiki'>learn more...</a>
+ <br/><hr/><b>CreditCardValidator</b>
+ <br/>Component for validating credit card numbers.
+ <br/><a title="no description" href='tiki-index.php?page=CreditCardValidator' class='wiki'>learn more...</a>
+ <br/><hr/><b>RegExprValidator</b>
+
+ <br/>Component for validating regular expressions.
+ <br/><a title="no description" href='tiki-index.php?page=RegExprValidator' class='wiki'>learn more...</a>
+ <br/><hr/><b>EqualValidator</b>
+ <br/>Component for validating value from component a against value from component b.
+ <br/><a title="no description" href='tiki-index.php?page=EqualValidator' class='wiki'>learn more...</a>
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
- <t:panelLayout id="page" layout="#{globalOptions.pageLayout}"
- styleClass="pageLayout"
- headerClass="pageHeader"
- navigationClass="pageNavigation"
- bodyClass="pageBody"
- footerClass="pageFooter" >
-
- <f:facet name="header">
- <f:subview id="header">
- <jsp:include page="inc/page_header.jsp" />
- </f:subview>
- </f:facet>
-
- <f:facet name="navigation">
- <f:subview id="menu" >
- <jsp:include page="inc/navigation.jsp" />
- </f:subview>
- </f:facet>
-
- <f:facet name="body">
- <h:panelGroup id="body">
-
-<f:verbatim><%@ include file="inc/features.html" %></f:verbatim>
-
- </h:panelGroup>
- </f:facet>
-
- <%@include file="inc/page_footer.jsp" %>
-
- </t:panelLayout>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/fileupload.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/fileupload.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/fileupload.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/fileupload.jsp Wed Feb 3 21:04:57 2010
@@ -1,12 +1,11 @@
-<%@ page import="java.util.Random"%>
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
-<%@include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,26 +26,19 @@
* under the License.
*/
//-->
-
<body>
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<t:saveState value="#{fileUploadForm.name}"/>
<h:panelGroup id="body">
<h:messages id="messageList" showSummary="true" />
- <f:verbatim>
-
<h4>
<h:outputText value="#{example_messages['fileupload_title']}"/>
</h4>
<table border="1"><tr><td>
- </f:verbatim>
<h:form id="form1" enctype="multipart/form-data" >
<h:outputText value=""/>
@@ -59,7 +51,7 @@
required="true"
maxlength="200000"/>
<h:message for="fileupload" showDetail="true" />
- <f:verbatim><br></f:verbatim>
+ <f:verbatim><br/></f:verbatim>
<h:outputText value="#{example_messages['fileupload_name']}"/>
<h:inputText value="#{fileUploadForm.name}"/>
<h:commandButton value="#{example_messages['fileupload_button']}" action="#{fileUploadForm.upload}" />
@@ -82,20 +74,12 @@
<h:outputText value="#{example_messages['fileupload_dlimg']}"/>
</h:outputLink>
</h:panelGrid>
- <f:verbatim></td></tr></table><p></f:verbatim>
- <f:verbatim></p><p></f:verbatim>
+ </td></tr></table>
- <f:verbatim></p></f:verbatim>
</h:panelGroup>
-
- <%@include file="inc/page_footer.jsp" %>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/filteredStylesheet.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/filteredStylesheet.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/filteredStylesheet.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/filteredStylesheet.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
-<%@include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,10 +26,9 @@
* under the License.
*/
//-->
-
<body>
-
-<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<t:stylesheet path="/css/table.css" filtered="true" />
<f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
@@ -44,7 +43,7 @@
<pre>
.tableBack
{
- background-image: url(#{environmentInfo.requestContextPath}/images/logo.jpg)
+ background-image: url(/images/logo.jpg)
}
</pre>
</p>
@@ -60,11 +59,9 @@
<h:outputText value="col3.2" />
<h:outputText value="col3.3" />
</h:panelGrid>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
+
+
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/forceId.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/forceId.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/forceId.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/forceId.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page import="java.math.BigDecimal,
- java.util.Date"%>
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,20 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<!--
-managed beans used:
- validateForm
--->
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form id="forceIdForm" >
<h:panelGrid columns="3">
@@ -83,42 +72,15 @@
<br/>
Table data <b>with</b> forceId/forceIdIndex
- <br/>
+ <br/>
<t:dataTable value="#{forceIdBean.choices}" var="choice">
<h:column>
<t:inputText id="widget" value="#{choice}" forceId="true" forceIdIndex="true"/>
- </h:column>
- </t:dataTable>
-
- <br/>
-<%-- doesn't work yet (see MYFACES-91)
+ </h:column>
+ </t:dataTable>
- <b>Radio buttons without forceId/forceIdIndex</b>
- <br/>
-
- <h:selectOneRadio id="something" value="#{forceIdBean.currentChoice}">
- <f:selectItem itemValue="0" itemLabel="foo"/>
- <f:selectItem itemValue="1" itemLabel="bar"/>
- <f:selectItem itemValue="2" itemLabel="buzz"/>
- </h:selectOneRadio>
-
- <b>Radio buttons with forceId/forceIdIndex</b>
- <br/>
-
- <t:selectOneRadio id="something" forceId="true" forceIdIndex="true" value="#{forceIdBean.currentChoice}">
- <f:selectItem itemValue="0" itemLabel="foo"/>
- <f:selectItem itemValue="1" itemLabel="bar"/>
- <f:selectItem itemValue="2" itemLabel="buzz"/>
- </t:selectOneRadio>
---%>
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/htmlTag.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/htmlTag.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/htmlTag.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/htmlTag.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
-<%@include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,11 +26,9 @@
* under the License.
*/
//-->
-
<body>
-
-<f:view>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<t:htmlTag value="h1"><b>h1</b> tag.</t:htmlTag>
<t:htmlTag value="h2"><b>h2</b> tag.</t:htmlTag>
<t:htmlTag value="p"><b>p</b> tag.</t:htmlTag>
@@ -42,13 +40,7 @@
<t:htmlTag value="p">
<t:htmlTag value="b" rendered="false">This should not be bold, because the <i>b</i> tag is not rendered</t:htmlTag>
</t:htmlTag>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml-multiple.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml-multiple.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml-multiple.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml-multiple.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
-<%@include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,40 +26,28 @@
* under the License.
*/
//-->
-
<body>
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:panelGroup id="body">
<h:form>
- <f:verbatim>
<h1>Html Editor - multiple instances</h1>
<b>Warning, this is for TEST, and doesn't work yet :-(</b><br/>
Powered by the <a href="http://kupu.oscom.org">Kupu library</a>
- </f:verbatim>
- <f:verbatim><h2>Editor #1</h2></f:verbatim>
+ <h2>Editor #1</h2>
<t:inputHtml value="#{editor1.text}" style="height: 40ex;"/>
- <f:verbatim><h2>Editor #2</h2></f:verbatim>
+ <h2>Editor #2</h2>
<t:inputHtml value="#{editor2.text}" style="height: 40ex;"/>
- <f:verbatim><br/><br/></f:verbatim>
+ <br/><br/>
<h:commandButton value="Submit"/>
</h:form>
</h:panelGroup>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputHtml.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
-<%@include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,20 +26,14 @@
* under the License.
*/
//-->
-
<body>
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:panelGroup id="body">
<h:form>
- <f:verbatim>
- <h1>Html Editor</h1>
- Powered by the <a href="http://kupu.oscom.org">Kupu library</a>
- </f:verbatim>
+ <h1>Html Editor</h1>
+ Powered by the <a href="http://kupu.oscom.org">Kupu library</a>
<t:inputHtml value="#{editor.text}"
style="height: 60ex;"
@@ -51,14 +45,14 @@
showDebugToolBox="#{editor.showDebugToolBox}"/>
<t:div>
- <h:outputText value="Note : You can drag & drop images in the editor."/>
+ <h:outputText value="Note : You can drag & drop images in the editor."/>
</t:div>
<h:commandButton value="Submit"/>
- <f:verbatim>
- <h2>Component Options</h2>
- </f:verbatim>
+
+ <h2>Component Options</h2>
+
<h:panelGrid columns="2">
<h:selectBooleanCheckbox value="#{editor.allowEditSource}" immediate="true"/>
<h:outputText value="Allow Edit Source"/>
@@ -82,13 +76,7 @@
</h:form>
</h:panelGroup>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextDisabled.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextDisabled.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextDisabled.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextDisabled.jsp Wed Feb 3 21:04:57 2010
@@ -1,13 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
-
-<html>
-
-<%@include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,60 +26,51 @@
* under the License.
*/
//-->
-
<body>
-
-<f:view>
- <h:form>
- <h:panelGrid>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
+ <h:form id="testForm">
+ <h:panelGrid>
<t:messages showDetail="true" showSummary="false"/>
- <h:outputText value="Example for disabled input value submit"/>
-
- <f:verbatim>
+ <h:outputText value="Example for disabled input value submit"/>
+
<script type="text/javascript"><!--
function changeDisabledInputValue() {
- var fName = document.getElementById("_idJsp0:firstName");
- var lName = document.getElementById("_idJsp0:lastName");
- var fullName = document.getElementById("_idJsp0:fullName");
+ var fName = document.getElementById("testForm:firstName");
+ var lName = document.getElementById("testForm:lastName");
+ var fullName = document.getElementById("testForm:fullName");
fullName.value = fName.value+" "+lName.value;
- fullName.onchange();
+ fullName.onchange();
}
- //--></script>
- </f:verbatim>
-
+ //--></script>
+
<h:outputText value="Person" style="font-weight:bold;"/>
<h:panelGrid columns="2">
<h:outputLabel for="firstName" value="First Name:"/>
<h:inputText id="firstName" value="#{inputTextDisabled.firstName}"/>
- <h:outputLabel for="lastName" value="Last Name:"/>
- <h:inputText id="lastName" value="#{inputTextDisabled.lastName}"/>
+ <h:outputLabel for="lastName" value="Last Name:"/>
+ <h:inputText id="lastName" value="#{inputTextDisabled.lastName}"/>
<h:outputLabel for="fullName" value="Full Name:"/>
<t:inputText id="fullName" value="#{inputTextDisabled.fullName}" disabledOnClientSide="true">
- <f:validateLength maximum="5" minimum="2"/>
- </t:inputText>
+ <f:validateLength maximum="20" minimum="2"/>
+ </t:inputText>
</h:panelGrid>
- <h:outputLink value="#" onclick="changeDisabledInputValue();"><f:verbatim>Change disabled input field's value</f:verbatim></h:outputLink>
- <h:commandButton value="Show current values of Person"/>
+ <h:outputLink value="#" onclick="changeDisabledInputValue();"><f:verbatim>Change disabled input field's value</f:verbatim></h:outputLink>
+ <h:commandButton value="Show current values of Person"/>
</h:panelGrid>
-
-
+
+
<h:panelGrid columns="2">
<h:outputText value="First name of Person:"/>
<h:outputText value="#{inputTextDisabled.firstName}"/>
<h:outputText value="Last name of Person:"/>
<h:outputText value="#{inputTextDisabled.lastName}"/>
<h:outputText value="Full name of Person:"/>
- <h:outputText value="#{inputTextDisabled.fullName}"/>
+ <h:outputText value="#{inputTextDisabled.fullName}"/>
</h:panelGrid>
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextHelp.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextHelp.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextHelp.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/inputTextHelp.jsp Wed Feb 3 21:04:57 2010
@@ -1,8 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,21 +26,11 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<f:view>
-
- <f:loadBundle
- basename="org.apache.myfaces.examples.resource.example_messages"
- var="example_messages" />
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form>
- <f:verbatim>
- <h1>Input Text Help</h1>
- </f:verbatim>
+ <h1>Input Text Help</h1>
<t:div/>
<h:outputText value="Delete helper text:"/>
<t:inputTextHelp value="" id="i1" helpText="Hello World"/>
@@ -45,13 +38,7 @@
<h:outputText value="Select helper text:"/>
<t:inputTextHelp value="" id="i2" selectText="true" helpText="TT.MM.JJJJ"/>
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jscookmenu.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jscookmenu.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jscookmenu.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jscookmenu.jsp Wed Feb 3 21:04:57 2010
@@ -1,8 +1,11 @@
-
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,23 +26,11 @@
* under the License.
*/
//-->
-
-<html>
-
-<%@include file="inc/head.inc"%>
-
<body>
-
-<f:view>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form>
- <f:loadBundle
- basename="org.apache.myfaces.examples.resource.example_messages"
- var="example_messages" />
<t:jscookMenu layout="hbr" theme="ThemeOffice" styleLocation="css/jscookmenu">
- <%/* Availaible jscookMenu themes: ThemeIE, ThemeMiniBlack, ThemeOffice, ThemePanel, ThemeGray
- Availaible jscookMenu layout: hbr, hbl, hur, hul, vbr, vbl, vur, vul
- respect to Heng Yuan http://www.cs.ucla.edu/~heng/JSCookMenu
- */%>
<t:navigationMenuItems id="nav_0" value="#{navigationMenu.JSCookMenuNavigationItems}" />
<t:navigationMenuItem id="nav_1" actionListener="#{navigationMenu.actionListener}"
@@ -103,19 +94,13 @@
itemLabel="Apache MyFaces Home" action="http://myfaces.apache.org" />
</t:jscookMenu>
- <h:outputText value="<p>Dynamic binding: </p>" escape="false"/>
+ <p><h:outputText value="Dynamic binding: " escape="false"/></p>
<t:jscookMenu id="menu2" layout="hbr" theme="ThemeOffice" styleLocation="css/jscookmenu">
<t:navigationMenuItems id="navitems" value="#{navigationMenu.panelNavigationItems}" />
</t:jscookMenu>
</h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp"%>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jslistener.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jslistener.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jslistener.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/jslistener.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page import="java.math.BigDecimal,
- java.util.Date"%>
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,15 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form>
<h:panelGrid columns="2">
@@ -66,13 +60,7 @@
</h:panelGrid>
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/masterDetail.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/masterDetail.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/masterDetail.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/masterDetail.jsp Wed Feb 3 21:04:57 2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,14 +26,9 @@
* under the License.
*/
//-->
-
-<%@ include file="inc/head.inc" %>
-
<body>
-
-<f:view>
-
-<f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form>
<h:panelGroup id="body">
@@ -43,17 +40,13 @@
<h:outputText value="#{example_messages['country_edit_table']}" styleClass="standard"/>
</h:commandLink>
</h:panelGrid>
-<f:verbatim>
- <br>
-</f:verbatim>
-<f:verbatim>
- A table rendering the details using an independent table within an cell of the master table.
+ <p>
+ A table rendering the details using an independent table within an cell of the master table.<br/>
As a resulting effect the each child table will have its own cell width.
- <br/>
-</f:verbatim>
+ </p>
-<t:dataTable id="data" styleClass="standardTable" headerClass="standardTable_Header" footerClass="standardTable_Header"
+ <t:dataTable id="data" styleClass="standardTable" headerClass="standardTable_Header" footerClass="standardTable_Header"
rowClasses="standardTable_Row1,standardTable_Row2"
columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column" var="currentCountry"
value="#{countryList.countries}" preserveDataModel="true" varDetailToggler="detailToggler">
@@ -102,19 +95,13 @@
</f:facet>
</t:dataTable>
-<f:verbatim>
- <br>
-</f:verbatim>
-
-
-<f:verbatim>
+ <p>
A table rendering the details using an "embedded" table. (embedded="true" at the child datatable).
In contrast to the above example this will result in a combined table sharing the same layout.
All cells in on collumn will have the same width.<br />
To achive this the child table will not renter a table start/end tag and, also the rendering of
any thead/tfoot/th will be supressed. You have to take care about that fact in your stylesheet(s).
- <br/>
-</f:verbatim>
+ </p>
<t:dataTable id="data2" styleClass="standardTable" detailStampExpandedDefault="true"
headerClass="standardTable_Header"
@@ -188,13 +175,7 @@
</h:panelGroup>
</h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@ include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/newspaperTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/newspaperTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/newspaperTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/newspaperTable.jsp Wed Feb 3 21:04:57 2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,24 +26,13 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<!--
-managed beans used:
- countryList
--->
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:panelGrid columns="1">
-
+
<h:outputText value="Implementation using obsolete t:newspaperTable" />
-
+
<t:newspaperTable id="dataOld"
newspaperColumns="2"
styleClass="standardTable"
@@ -60,18 +51,18 @@
</f:facet>
<h:outputText value="#{country.name}" />
</h:column>
-
+
<h:column>
<f:facet name="header">
<h:outputText value="#{example_messages['label_country_iso']}" />
</f:facet>
<h:outputText value="#{country.isoCode}" />
</h:column>
-
+
</t:newspaperTable>
-
+
<h:outputText value="Implementation using t:dataTable" />
-
+
<t:dataTable id="dataNew"
newspaperColumns="2"
styleClass="standardTable"
@@ -90,18 +81,18 @@
</f:facet>
<h:outputText value="#{country.name}" />
</h:column>
-
+
<h:column>
<f:facet name="header">
<h:outputText value="#{example_messages['label_country_iso']}" />
</f:facet>
<h:outputText value="#{country.isoCode}" />
</h:column>
-
+
</t:dataTable>
-
+
<h:outputText value="Implementation using t:dataTable horizontally" />
-
+
<t:dataTable id="dataNew2"
newspaperColumns="2"
newspaperOrientation="horizontal"
@@ -121,24 +112,18 @@
</f:facet>
<h:outputText value="#{country.name}" />
</h:column>
-
+
<h:column>
<f:facet name="header">
<h:outputText value="#{example_messages['label_country_iso']}" />
</f:facet>
<h:outputText value="#{country.isoCode}" />
</h:column>
-
+
</t:dataTable>
</h:panelGrid>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/openDataTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/openDataTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/openDataTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/openDataTable.jsp Wed Feb 3 21:04:57 2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,19 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<!--
-managed beans used:
- countryList
--->
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:messages />
<h:form>
<t:dataTable id="data"
@@ -108,13 +100,7 @@
</h:panelGrid>
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/optDataTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/optDataTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/optDataTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/optDataTable.jsp Wed Feb 3 21:04:57 2010
@@ -1,17 +1,11 @@
-<%@ page
- session="false"
- contentType="text/html;charset=utf-8"%>
-<%@ taglib
- uri="http://java.sun.com/jsf/html"
- prefix="h"%>
-<%@ taglib
- uri="http://java.sun.com/jsf/core"
- prefix="f"%>
-<%@ taglib
- uri="http://myfaces.apache.org/tomahawk"
- prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,17 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc"%>
-
<body>
-
-<f:view>
-
- <f:loadBundle
- basename="org.apache.myfaces.examples.resource.example_messages"
- var="example_messages" />
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form>
<h:panelGroup id="body">
@@ -50,16 +36,16 @@
<f:facet name="footer">
<h:commandButton value="Update Table" />
</f:facet>
-
+
<h:outputLabel for="renderHeader" value="Render Header"/>
<h:selectBooleanCheckbox id="renderHeader" value="#{countryForm.renderHeader}" />
-
+
<h:outputLabel for="renderFooter" value="Render Footer"/>
<h:selectBooleanCheckbox id="renderFooter" value="#{countryForm.renderFooter}" />
</h:panelGrid>
-
+
<f:verbatim>
- <br>
+ <br/>
</f:verbatim>
<t:dataTable
@@ -111,18 +97,12 @@
</t:dataTable>
<f:verbatim>
- <br>
+ <br/>
</f:verbatim>
</h:panelGroup>
</h:form>
-
-<jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp"%>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/options.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/options.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/options.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/options.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<html>
-
-<%@ include file="inc/head.inc" %>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,56 +26,22 @@
* under the License.
*/
//-->
-
<body>
-
-<!--
-managed beans used:
- optionsForm
- optionsCtrl
--->
-
-<f:view>
-
- <t:saveState id="ss1" value="#{optionsForm.language}"/>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
- <t:panelLayout id="page" layout="#{globalOptions.pageLayout}"
- styleClass="pageLayout"
- headerClass="pageHeader"
- navigationClass="pageNavigation"
- bodyClass="pageBody"
- footerClass="pageFooter">
-
- <f:facet name="header">
- <f:subview id="header">
- <jsp:include page="inc/page_header.jsp"/>
- </f:subview>
- </f:facet>
-
- <f:facet name="navigation">
- <f:subview id="menu">
- <jsp:include page="inc/navigation.jsp"/>
- </f:subview>
- </f:facet>
-
-
- <f:facet name="body">
- <h:panelGroup id="body">
+ <ui:composition template="/META-INF/templates/pageLayout.xhtml">
+ <ui:define name="body">
+ <t:saveState id="ss1" value="#{optionsForm.language}"/>
<h:messages id="messageList"/>
- <f:verbatim>
<h4>Options</h4>
<table border="1"><tr><td>
- </f:verbatim>
+
<h:form id="form1">
<h:outputText value="#{example_messages['option_lang']}"/>
<f:verbatim>: </f:verbatim>
<h:selectOneMenu id="locale" value="#{optionsForm.language}">
<f:selectItems id="available" value="#{optionsForm.availableLanguages}"/>
</h:selectOneMenu>
- <f:verbatim><br></f:verbatim>
+ <f:verbatim><br/></f:verbatim>
<h:outputText value="#{example_messages['option_layout']}"/>
<f:verbatim>: </f:verbatim>
<h:selectOneMenu id="layout" value="#{globalOptions.pageLayout}">
@@ -83,27 +49,14 @@
<f:selectItem id="item102" itemLabel="Navigation right" itemValue="navigationRight"/>
<f:selectItem id="item103" itemLabel="Upside down" itemValue="upsideDown"/>
</h:selectOneMenu>
- <f:verbatim><br></f:verbatim>
+ <br/>
<h:commandButton id="apply" value="#{example_messages['button_apply']}"
action="#{optionsCtrl.changeLocale}"/>
</h:form>
- <f:verbatim>
- </td></tr></table>
- </f:verbatim>
-
- </h:panelGroup>
- </f:facet>
-
- <%@ include file="inc/page_footer.jsp" %>
-
- </t:panelLayout>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-
-</f:view>
+ </td></tr></table>
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/pagedSortTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/pagedSortTable.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/pagedSortTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/pagedSortTable.jsp Wed Feb 3 21:04:57 2010
@@ -1,9 +1,11 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,19 +26,9 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
-
<body>
-
-<!--
-managed beans used:
- countryList
--->
-
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<h:form>
<t:dataTable id="data"
styleClass="scrollerTable"
@@ -111,13 +103,7 @@
</h:panelGrid>
</h:form>
-
- <jsp:include page="inc/mbean_source.jsp"/>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>
Modified: myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelGroup.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelGroup.jsp?rev=906241&r1=906240&r2=906241&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelGroup.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple20/src/main/webapp/panelGroup.jsp Wed Feb 3 21:04:57 2010
@@ -1,11 +1,11 @@
-<%@ page import="org.apache.myfaces.custom.tree.DefaultMutableTreeNode,
- org.apache.myfaces.custom.tree.model.DefaultTreeModel"%>
-<%@ page session="true" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
<!--
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,31 +26,23 @@
* under the License.
*/
//-->
-
-<%@include file="inc/head.inc" %>
<body>
-<f:view>
-
- <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
-
+ <ui:composition template="/META-INF/templates/template.xhtml">
+ <ui:define name="body">
<t:panelGroup id="span">
<t:htmlTag value="p">
- <f:verbatim>A panel group (<t:panelGroup>) is rendered as an HTML <span> by default...</f:verbatim>
+ <f:verbatim>A panel group (&lt;t:panelGroup&gt;) is rendered as an HTML &lt;span&gt; by default...</f:verbatim>
</t:htmlTag>
</t:panelGroup>
-
+
<t:htmlTag value="br"/>
-
+
<t:panelGroup id="div" layout="block">
<t:htmlTag value="p">
- <f:verbatim>...or as a <div> with a value of 'block' for the layout attribute</f:verbatim>
+ <f:verbatim>...or as a &lt;div&gt; with a value of 'block' for the layout attribute</f:verbatim>
</t:htmlTag>
</t:panelGroup>
-
-</f:view>
-
-<%@include file="inc/page_footer.jsp" %>
-
+ </ui:define>
+ </ui:composition>
</body>
-
</html>