svn commit: r930002 - in /myfaces/tobago/trunk/example/demo/src/main/webapp: index.jsp init.xhtml

[lo...@apache.org]

Author: lofwyr
Date: Thu Apr  1 15:26:00 2010
New Revision: 930002

URL: http://svn.apache.org/viewvc?rev=930002&view=rev
Log:
Add an initialization page to the demo.

Added:
    myfaces/tobago/trunk/example/demo/src/main/webapp/init.xhtml
      - copied, changed from r929063, myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
Modified:
    myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp?rev=930002&r1=930001&r2=930002&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp Thu Apr  1 15:26:00 2010
@@ -14,4 +14,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 --%>
-<jsp:forward page="faces/overview/intro.xhtml"/>
+<jsp:forward page="faces/init.xhtml"/>

Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/init.xhtml (from r929063, myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/init.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/init.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml&r1=929063&r2=930002&rev=930002&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/init.xhtml Thu Apr  1 15:26:00 2010
@@ -19,37 +19,20 @@
 
 <ui:composition xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
   <f:view locale="#{clientConfigController.locale}">
     <tc:loadBundle basename="overview" var="overviewBundle"/>
-    <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle} - #{title}" id="page" width="1000px"
-             height="750px">
-
-      <ui:include src="/menu.xhtml"/>
-
+    <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page">
       <f:facet name="layout">
-        <tc:gridLayout border="0" columns="*;4*"
-                       margin="10px" rows="100px;fixed;*;fixed"/>
+        <tc:gridLayout marginLeft="100px" marginTop="100px" rows="auto;auto"/>
+      </f:facet>
+      <f:facet name="action">
+        <tc:link action="/overview/intro.xhtml"/>
       </f:facet>
 
-      <tc:cell spanX="2">
-        <ui:include src="/header.xhtml"/>
-      </tc:cell>
-
-      <tc:cell spanY="3">
-        <ui:include src="/navigation.xhtml"/>
-      </tc:cell>
-
-      <tc:messages/>
-      
-      <tc:cell>
-        <ui:insert/>
-      </tc:cell>
-
-      <tc:cell>
-        <ui:include src="/footer.xhtml"/>
-      </tc:cell>
+      <tc:image value="image/tobago_head.gif" width="150px" height="83px"/>
+      <tc:out value="Initilizing ..."/>
 
     </tc:page>
   </f:view>