# HG changeset patch # User cmlenz # Date 1159349237 0 # Node ID 186d185541839a9cc62b3bb7cbbfbafa5818d26f # Parent 22842c0ca17613e1d8d87d0355092a562c21ef9c Ported [330],[333], and [334] to 0.3.x stable branch. diff --git a/examples/turbogears/genshitest/controllers.py b/examples/turbogears/genshitest/controllers.py --- a/examples/turbogears/genshitest/controllers.py +++ b/examples/turbogears/genshitest/controllers.py @@ -23,6 +23,11 @@ "Genshi", rows=5, cols=40)) + @expose(template="genshi-text:genshitest.templates.plain", + content_type='text/plain; charset=utf-8') + def plain(self): + return dict(name='world') + @expose(template="genshitest.templates.login") def login(self, forward_url=None, previous_url=None, *args, **kw): diff --git a/examples/turbogears/genshitest/templates/plain.txt b/examples/turbogears/genshitest/templates/plain.txt new file mode 100644 --- /dev/null +++ b/examples/turbogears/genshitest/templates/plain.txt @@ -0,0 +1,8 @@ +#choose + #when name + Hello, $name! + #end + #otherwise + Hello, anonymous! + #end +#end diff --git a/examples/turbogears/genshitest/templates/welcome.html b/examples/turbogears/genshitest/templates/welcome.html --- a/examples/turbogears/genshitest/templates/welcome.html +++ b/examples/turbogears/genshitest/templates/welcome.html @@ -33,5 +33,7 @@ ${ET(widget.display())} +
Here's a link to the output of a plain-text template.
+