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 2010/03/09 13:18:30 UTC
svn commit: r920826 - in
/myfaces/tobago/trunk/example/demo/src/main/webapp/reference: popup.jsp
popup.xhtml
Author: lofwyr
Date: Tue Mar 9 12:18:30 2010
New Revision: 920826
URL: http://svn.apache.org/viewvc?rev=920826&view=rev
Log:
TOBAGO-723: migrace to facelets (JSP will be generated)
Added:
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.xhtml (contents, props changed)
- copied, changed from r917992, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp
Removed:
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.xhtml (from r917992, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp&r1=917992&r2=920826&rev=920826&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.xhtml Tue Mar 9 12:18:30 2010
@@ -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,157 +15,158 @@
* 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:box label="Popups">
-<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;*"/>
-</f:facet>
-
-<tc:menuBar>
- <tc:menu label="Menu">
- <tc:menuCommand label="Open Popup">
- <tc:popupReference for=":page:popup"/>
- </tc:menuCommand>
- </tc:menu>
-</tc:menuBar>
-
-<tc:messages/>
-
-<tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="fixed;fixed;fixed;fixed;*"/>
- </f:facet>
-
- <tc:label value="Full Reload"/>
-
- <tc:button label="Open">
- <f:facet name="popup">
- <tc:popup width="300" height="270" id="modal_popup">
- <tc:box label="Modal text input">
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;*;fixed"/>
- </f:facet>
-
- <tc:selectBooleanCheckbox value="#{reference.bool}"/>
- <tc:in value="#{reference.text}" required="true"/>
- <tx:date>
- <f:convertDateTime pattern="dd/MM/yyyy"/>
- </tx:date>
- <tc:cell/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1*;1*;1*" margin="10"/>
- </f:facet>
- <tc:button label="Cancel">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- <tc:button label="Redisplay">
- <tc:attribute name="renderedPartially" value="popup"/>
- </tc:button>
- <tc:button label="Ok">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- </tc:panel>
-
- </tc:box>
- </tc:popup>
- </f:facet>
- </tc:button>
-
- <tc:button label="Open modeless">
- <f:facet name="popup">
- <tc:popup width="300" height="270" id="non_modal_popup" modal="false">
- <tc:box label="Non modal text input">
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;*;fixed"/>
- </f:facet>
-
- <tx:in label="Field" required="true"/>
- <tc:cell/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;fixed;fixed"/>
- </f:facet>
- <tc:cell/>
- <tc:button label="Cancel">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- <tc:button label="Ok">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- </tc:panel>
+-->
- </tc:box>
- </tc:popup>
+<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:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.basic}"/>
+ <tc:box label="Popups">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;*"/>
</f:facet>
- </tc:button>
-
- <tc:button label="Open here">
- <f:facet name="popup">
- <tc:popup width="180" height="110" id="positioned_popup"
- left="#{tobago.actionPosition.right.pixel + 5}" top="#{tobago.actionPosition.top.pixel}">
- <tc:box label="Info">
- <f:facet name="layout">
- <tc:gridLayout rows="*;fixed"/>
- </f:facet>
-
- <tc:textarea value="This popup should opened right beside the button." readonly="true"/>
- <tc:button label="Ok">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
-
- </tc:box>
- </tc:popup>
- </f:facet>
- </tc:button>
-
- <tc:cell />
-
-</tc:panel>
-<tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="fixed;fixed;fixed;fixed;*"/>
- </f:facet>
-
- <tc:label value="Partial Reload"/>
-
- <tc:button label="Open">
- <tc:attribute name="renderedPartially" value="modal_popup"/>
- <tc:popupReference for="modal_popup"/>
- </tc:button>
-
- <tc:button label="Open modeless">
- <tc:attribute name="renderedPartially" value="non_modal_popup"/>
- <tc:popupReference for="non_modal_popup"/>
- </tc:button>
-
- <tc:button label="Open here">
- <tc:attribute name="renderedPartially" value="positioned_popup"/>
- <tc:popupReference for="positioned_popup"/>
- </tc:button>
-
- <tc:cell />
-
-</tc:panel>
-
-<tx:in readonly="true" label="The Boolean" value="#{reference.bool}"/>
-<tx:in readonly="true" label="The Text" value="#{reference.text}"/>
+ <tc:menuBar>
+ <tc:menu label="Menu">
+ <tc:menuCommand label="Open Popup">
+ <tc:popupReference for=":page:popup"/>
+ </tc:menuCommand>
+ </tc:menu>
+ </tc:menuBar>
+
+ <ui:debug/>
+
+ <tc:messages/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="fixed;fixed;fixed;fixed;*"/>
+ </f:facet>
+
+ <tc:label value="Full Reload"/>
+
+ <tc:button label="Open">
+ <f:facet name="popup">
+ <tc:popup width="300" height="270" id="modal_popup">
+ <tc:box label="Modal text input">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;*;fixed"/>
+ </f:facet>
+
+ <tc:selectBooleanCheckbox value="#{reference.bool}"/>
+ <tc:in value="#{reference.text}" required="true"/>
+ <tx:date>
+ <f:convertDateTime pattern="dd/MM/yyyy"/>
+ </tx:date>
+ <tc:cell/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="1*;1*;1*" margin="10"/>
+ </f:facet>
+ <tc:button label="Cancel">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+ <tc:button label="Redisplay">
+ <tc:attribute name="renderedPartially" value="popup"/>
+ </tc:button>
+ <tc:button label="Ok">
+ <tc:attribute name="popupClose" value="afterSubmit"/>
+ </tc:button>
+ </tc:panel>
+
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+ </tc:button>
+
+ <tc:button label="Open modeless">
+ <f:facet name="popup">
+ <tc:popup width="300" height="270" id="non_modal_popup" modal="false">
+ <tc:box label="Non modal text input">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;*;fixed"/>
+ </f:facet>
+
+ <tx:in label="Field" required="true"/>
+ <tc:cell/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed;fixed"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button label="Cancel">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+ <tc:button label="Ok">
+ <tc:attribute name="popupClose" value="afterSubmit"/>
+ </tc:button>
+ </tc:panel>
+
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+ </tc:button>
+
+ <tc:button label="Open here">
+ <f:facet name="popup">
+ <tc:popup width="180" height="110" id="positioned_popup"
+ left="#{tobago.actionPosition.right.pixel + 5}" top="#{tobago.actionPosition.top.pixel}">
+ <tc:box label="Info">
+ <f:facet name="layout">
+ <tc:gridLayout rows="*;fixed"/>
+ </f:facet>
+
+ <tc:textarea value="This popup should opened right beside the button." readonly="true"/>
+ <tc:button label="Ok">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+ </tc:button>
+
+ <tc:cell/>
+
+ </tc:panel>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="fixed;fixed;fixed;fixed;*"/>
+ </f:facet>
+
+ <tc:label value="Partial Reload"/>
+
+ <tc:button label="Open">
+ <tc:attribute name="renderedPartially" value="modal_popup"/>
+ <tc:popupReference for="modal_popup"/>
+ </tc:button>
+
+ <tc:button label="Open modeless">
+ <tc:attribute name="renderedPartially" value="non_modal_popup"/>
+ <tc:popupReference for="non_modal_popup"/>
+ </tc:button>
+
+ <tc:button label="Open here">
+ <tc:attribute name="renderedPartially" value="positioned_popup"/>
+ <tc:popupReference for="positioned_popup"/>
+ </tc:button>
+
+ <tc:cell/>
+
+ </tc:panel>
+
+ <tx:in readonly="true" label="The Boolean" value="#{reference.bool}"/>
+
+ <tx:in readonly="true" label="The Text" value="#{reference.text}"/>
-<tx:in required="true" label="Required"/>
+ <tx:in required="true" label="Required"/>
-<tx:selectOneChoice label="Select"/>
+ <tx:selectOneChoice label="Select"/>
-<tc:cell/>
+ <tc:cell/>
-</tc:box>
-</jsp:body>
-</layout:overview>
+ </tc:box>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL