From 9a9ece759cf42fde52e18f300c1cc513db4a1669 Mon Sep 17 00:00:00 2001 From: danigm Date: Sat, 25 Apr 2009 16:20:14 +0200 Subject: [PATCH] Added templetor support to page creator --- modules/page/page.py | 18 ++++++++++++++---- modules/page/pages/templetor | 10 ++++++++++ modules/page/templates/add.html | 8 ++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 modules/page/pages/templetor diff --git a/modules/page/page.py b/modules/page/page.py index cebef19..7879db1 100644 --- a/modules/page/page.py +++ b/modules/page/page.py @@ -7,6 +7,7 @@ import codecs MOD = 'page' markdown = kisspi.web.utils.safemarkdown +templetor = kisspi.web.template.Template def get_page(page): path = kisspi.get_module_path(MOD) + 'pages/' @@ -22,6 +23,14 @@ def get_page(page): msg = ''.join(msg[1:]) return date, msg +def get_html(msg): + if msg.startswith('#templetor'): + result = templetor(msg[10:])().__body__ + html = result + else: + html = markdown(msg) + return html + class Show: title = '' def GET(self, page): @@ -39,10 +48,9 @@ Page '%s' not exists return not_found last_edited = ' Last edited: %s ' % date.ctime() - return markdown(msg) + edit_button + last_edited + html = get_html(msg) - def POST(self, *args): - return str(args) + return html + edit_button + last_edited class Edit: title = '' @@ -71,6 +79,8 @@ class Edit: kisspi.redirect('/page/'+page) else: title = 'Preview - ' + page - prev = markdown(newpage) + + prev = get_html(newpage) + return render.add(newpage, prev) diff --git a/modules/page/pages/templetor b/modules/page/pages/templetor new file mode 100644 index 0000000..f420704 --- /dev/null +++ b/modules/page/pages/templetor @@ -0,0 +1,10 @@ +1240668863.04 +#templetor + +

Templetor test

+

+$for i in range(10): + $i
+ +test +

\ No newline at end of file diff --git a/modules/page/templates/add.html b/modules/page/templates/add.html index 12a2360..7d78f6f 100644 --- a/modules/page/templates/add.html +++ b/modules/page/templates/add.html @@ -2,6 +2,14 @@ $def with (text='', prev='')
$:prev
+

+Use markdown syntax. +

+ +

+You can use webpy templetor putting as first line #templetor +

+
-- 2.1.4