3 files changed, 15 insertions, 12 deletions
diff --git a/repoze/bfg/sampleapp/templates/blog.pt b/repoze/bfg/sampleapp/templates/blog.pt
index 8ccbe56a2..8eb3945db 100644
--- a/repoze/bfg/sampleapp/templates/blog.pt
+++ b/repoze/bfg/sampleapp/templates/blog.pt
@@ -1,15 +1,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head></head>
-<body tal:define="info view.getInfo()">
-  <h1 tal:content="info.name">Blog Name</h1>
+<body>
+  <h1 tal:content="name">Blog Name</h1>
   <table border="0">
     <thead>
       <th>Title</th>
       <th>Author</th>
       <th>Created</th>
     </thead>
-    <tr tal:repeat="entry info.entries">
+    <tr tal:repeat="entry entries">
       <td><a href="${entry.name}/">${entry.title}</a></td>
       <td>${entry.author}</td>
       <td>${entry.created}</td>
diff --git a/repoze/bfg/sampleapp/templates/blog_entry.pt b/repoze/bfg/sampleapp/templates/blog_entry.pt
index 20e1b4409..830876525 100644
--- a/repoze/bfg/sampleapp/templates/blog_entry.pt
+++ b/repoze/bfg/sampleapp/templates/blog_entry.pt
@@ -2,10 +2,10 @@
      xmlns:tal="http://xml.zope.org/namespaces/tal">
 <head></head>
 <body>
-  <div tal:define="info view.getInfo()">
+  <div>
     <p><a href="..">Up</a></p>
-    <h1>${info.title}</h1>
-    <p>by ${info.author}</p>
+    <h1>${title}</h1>
+    <p>by ${author}</p>
     <div tal:content="structure info.body"></div>
   </div>
 </body>
diff --git a/repoze/bfg/sampleapp/templates/blog_entry_add.pt b/repoze/bfg/sampleapp/templates/blog_entry_add.pt
index b41ae4b02..101163b44 100644
--- a/repoze/bfg/sampleapp/templates/blog_entry_add.pt
+++ b/repoze/bfg/sampleapp/templates/blog_entry_add.pt
@@ -1,24 +1,27 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
      xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head></head>
+<head>
+</head>
 <body>
-  <form action="add_entry_handler" method="POST">
+  <form action="${request.path_url}" method="POST">
+    <h2 tal:condition="message" tal:content="message"></h2>
     <h1>Add a blog entry</h1>
     <table border="0">
       <tr> 
         <th>Title</th>
-       <td><input type="text" name="title"/></td>
+       <td><input type="text" name="title"/>${title}</td>
       </tr>
       <tr>
         <th>Author</th>
-        <td><input type="text" name="author"/></td>
+        <td><input type="text" name="author"/>${author}</td>
       </tr>
       <tr>
         <th>Body</th>
-        <td><textarea name="body" rows="10" value=""> </textarea></td>
+        <td><textarea name="body" rows="10" cols="80"> ${body}</textarea
+                ></td>
       </tr>
       <tr>
-        <td><input type="submit" name="add" value="Add"/></td>
+        <td><input type="submit" name="form.submitted" value="Add"/></td>
       </tr>
     </table>
   </form>