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.

diff --git a/treecutter/link.py b/treecutter/link.py
index f482c0bf2f9bd4299c395dba7852a89a26314820..a6289cdc40be258d8483d8bc8147f8c47ab0ebc4 100644 (file)
--- 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 53eeb0d40baa357f18c7f76d98404b8ed1206518..dea69e6992a6d505ac5ccf448e0551f20aeb07f7 100644 (file)
--- 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 919e8a4a2c08d5883e628d9efc390f87d36f4edd..34fb328a476bca305d5d1937e5194bba7f441799 100644 (file)
--- 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))