From: yomguy <yomguy@parisson.com>
Date: Sun, 12 Aug 2012 08:09:44 +0000 (+0200)
Subject: Merge branch 'feature/playicon' into dev
X-Git-Tag: 0.8.5~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9655c31275b1d313ae87a29511508ea423ec48c3;p=teleforma.git

Merge branch 'feature/playicon' into dev

Conflicts:
	teleforma/templates/teleforma/inc/media_list.html
---

9655c31275b1d313ae87a29511508ea423ec48c3
diff --cc teleforma/templates/teleforma/inc/media_list.html
index 3f6f5aad,269deada..cb6fedfa
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@@ -14,17 -14,19 +14,19 @@@
            {% if media.type == 'webm' %}
              <tr>
              <td {% if forloop.first %}class="border-top"{% endif %} width="230px" style="vertical-align:middle">
-                 <a href="{% url teleforma-media-detail media.id %}" title="{% trans "Play" %}">
-                  {% if media.item.related.all %}
-                  {% for related in media.item.related.all %}
-                   {% if related.title == "preview" %}
-                   <img src="{{ MEDIA_URL }}{{ related.file }}" width="100%" alt="{% trans 'Click here' %}" />
-                   {% endif %}
-                  {% endfor %}
-                  {% else %}
-                   {% trans 'Click here' %}
-                  {% endif %}
-                 </a>
+             <a href="{% url teleforma-media-detail media.id %}" title="{% trans "Play" %}">
 -            {% if media.item.related.all %}
++	   {% if media.item.related.all %}
+              {% for related in media.item.related.all %}
+               {% if related.title == "preview" %}
+                 <div style="background: no-repeat url('{{ MEDIA_URL }}{{ related.file }}') 0 0; background-size: 100%;">
+                  <img src="{{ STATIC_URL }}teleforma/images/play_168.png" width="100%" alt="{% trans 'Click here' %}" />
+                 </div>
+               {% endif %}
+              {% endfor %}
+             {% else %}
+               {% trans 'Click here' %}
+             {% endif %}
+             </a>
              </td>
              <td {% if forloop.first %}class="border-top"{% endif %} width="60%" style="padding-left: 1em;">
                  <div>