diff options
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 7 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 18 |
2 files changed, 19 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b4c4dcf3..bad22e7e 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -28,8 +28,15 @@ href="{{ request.staticdirect('/css/extlib/960_16_col.css') }}"/> <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/base.css') }}"/> + <link rel="stylesheet" type="text/css" + href="{{ request.staticdirect('/css/video-js.css') }}"/> <link rel="shortcut icon" href="{{ request.staticdirect('/images/goblin.ico') }}" /> + <script type="text/javascript" + src="{{ request.staticdirect('/js/lib/video.js') }}"></script> + <script type="text/javascript" + src="{{ request.staticdirect('/js/video.js') }}"></script> + <script type="text/javascript" src="http://html5.kaltura.org/js" > </script> {% block mediagoblin_head %} {% endblock mediagoblin_head %} </head> diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index bff9889a..5b8ec789 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -1,11 +1,17 @@ {% extends 'mediagoblin/user_pages/media.html' %} {% block mediagoblin_media %} - <video width="{{ media.media_data.video.width }}" - height="{{ media.media_data.video.height }}" controls="controls"> - <source src="{{ request.app.public_store.file_url( - media['media_files']['webm_640']) }}" - type='video/webm; codecs="vp8, vorbis"' /> - </video> + <div class="video-player" style="position: relative;"> + <video class="video-js vjs-default-skin" + width="{{ media.media_data.video.width }}" + height="{{ media.media_data.video.height }}" + controls="controls" + preload="auto" + data-setup=""> + <source src="{{ request.app.public_store.file_url( + media['media_files']['webm_640']) }}" + type="video/webm; codecs="vp8, vorbis"" /> + </video> + </div> {% if 'original' in media.media_files %} <p> <a href="{{ request.app.public_store.file_url( |