pages: Tree titles
authorTero Marttila <terom@paivola.fi>
Sun, 14 Sep 2014 04:41:46 +0300
changeset 215 d72e797a8977
parent 214 1048b9081edc
child 216 e89e3f3a60db
pages: Tree titles
qmsk_www_pages/pages.py
--- a/qmsk_www_pages/pages.py	Sun Sep 14 04:16:52 2014 +0300
+++ b/qmsk_www_pages/pages.py	Sun Sep 14 04:41:46 2014 +0300
@@ -52,8 +52,13 @@
             if not os.path.isdir(path):
                 raise NotFound()
 
+            # title
+            title = tree.item_title(name)
+
             parents += (tree, )
-            tree = cls(path, name, parents, site)
+            tree = cls(path, name, parents, site,
+                    title   = title,
+            )
 
         return tree
 
@@ -172,6 +177,9 @@
         
         if not name:
             name = self.INDEX
+            title_default = self.title
+        else:
+            title_default = None
 
         for path, file_name, file_type in self.scan():
             # match on name
@@ -188,7 +196,7 @@
                 continue
             
             # out
-            title = self.item_title(file_name)
+            title = self.item_title(file_name) or title_default
 
             return page_type(
                 path    = path,