# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1411852211 25200
# Node ID 9889c18b914f4280783b778ad0097f5dcd27beda
# Parent  3eef607e62d4f9464007c54944b9444b84010d0f
Templates are now in a specific endpoint instead of just a "known" folder.

diff -r 3eef607e62d4 -r 9889c18b914f wikked/resolver.py
--- a/wikked/resolver.py	Sat Sep 27 14:07:24 2014 -0700
+++ b/wikked/resolver.py	Sat Sep 27 14:10:11 2014 -0700
@@ -235,16 +235,17 @@
                 return ''
 
         # Get the included page. First, try with a page in the special
-        # `Templates` folder.
+        # `templates` endpoint, if the included page is not specified with an
+        # absolute path.
         include_url = opts['url']
         if include_url[0] != '/':
             include_url = self.ctx.getAbsoluteUrl(
-                    self.page.wiki.templates_url + include_url,
-                    self.page.url)
+                    include_url,
+                    self.page.wiki.templates_url)
             if not self.wiki.pageExists(include_url):
-                include_url = self.ctx.getAbsoluteUrl(opts['url'], self.page.url)
-        else:
-            include_url = self.ctx.getAbsoluteUrl(include_url, self.page.url)
+                include_url = self.ctx.getAbsoluteUrl(opts['url'],
+                                                      self.page.url)
+        # else: include URL is absolute.
 
         # Check for circular includes.
         if include_url in self.ctx.url_trail:
@@ -420,12 +421,10 @@
 
             if v[0] != '/':
                 include_url = self.ctx.getAbsoluteUrl(
-                        self.page.wiki.templates_url + v,
-                        page.url)
+                        v, self.page.wiki.templates_url)
                 if not self.wiki.pageExists(include_url):
                     include_url = self.ctx.getAbsoluteUrl(v, page.url)
-            else:
-                include_url = self.ctx.getAbsoluteUrl(v, page.url)
+
             included_urls.append(include_url)
 
         # Recurse into included pages.
diff -r 3eef607e62d4 -r 9889c18b914f wikked/resources/defaults.cfg
--- a/wikked/resources/defaults.cfg	Sat Sep 27 14:07:24 2014 -0700
+++ b/wikked/resources/defaults.cfg	Sat Sep 27 14:10:11 2014 -0700
@@ -3,7 +3,7 @@
 default_extension=md
 naming_policy=capitalize
 main_page=Main page
-templates_dir=Templates
+templates_endpoint=templates
 indexer=whoosh
 database=sql
 database_url=sqlite:///%(root)s/.wiki/wiki.db