From a122357ee75d0abf215b552f0923de1fd722f6de Mon Sep 17 00:00:00 2001
From: Jakob Kramer <jakob.kramer@gmx.de>
Date: Sat, 7 Jul 2012 21:19:14 +0200
Subject: [PATCH] made the download links consistent

---
 .../mediagoblin/media_displays/ascii.html     |  4 ++++
 .../mediagoblin/media_displays/audio.html     |  2 +-
 .../mediagoblin/media_displays/image.html     | 14 ++++++++++++
 .../mediagoblin/media_displays/video.html     | 22 ++++++++++---------
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/media_displays/ascii.html b/mediagoblin/templates/mediagoblin/media_displays/ascii.html
index 6330595b..3cc5e0ab 100644
--- 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 9713aa49..95bc6e88 100644
--- 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 7dfecb11..86725cca 100644
--- 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 86c277aa..d72de2ca 100644
--- 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 %}