prenex/magcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into video

Browse Source
This commit is contained in:
Laurent Peuch 2016-05-04 10:10:52 +02:00
commit 2e9cb70407
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/authors.rst
View File

@ -10,4 +10,4 @@ By chronological order:
* beudbeud * beudbeud
* CapsLock * CapsLock
* Julien Malik * Julien Malik
* Titoko

14
prosopopee/prosopopee.py
View File

@ -233,13 +233,15 @@ def main():
error(theme_path, "'%s' is not an existing theme, available themes are '%s'" % (available_themes)) error(theme_path, "'%s' is not an existing theme, available themes are '%s'" % (available_themes))
prosopopee_templates_dir = os.path.realpath(os.path.join(os.getcwd(), "templates")) templates_dir = [
project_templates_dir = os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", theme, "templates") os.path.realpath(os.path.join(os.getcwd(), "templates")),
os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", theme, "templates")
]
templates = Environment(loader=FileSystemLoader([ if theme != "exposure":
prosopopee_templates_dir, templates_dir.append(os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", "exposure", "templates"))
project_templates_dir
])) templates = Environment(loader=FileSystemLoader(templates_dir))
index_template = templates.get_template("index.html") index_template = templates.get_template("index.html")
gallery_index_template = templates.get_template("gallery-index.html") gallery_index_template = templates.get_template("gallery-index.html")