X-Git-Url: https://source.tree.se/git?p=treecutter.git;a=blobdiff_plain;f=treecutter%2Fpage.py;fp=treecutter%2Fpage.py;h=c05ef90b4573efd07aeac697e5f3b44770dbd659;hp=3da0eef87674995d46712ec9171b9fbff89ad358;hb=86815abce0db2e449bc3b2cbc6790885f73d41d9;hpb=5ee26cbf373af8fe76d549f4f1cba1f240146a2b

diff --git a/treecutter/page.py b/treecutter/page.py
index 3da0eef..c05ef90 100644
--- a/treecutter/page.py
+++ b/treecutter/page.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 import os
 import subprocess
 import tempfile
@@ -26,6 +27,8 @@ class Page():
         self._title = None
         self._menu = None
         self._rendered_article = None
+        self._template = 'index'
+        self._status = None
 
     def language(self):
         return self._lang
@@ -44,6 +47,9 @@ class Page():
         (self._title, self._menu) = self._doc.title()
         self._doc.expand_imageobjects()
         self._doc.parse_xincludes()
+        self._doc.xinclude()
+        self._template = self._doc.role()
+        self._status = self._doc.status()
         doc = self._doc.collect_links()
         img = self._doc.collect_images()
         vid = self._doc.collect_videos()
@@ -54,7 +60,7 @@ class Page():
         self._rendered_article = self._doc.xslt(transform['xhtml5'])
 
     def template(self,sitemap,style,tdir,subdir):
-        htmlmenu =  sitemap.gen_menu(self._lang,None,"menu")
+        htmlmenu =  sitemap.gen_menu(self._lang,None,"links")
         levelmenu = sitemap.gen_menu(self._lang,self,"tree")
         langmenu = sitemap.lang_menu(self._lang,self._link)
         article = self._rendered_article
@@ -69,7 +75,7 @@ class Page():
                         'subdir':subdir}
 
         s = unicode(style, "utf-8")
-        t = s+'index.'+self._lang+'.xhtml.tmpl'
+        t = s+self._template+'.'+self._lang+'.xhtml'
         template = templateEnv.get_template( t )
         templateout = template.render( templateVars )