From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 28 May 2014 13:06:52 +0000 (+0200)
Subject: Fix related media download
X-Git-Tag: 1.4.6^2~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=442acdf68a248ff72ba3456ab5f5ae0a12ccd61c;p=telemeta.git

Fix related media download
---

diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html
index ce73caa7..51f58dcd 100644
--- a/telemeta/templates/telemeta/inc/mediaitem_related.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_related.html
@@ -41,15 +41,14 @@
                                 <dt>{% trans "Credits" %}</dt>
                                 <dd>{{ media.credits }}</dd>
                                 {% dl_field media "mime_type" %}
+                                {% if media.file %}
                                 <dt>{% trans "Download" %}</dt>
                                 <dd>
-                                    {% if media.file %}
-                                        <a href="{% url telemeta-item-related-download item.public_id media.id %}" target="_blank">
-                                        {{ media.file|get_filename }}
+                                    <a href="{% url telemeta-item-related-download item.public_id media.id %}">
+                                     {{ media.file|get_filename }}
                                     </a>
-                                    {% endif %}
-                                {% endif %}
                                 </dd>
+                                {% endif %}
                             </dl>
                             </td>
 
diff --git a/telemeta/templates/telemeta/inc/resource_related.html b/telemeta/templates/telemeta/inc/resource_related.html
index cbc819ee..8cd50fa1 100644
--- a/telemeta/templates/telemeta/inc/resource_related.html
+++ b/telemeta/templates/telemeta/inc/resource_related.html
@@ -41,18 +41,14 @@
                                 <dt>{% trans "Credits" %}</dt>
                                 <dd>{{ media.credits }}</dd>
                                 {% dl_field media "mime_type" %}
-                                <dt>{% trans "URL" %}</dt>
+                                {% if media.file %}
+                                <dt>{% trans "Download" %}</dt>
                                 <dd>
-                                {% if media.url %}
-                                    <a href="{{ media.url }}" target="_blank">{{ media.url }}</a>
-                                {% else %}
-                                    {% if media.file %}
-                                    <a href="{% url telemeta-resource-related type resource.code media.id %}" target="_blank">
-                                    {% url telemeta-resource-related type resource.code media.id %}
+                                    <a href="{% url telemeta-item-related-download item.public_id media.id %}">
+                                     {{ media.file|get_filename }}
                                     </a>
-                                    {% endif %}
-                                {% endif %}
                                 </dd>
+                                {% endif %}
                             </dl>
                             </td>