]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'feature/playicon' into dev
authoryomguy <yomguy@parisson.com>
Sun, 12 Aug 2012 08:09:44 +0000 (10:09 +0200)
committeryomguy <yomguy@parisson.com>
Sun, 12 Aug 2012 08:09:44 +0000 (10:09 +0200)
Conflicts:
teleforma/templates/teleforma/inc/media_list.html

1  2 
teleforma/templates/teleforma/inc/media_list.html

index 3f6f5aadd2c74075816dac6ac7eb7b2e077c12f0,269deadadff36a8bd6b21c4762b1c02340fddef8..cb6fedfa1ec135cdb2a8a340c97169a7aa2361ab
            {% 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>