From feed72fa26a8a01153612b065f18c562b3a3a405 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 6 May 2016 09:37:24 +0200 Subject: [PATCH] video index --- prosopopee/prosopopee.py | 2 +- prosopopee/themes/exposure/static/css/style.css | 5 +++++ prosopopee/themes/exposure/templates/index.html | 2 +- .../themes/exposure/templates/sections/full-picture.html | 2 +- .../themes/exposure/templates/sections/pictures-group.html | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index 06b0c97..d0a72b1 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -41,7 +41,7 @@ class Video(object): def __init__(self, options): # assuming string if not isinstance(options, dict): - options = {"video": options} + options = {"name": options} # used for caching, if it's modified -> regenerate self.options = SETTINGS["ffmpeg"].copy() self.options.update(options) diff --git a/prosopopee/themes/exposure/static/css/style.css b/prosopopee/themes/exposure/static/css/style.css index d3e2a59..abead47 100644 --- a/prosopopee/themes/exposure/static/css/style.css +++ b/prosopopee/themes/exposure/static/css/style.css @@ -252,3 +252,8 @@ nav ul li > a.item-menu::before { letter-spacing: 3px; font-style: normal; } + +.gallery-cover video.fillWidth, +.gallery-cover img.fillWidth { + height: 100%; +} diff --git a/prosopopee/themes/exposure/templates/index.html b/prosopopee/themes/exposure/templates/index.html index 09adad0..128e027 100644 --- a/prosopopee/themes/exposure/templates/index.html +++ b/prosopopee/themes/exposure/templates/index.html @@ -32,11 +32,11 @@ {% endif %} {% if video %} + {% set video = "" %} {% else %} {% endif %} diff --git a/prosopopee/themes/exposure/templates/sections/full-picture.html b/prosopopee/themes/exposure/templates/sections/full-picture.html index 24e9e8e..7367259 100644 --- a/prosopopee/themes/exposure/templates/sections/full-picture.html +++ b/prosopopee/themes/exposure/templates/sections/full-picture.html @@ -25,7 +25,7 @@ - + {% else %} diff --git a/prosopopee/themes/exposure/templates/sections/pictures-group.html b/prosopopee/themes/exposure/templates/sections/pictures-group.html index 8cfcefe..b0dc977 100644 --- a/prosopopee/themes/exposure/templates/sections/pictures-group.html +++ b/prosopopee/themes/exposure/templates/sections/pictures-group.html @@ -19,6 +19,7 @@ + {% set video = "" %} {% else %}