- Revision
- 633
- Author
- mauro
- Date
- 2008-04-20 07:40:22 -0500 (Sun, 20 Apr 2008)
Log Message
Renamed logic templates and action suffix in freemarker-example. Added navigation template.
Modified Paths
- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java
- trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml
- trunk/examples/freemarker-example/src/main/webapp/index.ftl
- trunk/examples/freemarker-example/src/main/webapp/layout.ftl
Added Paths
- trunk/examples/freemarker-example/src/main/webapp/navigation.ftl
- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl
- trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl
Removed Paths
Diff
Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java (632 => 633)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java 2008-04-20 12:26:49 UTC (rev 632) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java 2008-04-20 12:40:22 UTC (rev 633) @@ -18,6 +18,6 @@ @Override public void session() { - register("people/person", PersonController.class); + register("people/manage", PersonController.class); } }
Modified: trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml (632 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml 2008-04-20 12:26:49 UTC (rev 632) +++ trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml 2008-04-20 12:40:22 UTC (rev 633) @@ -47,7 +47,7 @@ <filter-mapping> <filter-name>waffle-request</filter-name> - <url-pattern>*.foo</url-pattern> + <url-pattern>*.action</url-pattern> </filter-mapping> <!-- Servlets --> @@ -77,7 +77,7 @@ <servlet-mapping> <servlet-name>waffle</servlet-name> - <url-pattern>*.foo</url-pattern> + <url-pattern>*.action</url-pattern> </servlet-mapping> <servlet-mapping>
Modified: trunk/examples/freemarker-example/src/main/webapp/index.ftl (632 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/index.ftl 2008-04-20 12:26:49 UTC (rev 632) +++ trunk/examples/freemarker-example/src/main/webapp/index.ftl 2008-04-20 12:40:22 UTC (rev 633) @@ -3,13 +3,9 @@ <html> <head> <title>Waffle: FreeMarker example</title> - <style type="text/css" title="currentStyle" media="screen"> - @import "stylesheets/style.css"; - </style> </head> <body> <h1>Waffle example with Freemarker</h1> - <p>Welcome to the Waffle Freemarker/Sitemesh example. Click on the link below to go to the single controller for this example</p> - <a href="" Maintenance</a> + <p>Welcome to the Waffle Freemarker/Sitemesh example. Choose an action from the navigation</p> </body> </html> \ No newline at end of file
Modified: trunk/examples/freemarker-example/src/main/webapp/layout.ftl (632 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/layout.ftl 2008-04-20 12:26:49 UTC (rev 632) +++ trunk/examples/freemarker-example/src/main/webapp/layout.ftl 2008-04-20 12:40:22 UTC (rev 633) @@ -4,13 +4,15 @@ <head> <title>${title}</title> ${head} - <#include "resources.ftl" parse="true"> + <#include "/resources.ftl" parse="true"> </head> <body> - <#include "header.ftl" parse="true"> + <#include "/header.ftl" parse="true"> <hr/> + <#include "/navigation.ftl" parse="true"> + <hr/> ${body} <hr/> - <#include "footer.ftl" parse="true"> + <#include "/footer.ftl" parse="true"> </body> </html> \ No newline at end of file
Added: trunk/examples/freemarker-example/src/main/webapp/navigation.ftl (0 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/navigation.ftl (rev 0) +++ trunk/examples/freemarker-example/src/main/webapp/navigation.ftl 2008-04-20 12:40:22 UTC (rev 633) @@ -0,0 +1,3 @@ +<div id="navigation"> +[Navigation] <a href="" Maintenance</a> +</div> \ No newline at end of file
Copied: trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl (from rev 632, trunk/examples/freemarker-example/src/main/webapp/people/editperson.ftl) (0 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl (rev 0) +++ trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl 2008-04-20 12:40:22 UTC (rev 633) @@ -0,0 +1,60 @@ +<#import "/ftl/waffle/form.ftl" as w> +<#import "/ftl/waffle/validation.ftl" as v> +<div class="editContainer" xmlns="http://www.w3.org/1999/xhtml"> + + <h3>Edit Person</h3> + + <@v.errorsAsDiv errors /> + + <div class="fieldRow"> + <label for="" + <@w.text "person.id" "${person.id}" "readonly='true' disabled='true'"/> + <br style="clear:both"/> + </div> + <div class="fieldRow"> + <label for="" Name:</label> + <@w.text "person.firstName" "${person.firstName}"/> + <br style="clear:both"/> + </div> + <div class="fieldRow"> + <label for="" Name:</label> + <@w.text "person.lastName" "${person.lastName}"/> + <br style="clear:both"/> + </div> + <div class="fieldRow"> + <label for="" + <@w.text "person.email" "${person.email}"/> + <br style="clear:both"/> + </div> + <div class="fieldRow"> + <label for="" Of Birth:</label> + <#if person.dateOfBirth??> + <@w.text "person.dateOfBirth" "${person.dateOfBirth?string('dd/MM/yyyy')}"/> + <#else> + <@w.text "person.dateOfBirth" ""/> + </#if> + <br style="clear:both"/> + </div> + <div class="fieldRow"> + <label for="" + <@w.selectMultiple "person.skills" controller.getSkills() person.getSkills() "size='5'"/> + <br style="clear:both"/> + </div> + <div class="fieldRow"> + <label for="" + <@w.textAsCSV "person.levels" person.getLevels()![] /> + <br style="clear:both"/> + </div> + <div class="fieldRow"> + <label for="" + <@w.textAsCSV "person.grades" person.getGrades()![] /> + <br style="clear:both"/> + </div> + + <br/> + <a href="" | + <a href="" + + <#include "/fielderrors.ftl" parse="true"> + +</div> \ No newline at end of file
Deleted: trunk/examples/freemarker-example/src/main/webapp/people/editperson.ftl (632 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/people/editperson.ftl 2008-04-20 12:26:49 UTC (rev 632) +++ trunk/examples/freemarker-example/src/main/webapp/people/editperson.ftl 2008-04-20 12:40:22 UTC (rev 633) @@ -1,60 +0,0 @@ -<#import "/ftl/waffle/form.ftl" as w> -<#import "/ftl/waffle/validation.ftl" as v> -<div class="editContainer" xmlns="http://www.w3.org/1999/xhtml"> - - <h3>Edit Person</h3> - - <@v.errorsAsDiv errors /> - - <div class="fieldRow"> - <label for="" - <@w.text "person.id" "${person.id}" "readonly='true' disabled='true'"/> - <br style="clear:both"/> - </div> - <div class="fieldRow"> - <label for="" Name:</label> - <@w.text "person.firstName" "${person.firstName}"/> - <br style="clear:both"/> - </div> - <div class="fieldRow"> - <label for="" Name:</label> - <@w.text "person.lastName" "${person.lastName}"/> - <br style="clear:both"/> - </div> - <div class="fieldRow"> - <label for="" - <@w.text "person.email" "${person.email}"/> - <br style="clear:both"/> - </div> - <div class="fieldRow"> - <label for="" Of Birth:</label> - <#if person.dateOfBirth??> - <@w.text "person.dateOfBirth" "${person.dateOfBirth?string('dd/MM/yyyy')}"/> - <#else> - <@w.text "person.dateOfBirth" ""/> - </#if> - <br style="clear:both"/> - </div> - <div class="fieldRow"> - <label for="" - <@w.selectMultiple "person.skills" controller.getSkills() person.getSkills() "size='5'"/> - <br style="clear:both"/> - </div> - <div class="fieldRow"> - <label for="" - <@w.textAsCSV "person.levels" person.getLevels()![] /> - <br style="clear:both"/> - </div> - <div class="fieldRow"> - <label for="" - <@w.textAsCSV "person.grades" person.getGrades()![] /> - <br style="clear:both"/> - </div> - - <br/> - <a href="" | - <a href="" - - <#include "/fielderrors.ftl" parse="true"> - -</div> \ No newline at end of file
Copied: trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl (from rev 632, trunk/examples/freemarker-example/src/main/webapp/people/person.ftl) (0 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl (rev 0) +++ trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl 2008-04-20 12:40:22 UTC (rev 633) @@ -0,0 +1,60 @@ +<#import "/ftl/waffle/form.ftl" as w> +<?xml version="1.0" encoding="UTF-8"?> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <title>Select a person</title> +</head> +<body> +<form action="" method="post"> + + <h3>Waffle example: Select Person</h3> + + <table> + <tr> + <th>Id</th> + <th>First Name</th> + <th>Last Name</th> + <th>Email</th> + <th>Date of Birth</th> + <th>Skills</th> + <th>Select</th> + </tr> + <#list people as person> + <tr class="odd"> + <td> + <a href="" + </td> + <td>${person.firstName}</td> + <td>${person.lastName}</td> + <td>${person.email}</td> + <td><#if person.dateOfBirth??>${person.dateOfBirth?string("dd/MM/yyyy")}</#if></td> + <td><@w.asCSV person.getSkills()![] /> </p></td> + <td><@w.checkbox "selectedIds" "${person.id}" /></td> + </tr> + </#list> + </table> + + <a href="" <a href="" Selected</a> + + <div id="showArea"> + Selected people are: + <table> + <#list selectedPeople as person> + <tr class="odd"> + <td>${person.firstName} ${person.lastName} (${person.id})</td> + </tr> + </#list> + </table> + </div> + + <!-- Example of partial page --> + <div id="editArea"> + <#if person?exists> + <#include "edit.ftl" parse="true"> + </#if> + </div> + +</form> +</body> + +</html> \ No newline at end of file
Deleted: trunk/examples/freemarker-example/src/main/webapp/people/person.ftl (632 => 633)
--- trunk/examples/freemarker-example/src/main/webapp/people/person.ftl 2008-04-20 12:26:49 UTC (rev 632) +++ trunk/examples/freemarker-example/src/main/webapp/people/person.ftl 2008-04-20 12:40:22 UTC (rev 633) @@ -1,60 +0,0 @@ -<#import "/ftl/waffle/form.ftl" as w> -<?xml version="1.0" encoding="UTF-8"?> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>Select a person</title> -</head> -<body> -<form action="" method="post"> - - <h3>Waffle example: Select Person</h3> - - <table> - <tr> - <th>Id</th> - <th>First Name</th> - <th>Last Name</th> - <th>Email</th> - <th>Date of Birth</th> - <th>Skills</th> - <th>Select</th> - </tr> - <#list people as person> - <tr class="odd"> - <td> - <a href="" - </td> - <td>${person.firstName}</td> - <td>${person.lastName}</td> - <td>${person.email}</td> - <td><#if person.dateOfBirth??>${person.dateOfBirth?string("dd/MM/yyyy")}</#if></td> - <td><@w.asCSV person.getSkills()![] /> </p></td> - <td><@w.checkbox "selectedIds" "${person.id}" /></td> - </tr> - </#list> - </table> - - <a href="" <a href="" Selected</a> - - <div id="showArea"> - Selected people are: - <table> - <#list selectedPeople as person> - <tr class="odd"> - <td>${person.firstName} ${person.lastName} (${person.id})</td> - </tr> - </#list> - </table> - </div> - - <!-- Example of partial page --> - <div id="editArea"> - <#if person?exists> - <#include "editperson.ftl" parse="true"> - </#if> - </div> - -</form> -</body> - -</html> \ No newline at end of file
To unsubscribe from this list please visit:
