Reworked menu system

1 files changed, 6 insertions, 15 deletions

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()