From 528d187647c582f7a090345316876bdd4c16a1cb Mon Sep 17 00:00:00 2001 From: Thomas Nonglaton Date: Sun, 1 May 2016 16:23:23 +0200 Subject: [PATCH 1/2] Use exposure templates files if current theme don't override it --- prosopopee/prosopopee.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index 275cf94..5601e28 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -137,13 +137,15 @@ def main(): 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")) - project_templates_dir = os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", theme, "templates") + templates_dir = [ + 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([ - prosopopee_templates_dir, - project_templates_dir - ])) + if theme != "exposure": + templates_dir.append(os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", "exposure", "templates")) + + templates = Environment(loader=FileSystemLoader(templates_dir)) index_template = templates.get_template("index.html") gallery_index_template = templates.get_template("gallery-index.html") From 0e87e54e874161e0d2d9a44f66ebcbdc1e6d9b3f Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Mon, 2 May 2016 01:06:37 +0200 Subject: [PATCH 2/2] [doc] add titoko to authors --- docs/authors.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/authors.rst b/docs/authors.rst index d20041b..7fbb63f 100644 --- a/docs/authors.rst +++ b/docs/authors.rst @@ -10,4 +10,4 @@ By chronological order: * beudbeud * CapsLock * Julien Malik - + * Titoko