# HG changeset patch
# User cmlenz
# Date 1188602007 0
# Node ID 2f4dc32a13e7d73e39fa9966ab3655b452909c13
# Parent 3110105824e8a414381483f7c9c816f635c7588f
GenshiTutorial: minor tweaks to sync with Wiki page.
diff --git a/examples/tutorial/geddit/controller.py b/examples/tutorial/geddit/controller.py
--- a/examples/tutorial/geddit/controller.py
+++ b/examples/tutorial/geddit/controller.py
@@ -38,14 +38,6 @@
return template.render(links=links)
@cherrypy.expose
- @template.output('info.html')
- def info(self, id):
- link = self.data.get(id)
- if not link:
- raise cherrypy.NotFound()
- return template.render(link=link)
-
- @cherrypy.expose
@template.output('submit.html')
def submit(self, cancel=False, **data):
if cherrypy.request.method == 'POST':
@@ -65,6 +57,14 @@
return template.render(errors=errors) | HTMLFormFiller(data=data)
@cherrypy.expose
+ @template.output('info.html')
+ def info(self, id):
+ link = self.data.get(id)
+ if not link:
+ raise cherrypy.NotFound()
+ return template.render(link=link)
+
+ @cherrypy.expose
@template.output('comment.html')
def comment(self, id, cancel=False, **data):
link = self.data.get(id)
diff --git a/examples/tutorial/geddit/templates/index.html b/examples/tutorial/geddit/templates/index.html
--- a/examples/tutorial/geddit/templates/index.html
+++ b/examples/tutorial/geddit/templates/index.html
@@ -5,24 +5,17 @@
News
-
News
-
+
-
${link.title}
posted by ${link.username} at ${link.time.strftime('%x %X')}
-
- Submit new link
+ Submit new link