From 6d427f67e40f46b82e29c3e866c0f8bbdfa6a578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Wed, 25 Nov 2009 23:37:01 +0100 Subject: Reworked menu system --- index.py | 21 ++++++--------------- templates/menu.lst | 3 --- templates/menu.mako | 7 +++++++ templates/root.mako | 15 ++++++++------- 4 files changed, 21 insertions(+), 25 deletions(-) delete mode 100644 templates/menu.lst create mode 100644 templates/menu.mako diff --git a/index.py b/index.py index 0ab9e1b..a6775f3 100755 --- a/index.py +++ b/index.py @@ -21,15 +21,16 @@ class Renderer: self.lookup = TemplateLookup(directories=[appdir('templates')], module_directory = "/tmp/portato/", input_encoding='utf-8', - output_encoding='utf-8') + output_encoding='utf-8', + format_exceptions = True) - def render (self, tpl): + def render (self, tpl, **kwargs): try: t = self.get_tpl(tpl) except mako.exceptions.TopLevelLookupException, e: raise web.notfound(e) - - return partial(t.render, w = web, h = helper) + + return t.render(h = helper, url = helper.url, w = web, **kwargs) __call__ = render @@ -49,18 +50,8 @@ render = Renderer() class Handler: def GET(self, name = '/'): - print "Test" if not name or name == '/': name = 'index' - return render(name)(menulist = self.generate_menu_list()) - - def generate_menu_list (self): - menulist = [] - with open(appdir("templates", "menu.lst")) as menu: - for entry in menu: - entry = entry.strip() - menulist.append((entry, render.get_tpl(entry).uri)) - - return menulist + return render(name) if __name__ == "__main__": app.run() diff --git a/templates/menu.lst b/templates/menu.lst deleted file mode 100644 index 4560d9b..0000000 --- a/templates/menu.lst +++ /dev/null @@ -1,3 +0,0 @@ -index -download -development diff --git a/templates/menu.mako b/templates/menu.mako new file mode 100644 index 0000000..4d6fff4 --- /dev/null +++ b/templates/menu.mako @@ -0,0 +1,7 @@ +<%! + menu = [ + ("/index", "Portato"), + ("/download", "Download"), + ("/development", "Development") + ] +%> diff --git a/templates/root.mako b/templates/root.mako index 669cd21..e625d88 100644 --- a/templates/root.mako +++ b/templates/root.mako @@ -2,7 +2,7 @@ - + ${self.title()} ${self.style()} @@ -10,8 +10,8 @@
@@ -43,19 +43,20 @@ <%def name="style()"> - + <%def name="footer()"> - powered by web.py & mako | + powered by web.py & mako | © 2009. All Rights Reserved. René Neumann | with the help of Free CSS Templates. <%def name="menu()"> + <%namespace file="menu.mako" name="m" /> -- cgit v1.2.3