--- a/degal/commands/main.py	Sun Jun 14 22:52:07 2009 +0300
+++ b/degal/commands/main.py	Sun Jun 14 22:59:29 2009 +0300
@@ -10,7 +10,7 @@
     ctx.log_debug("%s", image.html)
 
     # render output
-    tpl = templates.master(ctx.gallery, image.title, image.html, 
+    tpl = templates.master(ctx.gallery, image, 
         templates.image_page(image)
     )
     
@@ -65,17 +65,17 @@
     # render each page separately
     for page in xrange(folder.page_count) :
         # output .html page
-        html_file = folder.html_file(page)
+        html = folder.html_page(page)
     
-        ctx.log_debug("%s", html_file)
+        ctx.log_debug("%s", html)
         
         # render template
-        tpl = templates.master(ctx.gallery, folder.title, html_file,
+        tpl = templates.master(ctx.gallery, folder,
             templates.folder_page(folder, page)
         )
 
         # write output
-        tpl.render_file(html_file)
+        tpl.render_file(html)
 
 def render_folder (ctx, folder) :
     """