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 2011/07/07 21:51:17 UTC
svn commit: r1144007 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp:
WEB-INF/faces-config.xml content/21/ content/21/progress.xhtml
reference/progress.jsp
Author: lofwyr
Date: Thu Jul 7 19:51:17 2011
New Revision: 1144007
URL: http://svn.apache.org/viewvc?rev=1144007&view=rev
Log:
TOBAGO-985: Make Progress work with new LayoutManager
- sample
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/progress.xhtml (contents, props changed)
- copied, changed from r1143884, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/progress.jsp
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/progress.jsp
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1144007&r1=1144006&r2=1144007&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml Thu Jul 7 19:51:17 2011
@@ -315,10 +315,6 @@
<to-view-id>/reference/output.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>reference/progress</from-outcome>
- <to-view-id>/reference/progress.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>/reference/select.jspx</from-outcome>
<to-view-id>/reference/select.jspx</to-view-id>
</navigation-case>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/progress.xhtml (from r1143884, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/progress.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/progress.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/progress.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/progress.jsp&r1=1143884&r2=1144007&rev=1144007&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/progress.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/progress.xhtml Thu Jul 7 19:51:17 2011
@@ -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,33 +15,32 @@
* 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://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-<%-- Progress --%>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ 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="Simple progress example with reload facet"/>
-<layout:overview>
- <f:subview id="progress">
- <jsp:body>
- <tc:panel>
- <f:facet name="reload">
- <tc:reload frequency="2000" update="#{progress.update}" />
- </f:facet>
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;1*" columns="100px;1* "/>
- </f:facet>
- <tc:label value="Progress:" />
- <%-- code-sniplet-start id="progress" --%>
- <tc:progress value="#{progress.progress}" >
- <f:facet name="complete">
- <tc:command action="#{progress.reset}" />
- </f:facet>
- </tc:progress>
- <%-- code-sniplet-end id="progress" --%>
- <tc:cell/>
- </tc:panel>
+ <tc:panel>
+ <f:facet name="reload">
+ <tc:reload frequency="2000" update="#{progress.update}"/>
+ </f:facet>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;1*" columns="100px;1* "/>
+ </f:facet>
+ <tc:label value="Progress:"/>
+ <!-- code-sniplet-start id="progress" -->
+ <tc:progress value="#{progress.progress}">
+ <f:facet name="complete">
+ <tc:command action="#{progress.reset}"/>
+ </f:facet>
+ </tc:progress>
+ <!-- code-sniplet-end id="progress" -->
+ <tc:cell/>
+ </tc:panel>
- </jsp:body>
- </f:subview>
-</layout:overview>
+</ui:composition>
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/progress.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/21/progress.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL