You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/01/29 14:13:46 UTC

svn commit: r904485 - in /myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp: helloWorld.xhtml page2.xhtml

Author: werpu
Date: Fri Jan 29 13:13:46 2010
New Revision: 904485

URL: http://svn.apache.org/viewvc?rev=904485&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-55

Modified:
    myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/helloWorld.xhtml
    myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/page2.xhtml

Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/helloWorld.xhtml?rev=904485&r1=904484&r2=904485&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/helloWorld.xhtml Fri Jan 29 13:13:46 2010
@@ -11,29 +11,32 @@
 
     <ui:define name="body">
         <h:form id="form">
-            <h:panelGroup styleClass="stdBox">
-                <h3>Validator Test 1</h3>
-                <h:outputText id="output1" value="Please enter your name"/>
-                <h:inputText id="input1" value="#{helloWorld.name}" required="true">
-                    <grv:groovyvalidator/>
-                </h:inputText>
-                <h:commandButton id="button1" value="press me" action="#{helloWorld.send}"/>
+            <h:panelGroup styleClass="left">
+                <h:panelGroup styleClass="stdBox">
+                    <h3>Validator Test 1</h3>
+                    <h:outputText id="output1" value="Please enter your name"/>
+                    <h:inputText id="input1" value="#{helloWorld.name}" required="true">
+                        <grv:groovyvalidator/>
+                    </h:inputText>
+                    <h:commandButton id="button1" value="press me" action="#{helloWorld.send}"/>
+                </h:panelGroup>
+                <h:panelGroup styleClass="stdBox">
+                    <h3>Groovy Component</h3>
+                    <grv:testcomponent/>
+                    <h:message id="message1" for="input1"/>
+                </h:panelGroup>
             </h:panelGroup>
-            <h:panelGroup styleClass="stdBox">
-                <h3>Groovy Component</h3>
-                <grv:testcomponent/>
-                <h:message id="message1" for="input1"/>
-            </h:panelGroup>
-
-            <h:panelGroup styleClass="stdBox">
-                <h3>Bean Tests</h3>
-                <h:outputFormat value="#{testbean.xxx}"/>
-                <br/>
-                <h:outputFormat value="#{javatestbean.sayHello}"/>
-            </h:panelGroup>
-            <h:panelGroup styleClass="stdBox">
-                <h3>Action Test 1</h3>
-                <h:commandButton value="Press me dynamic" action="#{testbean.doit}"/>
+            <h:panelGroup styleClass="right">
+                <h:panelGroup styleClass="stdBox">
+                    <h3>Bean Tests</h3>
+                    <h:outputFormat value="#{testbean.xxx}"/>
+                    <br/>
+                    <h:outputFormat value="#{javatestbean.sayHello}"/>
+                </h:panelGroup>
+                <h:panelGroup styleClass="stdBox">
+                    <h3>Action Test 1</h3>
+                    <h:commandButton value="Press me dynamic" action="#{testbean.doit}"/>
+                </h:panelGroup>
             </h:panelGroup>
         </h:form>
     </ui:define>

Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/page2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/page2.xhtml?rev=904485&r1=904484&r2=904485&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/page2.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/page2.xhtml Fri Jan 29 13:13:46 2010
@@ -1,23 +1,26 @@
 <!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:ui = "http://java.sun.com/jsf/facelets"
-      xmlns:f = "http://java.sun.com/jsf/core" xmlns:h = "http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
 <head>
-<title>Hello World</title>
+    <title>Hello World</title>
 </head>
 <body>
 
-<f:view>
-	<h:outputText value = "Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces" />
-	<h:form id = "form2">
-		<h:commandLink id = "link1" action = "back">
-			<h:outputText id = "linkText" value = "GO HOME" />
-		</h:commandLink>
+<ui:composition template="/template.xhtml">
 
-        <h:commandLink id = "link12" action = "xxx">
-			<h:outputText id = "linkText2" value = "GO HOME" />
-		</h:commandLink>
-	</h:form>
-</f:view>
+    <ui:define name="body">
+        <h1><h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces Extensions Scripting"/></h1>
+        <h:form id="form2">
+            <h:panelGrid id="grid" columns="2" styleClass="stdBox">
+
+                <h:commandLink id="link1" action="back">
+                    <h:outputText id="linkText" value="GO HOME"/>
+                </h:commandLink>
+
+            </h:panelGrid>
+        </h:form>
+    </ui:define>
+</ui:composition>
 </body>
 </html>