]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorJérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Wed, 15 Feb 2017 13:10:13 +0000 (14:10 +0100)
committerJérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Wed, 15 Feb 2017 13:10:13 +0000 (14:10 +0100)
# Conflicts:
# app/templates/media/media/includes/media_card.html

1  2 
app/templates/media/media/includes/media_card.html

index 6f29c2b09800ddcd13f04c669694bb15705bdc79,a7671a1a156e5e765d3ec709961340cb2d53a72e..0aebd95e176ff5e19dfd77fbd2399f68bc6d170c
@@@ -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 %}">