made the download links consistent

diff --git a/mediagoblin/templates/mediagoblin/media_displays/ascii.html b/mediagoblin/templates/mediagoblin/media_displays/ascii.html
index 6330595b541291d5ec13c800f3f71e835cfcef43..3cc5e0ab4210d539f74bed8e62be3c8e90509740 100644 (file)
--- a/mediagoblin/templates/mediagoblin/media_displays/ascii.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/ascii.html
@@ -27,7 +27,11 @@
       {%- endautoescape -%}
     </pre>
   </div>
+{% endblock %}
+
+{% block mediagoblin_sidebar %}
   {% if 'original' in media.media_files %}
+  <h3>{% trans %}Download{% endtrans %}</h3>
   <p>
     <a href="{{ request.app.public_store.file_url(
             media.media_files['original']) }}">

diff --git a/mediagoblin/templates/mediagoblin/media_displays/audio.html b/mediagoblin/templates/mediagoblin/media_displays/audio.html
index 9713aa49a405cf762f37e9e31cd80bad8518d791..95bc6e8828df56a965f510fbd439ca333868597b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/media_displays/audio.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/audio.html
@@ -57,7 +57,7 @@
   <ul>
     {% if 'original' in media.media_files %}
       <li><a href="{{ request.app.public_store.file_url(
-                       media.media_files.original) }}">{% trans %}original file{% endtrans %}</a>
+                       media.media_files.original) }}">{% trans %}Original file{% endtrans %}</a>
     {% endif %}
     <li><a href="{{ request.app.public_store.file_url(
                      media.media_files.webm_audio) }}">{% trans %}WebM file (Vorbis codec){% endtrans %}</a>

diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html
index 7dfecb114692fdf4893df317ab367ac0720a4a9e..86725cca6f2c56d4a2ba71cafd15a5c73c108f46 100644 (file)
--- a/mediagoblin/templates/mediagoblin/media_displays/image.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/image.html
@@ -17,3 +17,17 @@
 #}
 
 {% extends 'mediagoblin/user_pages/media.html' %}
+
+{% block mediagoblin_sidebar %}
+  {% if 'original' in media.media_files %}
+  <h3>{% trans %}Download{% endtrans %}</h3>
+  <p>
+    <a href="{{ request.app.public_store.file_url(
+            media.media_files['original']) }}">
+      {%- trans -%}
+        Original
+      {%- endtrans -%}
+    </a>
+  </p>
+  {% endif %}    
+{% endblock %}

diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html
index 86c277aa065e1daf08a866e3723eaafd3dabfe14..d72de2cadf68c845b5efb07a01fbdd4f6d56e1a8 100644 (file)
--- a/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@ -46,14 +46,16 @@
          </div>
     </video>
   </div>
-  {% if 'original' in media.media_files %}
-  <p>
-    <a href="{{ request.app.public_store.file_url(
-            media.media_files['original']) }}">
-      {%- trans -%}
-        Original
-      {%- endtrans -%}
-    </a>
-  </p>
-  {% endif %}
+{% endblock %}
+
+{% block mediagoblin_sidebar %}
+  <h3>{% trans %}Download{% endtrans %}</h3>
+  <ul>
+    {% if 'original' in media.media_files %}
+      <li><a href="{{ request.app.public_store.file_url(
+                       media.media_files.original) }}">{% trans %}Original file{% endtrans %}</a>
+    {% endif %}
+    <li><a href="{{ request.app.public_store.file_url(
+                     media.media_files.webm_640) }}">{% trans %}WebM file (640p; VP8/Vorbis){% endtrans %}</a>
+  </ul>
 {% endblock %}