Fix merge issues

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 400cc1bae9fbaa32dea6617c4f3c567293fb8b3c..76c2de5ff709878af08c0921fbd5b7907234474f 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -3,9 +3,9 @@
 {% load i18n %}
 
 {% if course.media.all|from_course_type:type|from_period:period %}
-<div class="course_content">
+<div class="course_content content_video">
 <div class="course_subtitle">
-    <h3><img src="{{ STATIC_URL }}telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Passed conferences"%}</h3>
+    <h3><img src="/static/telemeta/images/item_title.png" width="10px" alt="" /> {% trans title %}</h3>
 </div>
     <table class="listing" width="100%">
     <tbody>
@@ -20,14 +20,17 @@
               {% if related.title == "preview" %}
                {% thumbnail related.file "168x96" as im %}
                 <div style="background: no-repeat url('{{ im.url }}') 0 1px; background-size: 100%; background-color: #dfdfdf;">
-                 <img src="{{ STATIC_URL }}teleforma/images/play_168.png" width="100%" alt="{% trans 'Click here' %}" />
+                 <img src="/static/teleforma/images/play_168.png" width="100%" alt="{% trans 'Click here' %}" />
                 </div>
                {% endthumbnail %}
+              {% else %}
+               {% trans 'Click here' %}
               {% endif %}
              {% endfor %}
             {% else %}
-              {% trans 'Click here' %}
+              <div>{% trans 'Click here' %}</div>
             {% endif %}
+            <div>{% trans 'Click here' %}</div>
             </a>
             </td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="60%" style="padding-left: 1em;">
@@ -47,14 +50,16 @@
             </td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="10%" align="center">
             {% if media.is_published and user.is_staff %}
-             <img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans ' published' %}" />
+             <img src="/static/telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans ' published' %}" />
             {% elif not media.is_published and user.is_staff %}
-             <img src="{{ STATIC_URL }}telemeta/images/delete.png" style="vertical-align:middle" alt="" title="{% trans ' rejected' %}" />
+             <img src="/static/telemeta/images/delete.png" style="vertical-align:middle" alt="" title="{% trans ' rejected' %}" />
             {% endif %}
-            {% if media.item.file %}
-             <a href="{{ MEDIA_URL }}{{ media.item.file }}">
-              <img src="{{ STATIC_URL }}teleforma/images/download_media.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" />
-             </a>
+            {% if media.item.file and media.is_published or user.is_superuser or user.is_staff %}
+                {% if not "video" in media.mime_type or perms.telemeta.can_play_all_items or request.user_agent.os.family == 'iOS' %}
+                    <a href="{% url teleforma-media-download period.id media.id %}">
+                        <img src="/static/teleforma/images/download_media.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" />
+                    </a>
+                {% endif %}
             {% endif %}
             </td>
             </tr>