You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/11/21 16:50:58 UTC
svn commit: r719606 [2/2] - in /myfaces/tobago/trunk/example/demo: ./
src/main/java/org/apache/myfaces/tobago/example/demo/
src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/
src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/WEB...
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* 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.
@@ -13,62 +15,64 @@
* 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.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
- <jsp:body>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="1*;4*" />
- </f:facet>
-
- <tc:out escape="false" value="#{overviewBundle.tab_text}" />
-
- <tc:box label="#{overviewBundle.tab_sampleTitle}" >
- <f:facet name="layout"> <tc:gridLayout /> </f:facet>
-
- <tc:tabGroup id="tabs" state="#{demo.tabState0}" >
-
- <tc:tab label="#{overviewBundle.tabSwitchTypeClient}" >
- <f:facet name="layout"><tc:gridLayout /></f:facet>
- <tc:tabGroup id="tabMarsOuterForm" state="#{demo.tabState1}" >
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.tab}"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="1*;4*"/>
+ </f:facet>
+
+ <tc:out escape="false" value="#{overviewBundle.tab_text}"/>
+
+ <tc:box label="#{overviewBundle.tab_sampleTitle}">
+ <f:facet name="layout"> <tc:gridLayout/> </f:facet>
+
+ <tc:tabGroup id="tabs" state="#{demo.tabState0}">
+
+ <tc:tab label="#{overviewBundle.tabSwitchTypeClient}">
+ <f:facet name="layout"><tc:gridLayout/></f:facet>
+ <tc:tabGroup id="tabMarsOuterForm" state="#{demo.tabState1}">
<tc:tab label="#{overviewBundle.tabPlanet}">
- <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*" /></f:facet>
- <tc:cell />
+ <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+ <tc:cell/>
<tx:in value="#{demo.solar.planets[0].diameter}"
- label="#{overviewBundle.solarPlanetDiameter}" />
+ label="#{overviewBundle.solarPlanetDiameter}"/>
<tx:in value="#{demo.solar.planets[0].mass}"
- label="#{overviewBundle.solarPlanetMass}" />
- <tc:cell />
+ label="#{overviewBundle.solarPlanetMass}"/>
+ <tc:cell/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabInsolar}">
- <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*" /></f:facet>
- <tc:cell />
+ <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+ <tc:cell/>
<tx:in value="#{demo.solar.planets[0].sunDistance}"
- label="#{overviewBundle.solarPlanetSunDistance}" />
+ label="#{overviewBundle.solarPlanetSunDistance}"/>
<tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
- label="#{overviewBundle.solarPlanetTimeOfCirculation}" />
- <tc:cell />
+ label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
+ <tc:cell/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabMoons}">
- <f:facet name="layout"><tc:gridLayout /></f:facet>
+ <f:facet name="layout"><tc:gridLayout/></f:facet>
<tc:sheet value="#{demo.solar.planets[0].moons}"
- columns="2*;1*;2*;2*" var="moon">
+ columns="2*;1*;2*;2*" var="moon">
<tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
- <tc:out value="#{moon.name}" id="t_name" />
+ <tc:out value="#{moon.name}" id="t_name"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center" >
+ <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
<tc:out value="#{moon.number}" id="t_number"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right" >
- <tc:out value="#{moon.distance}" id="t_distance" />
+ <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
+ <tc:out value="#{moon.distance}" id="t_distance"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right" >
- <tc:out value="#{moon.period}" id="t_period" />
+ <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
+ <tc:out value="#{moon.period}" id="t_period"/>
</tc:column>
</tc:sheet>
</tc:tab>
@@ -76,46 +80,46 @@
</tc:tab>
- <tc:tab label="#{overviewBundle.tabSwitchTypeReloadTag}" >
- <f:facet name="layout"><tc:gridLayout /></f:facet>
- <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" state="#{demo.tabState2}" >
+ <tc:tab label="#{overviewBundle.tabSwitchTypeReloadTag}">
+ <f:facet name="layout"><tc:gridLayout/></f:facet>
+ <tc:tabGroup id="tabMarsOuterForm2" switchType="reloadTab" state="#{demo.tabState2}">
<tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
- binding="#{demo.tabChangeListener}" />
+ binding="#{demo.tabChangeListener}"/>
<tc:tab label="#{overviewBundle.tabPlanet}">
- <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*" /></f:facet>
- <tc:cell />
+ <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+ <tc:cell/>
<tx:in value="#{demo.solar.planets[0].diameter}"
- label="#{overviewBundle.solarPlanetDiameter}" />
+ label="#{overviewBundle.solarPlanetDiameter}"/>
<tx:in value="#{demo.solar.planets[0].mass}"
- label="#{overviewBundle.solarPlanetMass}" />
- <tc:cell />
+ label="#{overviewBundle.solarPlanetMass}"/>
+ <tc:cell/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabInsolar}">
- <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*" /></f:facet>
- <tc:cell />
+ <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+ <tc:cell/>
<tx:in value="#{demo.solar.planets[0].sunDistance}"
- label="#{overviewBundle.solarPlanetSunDistance}" />
+ label="#{overviewBundle.solarPlanetSunDistance}"/>
<tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
- label="#{overviewBundle.solarPlanetTimeOfCirculation}" />
- <tc:cell />
+ label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
+ <tc:cell/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabMoons}">
- <f:facet name="layout"><tc:gridLayout /></f:facet>
+ <f:facet name="layout"><tc:gridLayout/></f:facet>
<tc:sheet value="#{demo.solar.planets[0].moons}"
- columns="2*;1*;2*;2*" var="moon">
+ columns="2*;1*;2*;2*" var="moon">
<tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
- <tc:out value="#{moon.name}" id="t_name" />
+ <tc:out value="#{moon.name}" id="t_name"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center" >
+ <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
<tc:out value="#{moon.number}" id="t_number"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right" >
- <tc:out value="#{moon.distance}" id="t_distance" />
+ <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
+ <tc:out value="#{moon.distance}" id="t_distance"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right" >
- <tc:out value="#{moon.period}" id="t_period" />
+ <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
+ <tc:out value="#{moon.period}" id="t_period"/>
</tc:column>
</tc:sheet>
</tc:tab>
@@ -123,46 +127,46 @@
</tc:tab>
- <tc:tab label="#{overviewBundle.tabSwitchTypeReloadPage}" >
- <f:facet name="layout"><tc:gridLayout /></f:facet>
- <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" state="#{demo.tabState3}" >
+ <tc:tab label="#{overviewBundle.tabSwitchTypeReloadPage}">
+ <f:facet name="layout"><tc:gridLayout/></f:facet>
+ <tc:tabGroup id="tabMarsOuterForm3" switchType="reloadPage" state="#{demo.tabState3}">
<tc:tabChangeListener type="org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeListener"
- binding="#{demo.tabChangeListener}" />
+ binding="#{demo.tabChangeListener}"/>
<tc:tab label="#{overviewBundle.tabPlanet}">
- <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*" /></f:facet>
- <tc:cell />
+ <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+ <tc:cell/>
<tx:in value="#{demo.solar.planets[0].diameter}"
- label="#{overviewBundle.solarPlanetDiameter}" />
+ label="#{overviewBundle.solarPlanetDiameter}"/>
<tx:in value="#{demo.solar.planets[0].mass}"
- label="#{overviewBundle.solarPlanetMass}" />
- <tc:cell />
+ label="#{overviewBundle.solarPlanetMass}"/>
+ <tc:cell/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabInsolar}">
- <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*" /></f:facet>
- <tc:cell />
+ <f:facet name="layout"><tc:gridLayout rows="1*;fixed;fixed;1*"/></f:facet>
+ <tc:cell/>
<tx:in value="#{demo.solar.planets[0].sunDistance}"
- label="#{overviewBundle.solarPlanetSunDistance}" />
+ label="#{overviewBundle.solarPlanetSunDistance}"/>
<tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
- label="#{overviewBundle.solarPlanetTimeOfCirculation}" />
- <tc:cell />
+ label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
+ <tc:cell/>
</tc:tab>
<tc:tab label="#{overviewBundle.tabMoons}">
- <f:facet name="layout"><tc:gridLayout /></f:facet>
+ <f:facet name="layout"><tc:gridLayout/></f:facet>
<tc:sheet value="#{demo.solar.planets[0].moons}"
- columns="2*;1*;2*;2*" var="moon">
+ columns="2*;1*;2*;2*" var="moon">
<tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
- <tc:out value="#{moon.name}" id="t_name" />
+ <tc:out value="#{moon.name}" id="t_name"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center" >
+ <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false" align="center">
<tc:out value="#{moon.number}" id="t_number"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right" >
- <tc:out value="#{moon.distance}" id="t_distance" />
+ <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right">
+ <tc:out value="#{moon.distance}" id="t_distance"/>
</tc:column>
- <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right" >
- <tc:out value="#{moon.period}" id="t_period" />
+ <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right">
+ <tc:out value="#{moon.period}" id="t_period"/>
</tc:column>
</tc:sheet>
</tc:tab>
@@ -173,6 +177,5 @@
</tc:tabGroup>
</tc:box>
- </tc:panel>
- </jsp:body>
-</layout:overview>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* 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.
@@ -13,58 +15,59 @@
* 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.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
- <jsp:body>
- <tc:panel>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.theme}"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="120px;1* "/>
+ </f:facet>
+
+ <tc:out escape="false" value="#{overviewBundle.theme_text}"/>
+
+ <tc:box label="#{overviewBundle.theme_title}">
<f:facet name="layout">
- <tc:gridLayout rows="120px;1* " />
+ <tc:gridLayout rows="fixed;1*"/>
</f:facet>
- <tc:out escape="false" value="#{overviewBundle.theme_text}" />
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;100px"/>
+ </f:facet>
+
+ <tx:selectOneChoice value="#{clientConfigController2.theme}"
+ label="#{overviewBundle.theme_label}">
+ <f:selectItems value="#{clientConfigController2.themeItems}"/>
+ </tx:selectOneChoice>
+ <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.theme_submit}"/>
+ </tc:panel>
- <tc:box label="#{overviewBundle.theme_title}" >
+ <tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;1*" />
+ <tc:gridLayout columns="*;480px;*" rows="*;320px;*"/>
</f:facet>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;100px" />
- </f:facet>
-
- <tx:selectOneChoice value="#{clientConfigController2.theme}"
- label="#{overviewBundle.theme_label}">
- <f:selectItems value="#{clientConfigController2.themeItems}" />
- </tx:selectOneChoice>
- <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.theme_submit}" />
- </tc:panel>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;480px;*" rows="*;320px;*" />
- </f:facet>
-
- <tc:cell spanX="3"/>
-
- <tc:cell/>
- <tc:image value="image/theme-photo.jpg"/>
- <tc:cell/>
-
- <tc:cell/>
- <tc:out escape="false" value="#{overviewBundle.theme_photo}" />
- <tc:cell/>
-
- <tc:cell spanX="3"/>
-
- </tc:panel>
-
- </tc:box>
- </tc:panel>
- </jsp:body>
-</layout:overview>
+ <tc:cell spanX="3"/>
+
+ <tc:cell/>
+ <tc:image value="image/theme-photo.jpg"/>
+ <tc:cell/>
+
+ <tc:cell/>
+ <tc:out escape="false" value="#{overviewBundle.theme_photo}"/>
+ <tc:cell/>
+
+ <tc:cell spanX="3"/>
+
+ </tc:panel>
+
+ </tc:box>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* 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.
@@ -13,202 +15,206 @@
* 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.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
- <jsp:body>
- <tc:panel id="pageToolbar" >
- <f:facet name="layout">
- <tc:gridLayout rows="65px;fixed;1px;70px;fixed;50px" id="pageToolbarLayout"/>
- </f:facet>
+-->
- <tc:out escape="false" value="#{overviewBundle.toolbar_text1}" />
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.toolbar}"/>
+ <tc:panel id="pageToolbar">
+ <f:facet name="layout">
+ <tc:gridLayout rows="65px;fixed;1px;70px;fixed;50px" id="pageToolbarLayout"/>
+ </f:facet>
- <tc:box label="#{overviewBundle.toolbar_sampleTitle}" id="boxToolbar" >
+ <tc:out escape="false" value="#{overviewBundle.toolbar_text1}"/>
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed" columns="2*;1*;1*" id="boxToolbarLayout"/>
- </f:facet>
+ <tc:box label="#{overviewBundle.toolbar_sampleTitle}" id="boxToolbar">
- <f:facet name="toolBar">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed" columns="2*;1*;1*" id="boxToolbarLayout"/>
+ </f:facet>
+
+ <f:facet name="toolBar">
<tc:toolBar>
<tc:toolBarCommand id="button" action="overview/toolbar"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_buttonAction}" />
+ actionListener="#{overviewController.click}"
+ label="#{overviewBundle.toolbar_buttonAction}"/>
- <tc:toolBarCommand id="imageButton" action="#{overviewController.ping}"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_imageButtonAction}"
- image="image/toolbar_example_button.gif" />
-
- <tc:toolBarCommand id="popupButton"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_popupButtonAction}">
-
- <f:facet name="popup">
- <tc:popup width="200" height="100" id="popup" modal="true">
-
- <f:facet name="layout">
- <tc:gridLayout rows="35px;1*;fixed" />
- </f:facet>
-
- <tc:out value="#{overviewBundle.toolbar_popupText}"/>
-
- <tc:cell/>
- <tc:button id="popupCloseButton" label="#{overviewBundle.toolbar_closePopupAction}" >
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
-
- </tc:popup>
- </f:facet>
- </tc:toolBarCommand>
-
- <tc:toolBarCommand id="DropDown"
- label="#{overviewBundle.toolbar_dropDownAction}" >
- <f:facet name="menupopup">
- <tc:menu>
- <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
- <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
- <tc:menuItem action="#{overviewController.ping}" id="dropdown3" actionListener="#{overviewController.click}" label="Action 3"/>
- </tc:menu>
- </f:facet>
- </tc:toolBarCommand>
+ <tc:toolBarCommand id="imageButton" action="#{overviewController.ping}"
+ actionListener="#{overviewController.click}"
+ label="#{overviewBundle.toolbar_imageButtonAction}"
+ image="image/toolbar_example_button.gif"/>
+
+ <tc:toolBarCommand id="popupButton"
+ actionListener="#{overviewController.click}"
+ label="#{overviewBundle.toolbar_popupButtonAction}">
+
+ <f:facet name="popup">
+ <tc:popup width="200" height="100" id="popup" modal="true">
+
+ <f:facet name="layout">
+ <tc:gridLayout rows="35px;1*;fixed"/>
+ </f:facet>
+
+ <tc:out value="#{overviewBundle.toolbar_popupText}"/>
+
+ <tc:cell/>
+ <tc:button id="popupCloseButton" label="#{overviewBundle.toolbar_closePopupAction}">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+
+ </tc:popup>
+ </f:facet>
+ </tc:toolBarCommand>
+
+ <tc:toolBarCommand id="DropDown"
+ label="#{overviewBundle.toolbar_dropDownAction}">
+ <f:facet name="menupopup">
+ <tc:menu>
+ <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
+ <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
+ <tc:menuItem action="#{overviewController.ping}" id="dropdown3"
+ actionListener="#{overviewController.click}" label="Action 3"/>
+ </tc:menu>
+ </f:facet>
+ </tc:toolBarCommand>
</tc:toolBar>
- </f:facet>
+ </f:facet>
- <tc:cell spanX="3">
+ <tc:cell spanX="3">
<tc:toolBar iconSize="#{overviewController.toolbarIconSize}"
labelPosition="#{overviewController.toolbarTextPosition}"
- orientation="left" >
+ orientation="left">
<tc:toolBarCommand id="button2" action="overview/toolbar"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_buttonAction}" />
-
- <tc:toolBarCommand id="imageButton2" action="overview/toolbar"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_imageButtonAction}"
- image="image/toolbar_example_button.gif" />
-
+ actionListener="#{overviewController.click}"
+ label="#{overviewBundle.toolbar_buttonAction}"/>
-
- <tc:toolBarCommand id="popupButton2"
- actionListener="#{overviewController.click}"
- label="#{overviewBundle.toolbar_popupButtonAction}">
- <tc:popupReference for=":page:popup" />
- <%--f:facet name="popup">
- <tc:popup width="200" height="100" id="popup2" >
-
- <f:facet name="layout">
- <tc:gridLayout rows="35px;1*;fixed" />
- </f:facet>
-
- <tc:out value="#{overviewBundle.toolbar_popupText}"/>
-
- <tc:cell/>
- <tc:button id="popupCloseButton2" label="#{overviewBundle.toolbar_closePopupAction}" >
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
-
- </tc:popup>
- </f:facet--%>
- </tc:toolBarCommand>
-
- <tc:toolBarCommand id="DropDown2" action="overview/toolbar"
- actionListener="#{overviewController.click}" label="#{overviewBundle.toolbar_dropDownAction}" >
- <f:facet name="menupopup">
- <tc:menu>
- <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
- <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
- <tc:menuItem id="dropdown3_2" actionListener="#{overviewController.click}" label="Action 3"/>
- </tc:menu>
- </f:facet>
- </tc:toolBarCommand>
+ <tc:toolBarCommand id="imageButton2" action="overview/toolbar"
+ actionListener="#{overviewController.click}"
+ label="#{overviewBundle.toolbar_imageButtonAction}"
+ image="image/toolbar_example_button.gif"/>
+
+
+ <tc:toolBarCommand id="popupButton2"
+ actionListener="#{overviewController.click}"
+ label="#{overviewBundle.toolbar_popupButtonAction}">
+ <tc:popupReference for=":page:popup"/>
+ <!--f:facet name="popup">
+ <tc:popup width="200" height="100" id="popup2" >
+
+ <f:facet name="layout">
+ <tc:gridLayout rows="35px;1*;fixed" />
+ </f:facet>
+
+ <tc:out value="#{overviewBundle.toolbar_popupText}"/>
+
+ <tc:cell/>
+ <tc:button id="popupCloseButton2" label="#{overviewBundle.toolbar_closePopupAction}" >
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+
+ </tc:popup>
+ </f:facet-->
+ </tc:toolBarCommand>
+
+ <tc:toolBarCommand id="DropDown2" action="overview/toolbar"
+ actionListener="#{overviewController.click}"
+ label="#{overviewBundle.toolbar_dropDownAction}">
+ <f:facet name="menupopup">
+ <tc:menu>
+ <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
+ <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
+ <tc:menuItem id="dropdown3_2" actionListener="#{overviewController.click}" label="Action 3"/>
+ </tc:menu>
+ </f:facet>
+ </tc:toolBarCommand>
</tc:toolBar>
- </tc:cell>
-
- <tx:in value="#{overviewController.lastAction}" readonly="true"
- label="#{overviewBundle.basic_lastActionLabel}" />
+ </tc:cell>
- <tc:selectOneChoice value="#{overviewController.toolbarTextPosition}" >
- <f:selectItems value="#{overviewController.toolbarTextItems}"/>
- </tc:selectOneChoice>
- <tc:selectOneChoice value="#{overviewController.toolbarIconSize}" >
- <f:selectItems value="#{overviewController.toolbarIconItems}"/>
- </tc:selectOneChoice>
-
- <tc:cell/>
- <tc:cell spanX="2">
- <tc:button label="updateView" />
- </tc:cell>
+ <tx:in value="#{overviewController.lastAction}" readonly="true"
+ label="#{overviewBundle.basic_lastActionLabel}"/>
- </tc:box>
+ <tc:selectOneChoice value="#{overviewController.toolbarTextPosition}">
+ <f:selectItems value="#{overviewController.toolbarTextItems}"/>
+ </tc:selectOneChoice>
+ <tc:selectOneChoice value="#{overviewController.toolbarIconSize}">
+ <f:selectItems value="#{overviewController.toolbarIconItems}"/>
+ </tc:selectOneChoice>
<tc:cell/>
+ <tc:cell spanX="2">
+ <tc:button label="updateView"/>
+ </tc:cell>
- <tc:out escape="false" value="#{overviewBundle.toolbar_text2}" />
+ </tc:box>
- <tc:box label="#{overviewBundle.toolbar_sampleTitle2}" id="boxMenu">
- <tc:menuBar >
+ <tc:cell/>
- <tc:menu label="Menu 1" >
+ <tc:out escape="false" value="#{overviewBundle.toolbar_text2}"/>
- <tc:menuItem onclick="alert('action 1')" label="alert 1" />
+ <tc:box label="#{overviewBundle.toolbar_sampleTitle2}" id="boxMenu">
+ <tc:menuBar>
- <tc:menuItem action="/" type="navigate" label="#{overviewBundle.toolbar_linkClickme}"
- image="image/config.gif" >
- <f:facet name="confirmation"><tc:out value="Do you really want leave this demo?" /></f:facet>
- </tc:menuItem>
+ <tc:menu label="Menu 1">
- <tc:menuItem link="http://www.atanion.com" disabled="true" label="disabled" />
+ <tc:menuItem onclick="alert('action 1')" label="alert 1"/>
- <tx:menuCheckbox action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.boolTest}" />
- </tc:menu>
- <tc:menu label="Menu 2">
+ <tc:menuItem action="/" type="navigate" label="#{overviewBundle.toolbar_linkClickme}"
+ image="image/config.gif">
+ <f:facet name="confirmation"><tc:out value="Do you really want leave this demo?"/></f:facet>
+ </tc:menuItem>
+
+ <tc:menuItem link="http://www.atanion.com" disabled="true" label="disabled"/>
- <tc:menuItem onclick="alert('action 1')" label="alert 1" />
+ <tx:menuCheckbox action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}"
+ value="#{demo.boolTest}"/>
+ </tc:menu>
+ <tc:menu label="Menu 2">
- <tc:menu label="Menu 3">
+ <tc:menuItem onclick="alert('action 1')" label="alert 1"/>
- <tc:menuItem onclick="alert('action 1')" label="alert 1" image="image/date.gif" />
+ <tc:menu label="Menu 3">
- <tc:menuItem link="/" label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif" >
- <f:facet name="confirmation"><tc:out value="Do you really want leave this demo?" /></f:facet>
- </tc:menuItem>
+ <tc:menuItem onclick="alert('action 1')" label="alert 1" image="image/date.gif"/>
- <tc:menuItem link="http://www.atanion.com" disabled="true" label="#{overviewBundle.toolbar_linkClickme}" image="image/remove.gif" />
+ <tc:menuItem link="/" label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif">
+ <f:facet name="confirmation"><tc:out value="Do you really want leave this demo?"/></f:facet>
+ </tc:menuItem>
+
+ <tc:menuItem link="http://www.atanion.com" disabled="true" label="#{overviewBundle.toolbar_linkClickme}"
+ image="image/remove.gif"/>
<tc:menu label="#{overviewBundle.toolbar_selectSingleselect}">
- <tx:menuRadio value="#{overviewController.radioValue}" converter="salutationId" >
- <f:selectItems value="#{overviewController.items}" />
+ <tx:menuRadio value="#{overviewController.radioValue}" converter="salutationId">
+ <f:selectItems value="#{overviewController.items}"/>
</tx:menuRadio>
</tc:menu>
- <tc:menuItem action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}" />
- </tc:menu>
-
- <tc:menuSeparator/>
-
- <tc:menuItem label="#{overviewBundle.toolbar_linkClickme}" >
- <f:facet name="items">
- <tc:selectBooleanCheckbox value="#{demo.bool[0]}" />
- </f:facet>
- </tc:menuItem>
- <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[1]}" />
- <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[2]}" />
-
+ <tc:menuItem action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}"/>
</tc:menu>
- </tc:menuBar>
- </tc:box>
- <tc:cell/>
- </tc:panel>
- </jsp:body>
-</layout:overview>
+ <tc:menuSeparator/>
+
+ <tc:menuItem label="#{overviewBundle.toolbar_linkClickme}">
+ <f:facet name="items">
+ <tc:selectBooleanCheckbox value="#{demo.bool[0]}"/>
+ </f:facet>
+ </tc:menuItem>
+ <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[1]}"/>
+ <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[2]}"/>
+
+ </tc:menu>
+
+ </tc:menuBar>
+ </tc:box>
+ <tc:cell/>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* 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.
@@ -13,93 +15,90 @@
* 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.
---%>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.tree}"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="9*;16*"/>
+ </f:facet>
+
+ <tc:out escape="false" value="(UNDER CONSTRUCTION) #{overviewBundle.tree_text}"/>
+
+ <tc:box label="#{overviewBundle.tree_sampleTitle}">
+ <tc:tabGroup state="#{overviewController.treeTabsState}" switchType="reloadPage">
+ <tc:tab label="#{overviewBundle.treeLabel}">
+ <f:facet name="layout">
+ <tc:gridLayout columns="2*;1*"/>
+ </f:facet>
+
+ <tc:tree id="tree"
+ showIcons="#{demo.showIcons}"
+ showJunctions="#{demo.showJunctions}"
+ showRootJunction="#{demo.showRootJunction}"
+ showRoot="#{demo.showRoot}">
+ <tc:treeData value="#{demo.tree}" var="node" id="data">
+ <tc:treeNode label="#{node.userObject.name}"
+ id="template"
+ expanded="true"
+ value="#{node}"
+ image="image/feather.png"/>
+ <!--
+ todo: tree editor
+ todo: events instead of state
+ todo: test action listener
+
+ actionListener="org.apache.myfaces.tobago.example.demo.actionlistener.TreeEditor"
+ markup="#{node.userObject.markup}"
+ tip="#{node.userObject.tip}"
+ action="#{node.userObject.action}"
+ disabled="#{node.userObject.disabled}"
+ -->
+ </tc:treeData>
+ </tc:tree>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;fixed;1*;fixed;fixed;fixed"/>
+ </f:facet>
+
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowIcons}"
+ value="#{demo.showIcons}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowJunctions}"
+ value="#{demo.showJunctions}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRootJunction}"
+ value="#{demo.showRootJunction}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}"
+ value="#{demo.showRoot}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:cell/>
+ <tc:selectOneChoice value="#{overviewController.treeSelectMode}">
+ <f:selectItems value="#{overviewController.treeSelectModeItems}"/>
+ </tc:selectOneChoice>
+
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeMutable}"
+ value="#{demo.mutable}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
+ </tc:panel>
+
+ </tc:tab>
+ <tc:tab label="#{overviewBundle.treeListboxLabel} (todo)">
+
+ </tc:tab>
+ </tc:tabGroup>
+
+ </tc:box>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
-<jsp:body>
-<tc:panel>
-<f:facet name="layout">
- <tc:gridLayout rows="9*;16*"/>
-</f:facet>
-
-<tc:out escape="false" value="(UNDER CONSTRUCTION) #{overviewBundle.tree_text}"/>
-
-<%-- column --%>
-
-<tc:box label="#{overviewBundle.tree_sampleTitle}">
- <tc:tabGroup state="#{overviewController.treeTabsState}" switchType="reloadPage">
- <tc:tab label="#{overviewBundle.treeLabel}">
- <f:facet name="layout">
- <tc:gridLayout columns="2*;1*"/>
- </f:facet>
-
- <tc:tree id="tree"
- showIcons="#{demo.showIcons}"
- showJunctions="#{demo.showJunctions}"
- showRootJunction="#{demo.showRootJunction}"
- showRoot="#{demo.showRoot}">
- <tc:treeData value="#{demo.tree}" var="node" id="data">
- <tc:treeNode label="#{node.userObject.name}"
- id="template"
- expanded="true"
- value="#{node}"
- image="image/feather.png"/>
-
-
- <%--
- todo: tree editor
- todo: events instead of state
- todo: test action listener
-
- actionListener="org.apache.myfaces.tobago.example.demo.actionlistener.TreeEditor"
- markup="#{node.userObject.markup}"
- tip="#{node.userObject.tip}"
- action="#{node.userObject.action}"
- disabled="#{node.userObject.disabled}"
- --%>
- </tc:treeData>
- </tc:tree>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed;1*;fixed;fixed;fixed"/>
- </f:facet>
-
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowIcons}"
- value="#{demo.showIcons}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowJunctions}"
- value="#{demo.showJunctions}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRootJunction}"
- value="#{demo.showRootJunction}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}"
- value="#{demo.showRoot}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:cell/>
- <tc:selectOneChoice value="#{overviewController.treeSelectMode}">
- <f:selectItems value="#{overviewController.treeSelectModeItems}"/>
- </tc:selectOneChoice>
-
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeMutable}"
- value="#{demo.mutable}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
- </tc:panel>
-
- </tc:tab>
- <tc:tab label="#{overviewBundle.treeListboxLabel} (todo)">
-
- </tc:tab>
- </tc:tabGroup>
-
-</tc:box>
-
-</tc:panel>
-</jsp:body>
-</layout:overview>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* 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.
@@ -13,57 +15,58 @@
* 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.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
- <jsp:body>
- <tc:panel>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.validation}"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="80px;200px;1*;"/>
+ </f:facet>
+
+ <tc:out escape="false" value="#{overviewBundle.validation_text}"/>
+
+ <tc:box label="#{overviewBundle.validation_sampleTitle}">
<f:facet name="layout">
- <tc:gridLayout rows="80px;200px;1*;" />
+ <tc:gridLayout rows="fixed;1*;fixed;fixed"/>
</f:facet>
- <tc:out escape="false" value="#{overviewBundle.validation_text}" />
-
- <tc:box label="#{overviewBundle.validation_sampleTitle}" >
+ <tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;1*;fixed;fixed" />
+ <tc:gridLayout columns="1*;1*"/>
</f:facet>
+ <tx:in label="#{overviewBundle.validation_number}" markup="number" required="true">
+ <f:validateLength minimum="7" maximum="7"/>
+ <f:validateLongRange/>
+ </tx:in>
+ <tx:in label="#{overviewBundle.validation_price}" markup="number">
+ <f:validateDoubleRange minimum="0.01" maximum="1000"/>
+ </tx:in>
+ <tx:in label="#{overviewBundle.validation_custom}" validator="#{overviewController.customValidator}">
+ </tx:in>
+ </tc:panel>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1*;1*" />
- </f:facet>
- <tx:in label="#{overviewBundle.validation_number}" markup="number" required="true">
- <f:validateLength minimum="7" maximum="7" />
- <f:validateLongRange />
- </tx:in>
- <tx:in label="#{overviewBundle.validation_price}" markup="number">
- <f:validateDoubleRange minimum="0.01" maximum="1000" />
- </tx:in>
- <tx:in label="#{overviewBundle.validation_custom}" validator="#{overviewController.customValidator}" >
- </tx:in>
- </tc:panel>
-
- <tx:textarea label="#{overviewBundle.validation_description}"
- required="true" />
-
- <tc:messages />
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1*;100px" />
- </f:facet>
- <tc:cell/>
- <tc:button action="#{clientConfigController.submit}"
- label="#{overviewBundle.validation_submit}" />
- </tc:panel>
-
- </tc:box>
- <tc:cell />
- </tc:panel>
- </jsp:body>
-</layout:overview>
+ <tx:textarea label="#{overviewBundle.validation_description}"
+ required="true"/>
+
+ <tc:messages/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="1*;100px"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button action="#{clientConfigController.submit}"
+ label="#{overviewBundle.validation_submit}"/>
+ </tc:panel>
+
+ </tc:box>
+ <tc:cell/>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp Fri Nov 21 07:50:48 2008
@@ -20,14 +20,12 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-<layout:overview>
+<layout:plain>
<jsp:body>
-
<tc:box label="Tree - General">
<f:facet name="layout">
<tc:gridLayout margin="10px"/>
</f:facet>
-
<tc:tree id="tree"
showIcons="true"
showJunctions="true"
@@ -43,14 +41,16 @@
action="#{node.userObject.action}"
disabled="#{node.userObject.disabled}"
value="#{node}"
- image="image/feather.png"/>
+ image="image/feather.png"
+ treeExpansionListener="#{node.userObject.expansionListener}"/>
</tc:treeData>
<tc:treeNode label="2 Action 1" action="#{treeController.action1}" id="action1">
<f:facet name="addendum">
<tc:out value="(Addendum)"/>
</f:facet>
</tc:treeNode>
- <tc:treeNode label="3 Action 2 (with actionListener)" action="#{treeController.action2}" actionListener="#{treeController.actionListener}" id="action2"/>
+ <tc:treeNode label="3 Action 2 (with actionListener)" action="#{treeController.action2}"
+ actionListener="#{treeController.actionListener}" id="action2"/>
<tc:treeNode label="4 Action 3" action="#{treeController.action3}" id="action3">
<tc:treeNode label="4.1 On Click 1" onclick="alert('On Click 1');" id="click1"/>
<tc:treeNode label="4.2 On Click 2" onclick="alert('On Click 2');" id="click2">
@@ -61,7 +61,6 @@
<tc:treeNode label="6 Target" action="#{treeController.action2}" target="Target Window"/>
</tc:treeNode>
</tc:tree>
-
</tc:box>
</jsp:body>
-</layout:overview>
+</layout:plain>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Fri Nov 21 07:50:48 2008
@@ -46,7 +46,7 @@
<entry key="toolbar">Toolbar</entry>
<entry key="validation">Validation</entry>
<entry key="form">Forms</entry>
- <entry key="themes">Themes</entry>
+ <entry key="theme">Themes</entry>
<entry key="browser">Browser</entry>
<entry key="locale">Locale</entry>
<entry key="layout">Layout</entry>
Added: myfaces/tobago/trunk/example/demo/src/main/xslt/facelet2jsp.xsl
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/xslt/facelet2jsp.xsl?rev=719606&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/xslt/facelet2jsp.xsl (added)
+++ myfaces/tobago/trunk/example/demo/src/main/xslt/facelet2jsp.xsl Fri Nov 21 07:50:48 2008
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ This code is experimenal and only for use in this example
+-->
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:layout="urn:jsptagdir:/WEB-INF/tags/layout">
+
+ <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+
+ <xsl:template match="/ui:composition">
+ <xsl:comment>
+ This Code is generated. Do not change.
+ </xsl:comment>
+
+ <xsl:comment>
+ * 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.
+ </xsl:comment>
+
+ <jsp:root version="2.0">
+ <layout:overview>
+ <jsp:params>
+ <xsl:apply-templates select="ui:param" mode="parameter"/>
+ </jsp:params>
+ <jsp:body>
+ <xsl:apply-templates/>
+ </jsp:body>
+ </layout:overview>
+ </jsp:root>
+ </xsl:template>
+
+ <xsl:template match="ui:param" mode="parameter">
+ <jsp:param name="title" value="BASICS"/>
+ </xsl:template>
+
+ <xsl:template match="ui:param">
+ <!-- ignore -->
+ </xsl:template>
+
+ <xsl:template match="*">
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates/>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>