--- a/degal/templates.py	Sun Jun 14 22:52:07 2009 +0300
+++ b/degal/templates.py	Sun Jun 14 22:59:29 2009 +0300
@@ -60,14 +60,14 @@
         Returns a link to the given folder from the given page
     """
 
-    return link_from(from_page, folder.html_file(page))(folder.title)
+    return link_from(from_page, folder.html_page(page))(folder.title)
 
 def folder_page_link (folder, page) :
     """
         Returns a partial a tag from the folder itself to the given page number
     """
 
-    return link_from(folder, folder.html_file(page))
+    return link_from(folder, folder.html_page(page))
 
 def folder_paginate (folder, cur_page) :
     """
@@ -134,14 +134,14 @@
         # shorturl
     ]
 
-def breadcrumb_trail (gallery, page) :
+def breadcrumb_trail (gallery, cur_page) :
     """
         Yield the breadcrumb elements
     """
 
     is_first = True
     
-    for segment in gallery.path_to(page) :
+    for page in gallery.path_to(cur_page) :
         # spacers
         if is_first :
             is_first = False
@@ -150,9 +150,7 @@
             yield html.raw("»")
 
         # link from this page to sub-page
-        # XXX: title
-        yield link_from(page, segment)(segment.name.title())
-
+        yield link_from(cur_page, page.html)(page.title)
 
 def breadcrumb (gallery, page) :
     """
@@ -163,17 +161,17 @@
         breadcrumb_trail(gallery, page)
     )
 
-def master (gallery, title, page, body) :
+def master (gallery, page, body) :
     """
         Render the full-page HTML layout for the given page with title and body
     """
 
     return html.XHTMLDocument(
         head=[
-            tags.title(title),
+            tags.title(page.title),
             
             # stylesheet
-            tags.link(rel='Stylesheet', type='text/css', href=gallery.stylesheet.path_from(page))
+            tags.link(rel='Stylesheet', type='text/css', href=gallery.stylesheet.path_from(page.html))
         ],
 
         body=[