aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-03-03 11:03:30 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-03-03 11:03:30 -0600
commit14814f217af471538774a5861469af157735d893 (patch)
tree1c4db893fc30e908a9abe5392e0b6b5f624f78f5 /mediagoblin
parent3ff006ef3b3b4dbd302ef8c30f5c3062e2954973 (diff)
downloadmediagoblin-14814f217af471538774a5861469af157735d893.tar.lz
mediagoblin-14814f217af471538774a5861469af157735d893.tar.xz
mediagoblin-14814f217af471538774a5861469af157735d893.zip
{% set %} the display_type and display_path and use that elsewhere
This will make some stuff a bit cleaner that's coming up... This commit sponsored by J B Nicholson-Owens. Thanks!
Diffstat (limited to 'mediagoblin')
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/video.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html
index 2e33e1a3..06f5f226 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@ -27,13 +27,14 @@
{%- endblock %}
{% block mediagoblin_media %}
+ {% set display_type, display_path = media.get_display_media() %}
+
<video controls
{% if global_config['media_type:mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %}
preload="auto" class="video-js vjs-mg-skin"
data-setup='{"height": {{ media.media_data.height }},
"width": {{ media.media_data.width }} }'>
- <source src="{{ request.app.public_store.file_url(
- media.get_display_media()[1]) }}"
+ <source src="{{ request.app.public_store.file_url(display_path) }}"
type="video/webm; codecs=&quot;vp8, vorbis&quot;" />
<div class="no_html5">
{%- trans -%}Sorry, this video will not work because