From: Jérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Date: Wed, 15 Feb 2017 13:10:13 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=caf440b754a1a0673c47a429df1020d100de4658;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

# Conflicts:
#	app/templates/media/media/includes/media_card.html
---

caf440b754a1a0673c47a429df1020d100de4658
diff --cc app/templates/media/media/includes/media_card.html
index 6f29c2b0,a7671a1a..0aebd95e
--- a/app/templates/media/media/includes/media_card.html
+++ b/app/templates/media/media/includes/media_card.html
@@@ -3,12 -2,16 +2,16 @@@
  <div class="">
      <div class="media-box media-box--{{object|get_media_type|lower}}">
          <a class="media-box__image-container" href="{% url 'organization-media-overlay' object.type object.slug %}" data-video-overlay>
 -            <figure class="media-box__image media-box__image--video">
 +            <figure class="media-box__image media-box__image--{{ object|get_media_type|lower }}">
-                 {% if object.poster_url %}
-                     <img src="{{ object.poster_url }}">
-                 {% else %}
-                     <div class="media-box__placeholder"></div>
-                 {% endif %}
+                 {% with object.images.all|get_type:'card' as images %}
+                     {% if object.poster_url %}
+                         <img src="{{ object.poster_url }}">
+                     {% elif images %}
+                         <img class="lazyload" src="{{ MEDIA_URL }}{% thumbnail images.0.file 720 435 %}" data-original="">
+                     {% else %}
+                         <div class="media-box__placeholder"></div>
+                     {% endif %}
+                 {% endwith %}
              </figure>
          </a>
          <a class="media-box__content" href="{% url 'organization-media-detail' object|get_media_type|lower object.slug %}">