From 5eae7d671f98c23f075e9400791dd05ba4e8daa3 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 2 Nov 2016 10:07:05 +0100 Subject: [PATCH 1/2] fix some stuff --- prosopopee/prosopopee.py | 2 +- prosopopee/themes/exposure/templates/gallery-index.html | 1 + prosopopee/themes/exposure/templates/sections/author.html | 2 +- prosopopee/themes/exposure/templates/sections/full-picture.html | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index 3e5481d..2cce4ec 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -99,7 +99,7 @@ class Video(object): return "" def generate_thumbnail(self, gm_geometry): - thumbnail_name = ".".join(self.name.split(".")[:-1]) + "-%s.png" % gm_geometry + thumbnail_name = ".".join(self.name.split(".")[:-1]) + "-%s.jpg" % gm_geometry source, target = self.base_dir.joinpath(self.name), self.target_dir.joinpath(thumbnail_name) diff --git a/prosopopee/themes/exposure/templates/gallery-index.html b/prosopopee/themes/exposure/templates/gallery-index.html index 2d87cf6..f221ae7 100644 --- a/prosopopee/themes/exposure/templates/gallery-index.html +++ b/prosopopee/themes/exposure/templates/gallery-index.html @@ -10,6 +10,7 @@ + {{ gallery.title }} · {{ settings.title }} diff --git a/prosopopee/themes/exposure/templates/sections/author.html b/prosopopee/themes/exposure/templates/sections/author.html index 3676d4c..e38e196 100644 --- a/prosopopee/themes/exposure/templates/sections/author.html +++ b/prosopopee/themes/exposure/templates/sections/author.html @@ -1,7 +1,7 @@ {% set image = Image(section.image) %} {{ image.copy() }}
- +
Story by

{{ section.name }}

diff --git a/prosopopee/themes/exposure/templates/sections/full-picture.html b/prosopopee/themes/exposure/templates/sections/full-picture.html index dd5331e..dfb5467 100644 --- a/prosopopee/themes/exposure/templates/sections/full-picture.html +++ b/prosopopee/themes/exposure/templates/sections/full-picture.html @@ -32,7 +32,7 @@ {% set image = Image(section.image) %} {{ image.copy() }} -
+
{% if section.text %}
From b8dda7bcf72d69ab1b4fc4071fa953da48bd4b07 Mon Sep 17 00:00:00 2001 From: Beudbeud Date: Wed, 2 Nov 2016 10:58:57 +0100 Subject: [PATCH 2/2] disable autoload --- prosopopee/themes/exposure/templates/gallery-index.html | 5 +++++ .../themes/exposure/templates/sections/bordered-picture.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/prosopopee/themes/exposure/templates/gallery-index.html b/prosopopee/themes/exposure/templates/gallery-index.html index f221ae7..9406c61 100644 --- a/prosopopee/themes/exposure/templates/gallery-index.html +++ b/prosopopee/themes/exposure/templates/gallery-index.html @@ -10,7 +10,12 @@ + {% if gallery.description %} + {% endif %} + {% if gallery.lang %} + + {% endif %} {{ gallery.title }} · {{ settings.title }} diff --git a/prosopopee/themes/exposure/templates/sections/bordered-picture.html b/prosopopee/themes/exposure/templates/sections/bordered-picture.html index 0c8e907..cc70590 100644 --- a/prosopopee/themes/exposure/templates/sections/bordered-picture.html +++ b/prosopopee/themes/exposure/templates/sections/bordered-picture.html @@ -9,7 +9,7 @@
-