From deecbc17e375be8e1bf2c563208bdedb8cd98a0f Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 24 Feb 2016 10:46:47 +0100 Subject: [PATCH 1/2] fix setup.py --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4dee87f..d914674 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,6 @@ import os from setuptools import setup -from operator import add try: from pypandoc import convert @@ -31,6 +30,6 @@ setup(name='prosopopee', keywords='', include_package_data=True, package_data={ - 'prosopopee': reduce(add, [[x[0].replace("prosopopee/", "", 1) + y for y in x[2]] for x in os.walk("prosopopee/themes/")], []), + 'prosopopee': ['themes/*/*/*/*'] + ['themes/*/templates/*.html'] + ['themes/*/templates/section/*.html'] }, ) From 11513e6461a3fba291a6fcbc9d0f7670237330e8 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 24 Feb 2016 16:51:59 +0100 Subject: [PATCH 2/2] fix material theme --- prosopopee/themes/material/templates/gallery-index.html | 8 -------- prosopopee/themes/material/templates/index.html | 4 ++-- .../themes/material/templates/sections/panorama.html | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/prosopopee/themes/material/templates/gallery-index.html b/prosopopee/themes/material/templates/gallery-index.html index fbd270a..6af5a77 100644 --- a/prosopopee/themes/material/templates/gallery-index.html +++ b/prosopopee/themes/material/templates/gallery-index.html @@ -16,14 +16,6 @@
- {% for section in gallery.sections %} {% include "sections/" + section.type + ".html" %} diff --git a/prosopopee/themes/material/templates/index.html b/prosopopee/themes/material/templates/index.html index a5cb813..ca50a93 100644 --- a/prosopopee/themes/material/templates/index.html +++ b/prosopopee/themes/material/templates/index.html @@ -26,10 +26,10 @@ {% set cover = Image(gallery.cover) %} {{ cover.copy() }} - {{ gallery.title }} + {{ gallery.title }}
- {% if gallery.sub_title %}{{ gallery.sub_title }}{% endif %} + {% if gallery.sub_title %}{{ gallery.sub_title }}{% endif %} {% if gallery.tags %}{% for tag in gallery.tags -%}
{{ tag }}
{% endfor -%}{% endif %}
diff --git a/prosopopee/themes/material/templates/sections/panorama.html b/prosopopee/themes/material/templates/sections/panorama.html index b610259..215e78d 100644 --- a/prosopopee/themes/material/templates/sections/panorama.html +++ b/prosopopee/themes/material/templates/sections/panorama.html @@ -1,5 +1,5 @@ {% set image = Image(section.image) %} {{ image.copy() }} -
- +
+