From 369be7201d9703391d90d488cca8862b903ef15e Mon Sep 17 00:00:00 2001
From: Fredrik Unger <fred@tree.se>
Date: Fri, 20 Feb 2015 15:53:39 +0100
Subject: [PATCH] path: adding suport for a site in a subdir

This was added to support referencing css etc in a example.com/subdir
setting. Creating different sites within a site.
---
 treecutter/link.py    | 4 ++--
 treecutter/page.py    | 6 +++---
 treecutter/sitemap.py | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/treecutter/link.py b/treecutter/link.py
index f482c0b..a6289cd 100644
--- a/treecutter/link.py
+++ b/treecutter/link.py
@@ -44,9 +44,9 @@ class Link():
         for page in self._pages:
             page.render(style)
 
-    def template(self,sitemap,style,tdir):
+    def template(self,sitemap,style,tdir,subdir):
         for page in self._pages:
-            page.template(sitemap,style,tdir)
+            page.template(sitemap,style,tdir,subdir)
 
     def page(self,lang):
         for page in self._pages:
diff --git a/treecutter/page.py b/treecutter/page.py
index 53eeb0d..dea69e6 100644
--- a/treecutter/page.py
+++ b/treecutter/page.py
@@ -46,7 +46,6 @@ class Page():
         ta = self._doc.xpath(u'/db:article/db:info/db:titleabbrev',namespaces=const.XPATH)
         if ta:
             self._menu = unicode(ta[0].text)
-
         dirname = os.path.dirname(self._file)
         cwd = os.getcwd()
         code  = self._doc.xpath(u"//xi:include[@parse='text']",namespaces=const.XPATH)
@@ -138,7 +137,7 @@ class Page():
         os.remove(outfile)
         os.chdir(cwd)
 
-    def template(self,sitemap,style,tdir):
+    def template(self,sitemap,style,tdir,subdir):
         htmlmenu =  sitemap.gen_menu(self._lang,None,"menu")
         levelmenu = sitemap.gen_menu(self._lang,self,"tree")
         langmenu = sitemap.lang_menu(self._lang,self._link)
@@ -150,7 +149,8 @@ class Page():
                         'menu':htmlmenu,
                         'article':article,
                         'levelmenu':levelmenu,
-                        'langmen':langmenu}
+                        'langmen':langmenu,
+                        'subdir':subdir}
 
         s = unicode(style, "utf-8")
         t = s+'index.'+self._lang+'.xhtml.tmpl'
diff --git a/treecutter/sitemap.py b/treecutter/sitemap.py
index 919e8a4..34fb328 100644
--- a/treecutter/sitemap.py
+++ b/treecutter/sitemap.py
@@ -78,7 +78,7 @@ class Sitemap():
         t4 = time()
         print "Render   [%5.2f s]" % (round(t4-t3,2))
         for link in self._tree:
-            link.template(self, self._style, self._tmptarget)
+            link.template(self, self._style, self._tmptarget,self._subdir)
         t5 = time()
         print "Template [%5.2f s]" % (round(t5-t4,2))
         t6 = time()
@@ -98,7 +98,7 @@ class Sitemap():
             sitmaplink.add_page((l,'/sitemap.'+l+'.xml'))
         for l in self._sitelang:
             sitmaplink.page(l).set_article(self.gen_menu(l,None,"tree sitemap"))
-            sitmaplink.page(l).template(self,self._style,self._tmptarget)
+            sitmaplink.page(l).template(self,self._style,self._tmptarget,self._subdir)
         t7 = time()
         print "Sitemap  [%5.2f s]" % (round(t7-t6,2))
 
-- 
2.30.2