Title: [waffle-scm] [632] trunk/examples/freemarker-example/src/main/webapp: Separated layout in different templates in freemarker-example.

Diff

Added: trunk/examples/freemarker-example/src/main/webapp/footer.ftl (0 => 632)

--- trunk/examples/freemarker-example/src/main/webapp/footer.ftl	                        (rev 0)
+++ trunk/examples/freemarker-example/src/main/webapp/footer.ftl	2008-04-20 12:26:49 UTC (rev 632)
@@ -0,0 +1,4 @@
+<div id="footer">
+  ~ Footer ~
+</div>
+ 
\ No newline at end of file

Added: trunk/examples/freemarker-example/src/main/webapp/header.ftl (0 => 632)

--- trunk/examples/freemarker-example/src/main/webapp/header.ftl	                        (rev 0)
+++ trunk/examples/freemarker-example/src/main/webapp/header.ftl	2008-04-20 12:26:49 UTC (rev 632)
@@ -0,0 +1,4 @@
+<div id="header">
+  ~ Header ~
+</div>
+ 
\ No newline at end of file

Modified: trunk/examples/freemarker-example/src/main/webapp/layout.ftl (631 => 632)

--- trunk/examples/freemarker-example/src/main/webapp/layout.ftl	2008-04-20 12:13:33 UTC (rev 631)
+++ trunk/examples/freemarker-example/src/main/webapp/layout.ftl	2008-04-20 12:26:49 UTC (rev 632)
@@ -4,12 +4,13 @@
 <head>
   <title>${title}</title>
   ${head}
+  <#include "resources.ftl" parse="true">
 </head>
 <body>
-  ~ Standard Header ~
+  <#include "header.ftl" parse="true">
   <hr/>
     ${body}
   <hr/>
-  ~ Decorator Added Footer ~
+  <#include "footer.ftl" parse="true">
 </body>
 </html>
\ No newline at end of file

Modified: trunk/examples/freemarker-example/src/main/webapp/people/editperson.ftl (631 => 632)

--- trunk/examples/freemarker-example/src/main/webapp/people/editperson.ftl	2008-04-20 12:13:33 UTC (rev 631)
+++ trunk/examples/freemarker-example/src/main/webapp/people/editperson.ftl	2008-04-20 12:26:49 UTC (rev 632)
@@ -55,6 +55,6 @@
     <a href="" |
     <a href=""
 
-    <#include "../fielderrors.ftl" parse="true">
+    <#include "/fielderrors.ftl" parse="true">
 
 </div>
\ No newline at end of file

Modified: trunk/examples/freemarker-example/src/main/webapp/people/person.ftl (631 => 632)

--- trunk/examples/freemarker-example/src/main/webapp/people/person.ftl	2008-04-20 12:13:33 UTC (rev 631)
+++ trunk/examples/freemarker-example/src/main/webapp/people/person.ftl	2008-04-20 12:26:49 UTC (rev 632)
@@ -2,16 +2,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>Select a person</title>
-    <style type="text/css" title="currentStyle" media="screen">
-        @import "${base}/style/style.css";
-    </style>
-    <script src="" type="text/_javascript_">
-        // keep this space
-    </script>
-    <script src="" type="text/_javascript_">
-        // keep this space
-    </script>
+    <title>Select a person</title>  
 </head>
 <body>
 <form action="" method="post">

Added: trunk/examples/freemarker-example/src/main/webapp/resources.ftl (0 => 632)

--- trunk/examples/freemarker-example/src/main/webapp/resources.ftl	                        (rev 0)
+++ trunk/examples/freemarker-example/src/main/webapp/resources.ftl	2008-04-20 12:26:49 UTC (rev 632)
@@ -0,0 +1,4 @@
+ <link rel="stylesheet" type="text/css" href=""
+ <!--  Note: keep <script></script> syntax as it is required for cross-browser compatibility -->
+ <script src="" type="text/_javascript_"></script>
+ <script src="" type="text/_javascript_"></script>
\ No newline at end of file


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to