From 4c2f00452697031f3c8500f5c95705f17b86b776 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sat, 12 Jul 2008 16:28:05 +0000
Subject: Use a djangoesque layout and naming scheme.

---
 repoze/bfg/sampleapp/browser.py                  | 48 ------------------------
 repoze/bfg/sampleapp/configure.zcml              | 12 +++---
 repoze/bfg/sampleapp/templates/blog.pt           | 22 +++++++++++
 repoze/bfg/sampleapp/templates/blog_entry.pt     | 12 ++++++
 repoze/bfg/sampleapp/templates/blog_entry_add.pt | 26 +++++++++++++
 repoze/bfg/sampleapp/templates/contents.pt       |  6 +++
 repoze/bfg/sampleapp/views.py                    | 48 ++++++++++++++++++++++++
 repoze/bfg/sampleapp/www/blog.pt                 | 22 -----------
 repoze/bfg/sampleapp/www/blog_entry.pt           | 12 ------
 repoze/bfg/sampleapp/www/blog_entry_add.pt       | 26 -------------
 repoze/bfg/sampleapp/www/contents.pt             |  6 ---
 11 files changed, 120 insertions(+), 120 deletions(-)
 delete mode 100644 repoze/bfg/sampleapp/browser.py
 create mode 100644 repoze/bfg/sampleapp/templates/blog.pt
 create mode 100644 repoze/bfg/sampleapp/templates/blog_entry.pt
 create mode 100644 repoze/bfg/sampleapp/templates/blog_entry_add.pt
 create mode 100644 repoze/bfg/sampleapp/templates/contents.pt
 create mode 100644 repoze/bfg/sampleapp/views.py
 delete mode 100644 repoze/bfg/sampleapp/www/blog.pt
 delete mode 100644 repoze/bfg/sampleapp/www/blog_entry.pt
 delete mode 100644 repoze/bfg/sampleapp/www/blog_entry_add.pt
 delete mode 100644 repoze/bfg/sampleapp/www/contents.pt

diff --git a/repoze/bfg/sampleapp/browser.py b/repoze/bfg/sampleapp/browser.py
deleted file mode 100644
index 3d61802bb..000000000
--- a/repoze/bfg/sampleapp/browser.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import time
-
-from webob.exc import HTTPFound
-
-from repoze.bfg.template import TemplateView
-from repoze.bfg.sampleapp.models import BlogEntry
-
-def datestring(dt):
-    return dt.strftime('%Y-%m-%dT%H:%M:%S')
-
-class BlogDefaultView(TemplateView):
-    def getInfo(self):
-        entrydata = []
-        for name, entry in self.context.items():
-            entrydata.append(
-                {
-                'name':name,
-                'title':entry.title,
-                'author':entry.author,
-                'created':datestring(entry.created),
-                }
-                )
-        return {'name':self.context.__name__, 'entries':entrydata}
-
-class BlogEntryDefaultView(TemplateView):
-    def getInfo(self):
-        return {
-            'name':self.context.__name__,
-            'title':self.context.title,
-            'body':self.context.body,
-            'author':self.context.author,
-            'created':datestring(self.context.created),
-            }
-
-class BlogEntryAddView(object):
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
-
-    def __call__(self):
-        author = self.request.params['author']
-        body = self.request.params['body']
-        title = self.request.params['title']
-        name = str(time.time())
-        new_entry = BlogEntry(name, title, body, author)
-        self.context[name] = new_entry
-        return HTTPFound(location='/')
-                      
diff --git a/repoze/bfg/sampleapp/configure.zcml b/repoze/bfg/sampleapp/configure.zcml
index 8b7a3de7c..83862dfb1 100644
--- a/repoze/bfg/sampleapp/configure.zcml
+++ b/repoze/bfg/sampleapp/configure.zcml
@@ -7,7 +7,7 @@
   <!-- the default view for a Blog -->
   <browser:page
       for=".models.IBlog"
-      class=".browser.BlogDefaultView"
+      class=".views.BlogDefaultView"
       template="www/blog.pt"
       permission="repoze.view"
       />
@@ -15,15 +15,15 @@
   <!-- the default view for a BlogEntry -->
   <browser:page
       for=".models.IBlogEntry"
-      class=".browser.BlogEntryDefaultView"
-      template="www/blog_entry.pt"
+      class=".views.BlogEntryDefaultView"
+      template="templates/blog_entry.pt"
       permission="repoze.view"
       />
 
   <!-- the add template for a BlogEntry -->
   <browser:page
       for=".models.IBlog"
-      template="www/blog_entry_add.pt"
+      template="templates/blog_entry_add.pt"
       name="add_entry.html"
       permission="repoze.view"
       />
@@ -31,7 +31,7 @@
   <!-- the add handler for a BlogEntry -->
   <browser:page
       for=".models.IBlog"
-      class=".browser.BlogEntryAddView"
+      class=".views.BlogEntryAddView"
       permission="repoze.view"
       name="add_entry_handler"
       />
@@ -39,7 +39,7 @@
   <!-- the contents view for any mapping (shows dict members) -->
   <browser:page
       for=".models.IMapping"
-      template="www/contents.pt"
+      template="templates/contents.pt"
       name="contents.html"
       permission="repoze.view"
       />
diff --git a/repoze/bfg/sampleapp/templates/blog.pt b/repoze/bfg/sampleapp/templates/blog.pt
new file mode 100644
index 000000000..8ccbe56a2
--- /dev/null
+++ b/repoze/bfg/sampleapp/templates/blog.pt
@@ -0,0 +1,22 @@
+<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>
+  <table border="0">
+    <thead>
+      <th>Title</th>
+      <th>Author</th>
+      <th>Created</th>
+    </thead>
+    <tr tal:repeat="entry info.entries">
+      <td><a href="${entry.name}/">${entry.title}</a></td>
+      <td>${entry.author}</td>
+      <td>${entry.created}</td>
+    </tr>
+  </table>
+  <p>
+    <a href="add_entry.html">Add blog entry</a>
+  </p>
+</body>
+</html>
diff --git a/repoze/bfg/sampleapp/templates/blog_entry.pt b/repoze/bfg/sampleapp/templates/blog_entry.pt
new file mode 100644
index 000000000..20e1b4409
--- /dev/null
+++ b/repoze/bfg/sampleapp/templates/blog_entry.pt
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+<head></head>
+<body>
+  <div tal:define="info view.getInfo()">
+    <p><a href="..">Up</a></p>
+    <h1>${info.title}</h1>
+    <p>by ${info.author}</p>
+    <div tal:content="structure info.body"></div>
+  </div>
+</body>
+</html>
diff --git a/repoze/bfg/sampleapp/templates/blog_entry_add.pt b/repoze/bfg/sampleapp/templates/blog_entry_add.pt
new file mode 100644
index 000000000..b41ae4b02
--- /dev/null
+++ b/repoze/bfg/sampleapp/templates/blog_entry_add.pt
@@ -0,0 +1,26 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+<head></head>
+<body>
+  <form action="add_entry_handler" method="POST">
+    <h1>Add a blog entry</h1>
+    <table border="0">
+      <tr> 
+        <th>Title</th>
+       <td><input type="text" name="title"/></td>
+      </tr>
+      <tr>
+        <th>Author</th>
+        <td><input type="text" name="author"/></td>
+      </tr>
+      <tr>
+        <th>Body</th>
+        <td><textarea name="body" rows="10" value=""> </textarea></td>
+      </tr>
+      <tr>
+        <td><input type="submit" name="add" value="Add"/></td>
+      </tr>
+    </table>
+  </form>
+</body>
+</html>
diff --git a/repoze/bfg/sampleapp/templates/contents.pt b/repoze/bfg/sampleapp/templates/contents.pt
new file mode 100644
index 000000000..eaae20ed5
--- /dev/null
+++ b/repoze/bfg/sampleapp/templates/contents.pt
@@ -0,0 +1,6 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+  <div tal:repeat="name context">
+     <a href="${name}/">${name}</a>
+  </div>
+</div>
diff --git a/repoze/bfg/sampleapp/views.py b/repoze/bfg/sampleapp/views.py
new file mode 100644
index 000000000..3d61802bb
--- /dev/null
+++ b/repoze/bfg/sampleapp/views.py
@@ -0,0 +1,48 @@
+import time
+
+from webob.exc import HTTPFound
+
+from repoze.bfg.template import TemplateView
+from repoze.bfg.sampleapp.models import BlogEntry
+
+def datestring(dt):
+    return dt.strftime('%Y-%m-%dT%H:%M:%S')
+
+class BlogDefaultView(TemplateView):
+    def getInfo(self):
+        entrydata = []
+        for name, entry in self.context.items():
+            entrydata.append(
+                {
+                'name':name,
+                'title':entry.title,
+                'author':entry.author,
+                'created':datestring(entry.created),
+                }
+                )
+        return {'name':self.context.__name__, 'entries':entrydata}
+
+class BlogEntryDefaultView(TemplateView):
+    def getInfo(self):
+        return {
+            'name':self.context.__name__,
+            'title':self.context.title,
+            'body':self.context.body,
+            'author':self.context.author,
+            'created':datestring(self.context.created),
+            }
+
+class BlogEntryAddView(object):
+    def __init__(self, context, request):
+        self.context = context
+        self.request = request
+
+    def __call__(self):
+        author = self.request.params['author']
+        body = self.request.params['body']
+        title = self.request.params['title']
+        name = str(time.time())
+        new_entry = BlogEntry(name, title, body, author)
+        self.context[name] = new_entry
+        return HTTPFound(location='/')
+                      
diff --git a/repoze/bfg/sampleapp/www/blog.pt b/repoze/bfg/sampleapp/www/blog.pt
deleted file mode 100644
index 8ccbe56a2..000000000
--- a/repoze/bfg/sampleapp/www/blog.pt
+++ /dev/null
@@ -1,22 +0,0 @@
-<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>
-  <table border="0">
-    <thead>
-      <th>Title</th>
-      <th>Author</th>
-      <th>Created</th>
-    </thead>
-    <tr tal:repeat="entry info.entries">
-      <td><a href="${entry.name}/">${entry.title}</a></td>
-      <td>${entry.author}</td>
-      <td>${entry.created}</td>
-    </tr>
-  </table>
-  <p>
-    <a href="add_entry.html">Add blog entry</a>
-  </p>
-</body>
-</html>
diff --git a/repoze/bfg/sampleapp/www/blog_entry.pt b/repoze/bfg/sampleapp/www/blog_entry.pt
deleted file mode 100644
index 20e1b4409..000000000
--- a/repoze/bfg/sampleapp/www/blog_entry.pt
+++ /dev/null
@@ -1,12 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head></head>
-<body>
-  <div tal:define="info view.getInfo()">
-    <p><a href="..">Up</a></p>
-    <h1>${info.title}</h1>
-    <p>by ${info.author}</p>
-    <div tal:content="structure info.body"></div>
-  </div>
-</body>
-</html>
diff --git a/repoze/bfg/sampleapp/www/blog_entry_add.pt b/repoze/bfg/sampleapp/www/blog_entry_add.pt
deleted file mode 100644
index b41ae4b02..000000000
--- a/repoze/bfg/sampleapp/www/blog_entry_add.pt
+++ /dev/null
@@ -1,26 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head></head>
-<body>
-  <form action="add_entry_handler" method="POST">
-    <h1>Add a blog entry</h1>
-    <table border="0">
-      <tr> 
-        <th>Title</th>
-       <td><input type="text" name="title"/></td>
-      </tr>
-      <tr>
-        <th>Author</th>
-        <td><input type="text" name="author"/></td>
-      </tr>
-      <tr>
-        <th>Body</th>
-        <td><textarea name="body" rows="10" value=""> </textarea></td>
-      </tr>
-      <tr>
-        <td><input type="submit" name="add" value="Add"/></td>
-      </tr>
-    </table>
-  </form>
-</body>
-</html>
diff --git a/repoze/bfg/sampleapp/www/contents.pt b/repoze/bfg/sampleapp/www/contents.pt
deleted file mode 100644
index eaae20ed5..000000000
--- a/repoze/bfg/sampleapp/www/contents.pt
+++ /dev/null
@@ -1,6 +0,0 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:tal="http://xml.zope.org/namespaces/tal">
-  <div tal:repeat="name context">
-     <a href="${name}/">${name}</a>
-  </div>
-</div>
-- 
cgit v1.2.3