weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Some changes in the templates loading system — documentation will be updated soon

Browse source 
-    The `simple` theme can now be extended with the syntax `{% extends "!simple/index.html" %}`
     instead of `{% extends "simple/index.html" %}` to avoid conflicts with a `simple/` folder.

-    If a template is missing in a theme, it will be replaced by the
     corresponding template of the `simple` theme, so it's possible to
     make a new theme with only two file: a `base.html` file that
     extends the `base.html` file of the `simple` theme, and a CSS
     stylesheet, for example.
This commit is contained in:
Skami18 2011-07-22 18:45:41 +02:00
commit 17e7fb4509
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pelican/generators.py
View file

@ -31,13 +31,16 @@ class Generator(object):
# templates cache
self._templates = {}
self._templates_path = os.path.expanduser(os.path.join(self.theme, 'templates'))
simple_loader = FileSystemLoader(os.path.join(os.path.dirname(os.path.abspath(__file__)), "themes", "simple", "templates"))
self._env = Environment(
loader=ChoiceLoader([
FileSystemLoader(self._templates_path),
PrefixLoader({'simple' : FileSystemLoader(os.path.join(os.path.dirname(os.path.abspath(__file__)), "themes", "simple", "templates"))})
simple_loader, # implicit inheritance
PrefixLoader({'!simple' : simple_loader}) # explicit inheritance
]),
extensions=self.settings.get('JINJA_EXTENSIONS', []),
)
debug('self._env.list_templates(): {0}'.format(self._env.list_templates()))
# get custom Jinja filters from user settings
custom_filters = self.settings.get('JINJA_FILTERS', {})
@ -52,7 +55,6 @@ class Generator(object):
try:
self._templates[name] = self._env.get_template(name + '.html')
except TemplateNotFound:
debug('self._env.list_templates(): {0}'.format(self._env.list_templates()))
raise Exception('[templates] unable to load %s.html from %s' % (
name, self._templates_path))
return self._templates[name]