Author: tmjee Date: Thu Jun 22 23:01:41 2006 New Revision: 416577 URL: http://svn.apache.org/viewvc?rev=416577&view=rev Log: WW-1359 - added <@saf.head /> tag - corrected erronous ftl interpolation
Modified: struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/helloWorld.ftl struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/index.ftl Modified: struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/helloWorld.ftl URL: http://svn.apache.org/viewvc/struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/helloWorld.ftl?rev=416577&r1=416576&r2=416577&view=diff ============================================================================== --- struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/helloWorld.ftl (original) +++ struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/helloWorld.ftl Thu Jun 22 23:01:41 2006 @@ -6,9 +6,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>Hello World</title> + <@saf.head /> </head> <body> - Hello %{name}. + Hello ${name}. </body> </html> Modified: struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/index.ftl URL: http://svn.apache.org/viewvc/struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/index.ftl?rev=416577&r1=416576&r2=416577&view=diff ============================================================================== --- struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/index.ftl (original) +++ struts/action2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/ftl/index.ftl Thu Jun 22 23:01:41 2006 @@ -5,9 +5,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>Index</title> + <@saf.head /> </head> <body> - <@saf.form action="helloWorldAction"> + <@saf.form action="helloWorld"> <@saf.textfield label="What is your name?" name="name" /> <@saf.submit /> </@saf.form>