diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2012-12-20 09:07:59 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2012-12-25 19:16:03 +0100 |
| commit | 565d01a09a58bb1f60b6562e949ea322f6e01cc0 (patch) | |
| tree | 480689e4b0798da20992df9e9f3b08b5609a1488 /mediagoblin/templates | |
| parent | a1f9007bb0037b5efcd4b949f1e03858744e11a0 (diff) | |
| download | mediagoblin-565d01a09a58bb1f60b6562e949ea322f6e01cc0.tar.lz mediagoblin-565d01a09a58bb1f60b6562e949ea322f6e01cc0.tar.xz mediagoblin-565d01a09a58bb1f60b6562e949ea322f6e01cc0.zip | |
Bump bundled video.js to v3.2.3 (#512)
There is nothing inherently wrong with the currently bundled version,
but the last one was uploaded in March 2012 and there have been
upstream releases since. So bump to the latest available release 3.2.3.
Might help with the reported issue 512 of an unresponsive video player.
Do note that the Flash fallback option is removed. If we decide
this should be added it is easy to add it back.
We still use our own customized theme.
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index d72de2ca..7d5ede8d 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -18,34 +18,30 @@ {% extends 'mediagoblin/user_pages/media.html' %} -{% block mediagoblin_head %} +{% block mediagoblin_head -%} {{ super() }} - <script type="text/javascript" - src="{{ request.staticdirect('/js/extlib/video-js/video.js') }}"></script> - <link href="{{ request.staticdirect('/css/vjs-mg-skin.css') }}" rel="stylesheet"> -{% endblock %} + <script type="text/javascript" src="{{ + request.staticdirect('/extlib/video-js/video.min.js') }}"></script> + <link href="{{ request.staticdirect('/css/vjs-mg-skin.css') + }}" rel="stylesheet"> +{%- endblock %} {% block mediagoblin_media %} - <div class="video-player" style="position: relative;"> - <video class="video-js vjs-mg-skin" - width="{{ media.media_data.width }}" - height="{{ media.media_data.height }}" - controls="controls" - preload="metadata" - data-setup=""> - <source src="{{ request.app.public_store.file_url( - media.media_files['webm_640']) }}" - type="video/webm; codecs="vp8, vorbis"" /> - <div class="no_html5"> - {%- trans -%}Sorry, this video will not work because - your web browser does not support HTML5 - video.{%- endtrans -%}<br/> - {%- trans -%}You can get a modern web browser that - can play this video at <a href="http://getfirefox.com"> - http://getfirefox.com</a>!{%- endtrans -%} - </div> - </video> - </div> + <video controls autoplay 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.media_files['webm_640']) }}" + type="video/webm; codecs="vp8, vorbis"" /> + <div class="no_html5"> + {%- trans -%}Sorry, this video will not work because + your web browser does not support HTML5 + video.{%- endtrans -%}<br/> + {%- trans -%}You can get a modern web browser that + can play this video at <a href="http://getfirefox.com"> + http://getfirefox.com</a>!{%- endtrans -%} + </div> + </video> {% endblock %} {% block mediagoblin_sidebar %} |