diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-13 15:40:59 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-13 15:40:59 -0500 |
| commit | 19e67f595524aa1374b7be8b1790a3f9fc720c2f (patch) | |
| tree | 2047a28cbefb5fb5e3cf218ee609a92e96e3f9a4 /mediagoblin/templates | |
| parent | 849cf91fc8feeed308b5f54fd53d1940bf23058b (diff) | |
| parent | 560e22e7d27d8c2642c076ed8c30703b00e00c41 (diff) | |
| download | mediagoblin-19e67f595524aa1374b7be8b1790a3f9fc720c2f.tar.lz mediagoblin-19e67f595524aa1374b7be8b1790a3f9fc720c2f.tar.xz mediagoblin-19e67f595524aa1374b7be8b1790a3f9fc720c2f.zip | |
Merge remote-tracking branch 'refs/remotes/chemhacker/bug402_nicer_skin_for_video'
Conflicts:
mediagoblin/templates/mediagoblin/media_displays/video.html
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index e86a6867..cf68b61b 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -18,6 +18,13 @@ {% extends 'mediagoblin/user_pages/media.html' %} +{% block mediagoblin_head %} + {{ super() }} + <script type="text/javascript" + src="{{ request.staticdirect('/js/extlib/video-js/video.js') }}"></script> + <link href="{{ request.staticdirect('/js/extlib/video-js/video-js.css') }}" rel="stylesheet"> +{% endblock %} + {% block mediagoblin_media %} <div class="video-player" style="position: relative;"> <video class="video-js vjs-default-skin" |