heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'refs/remotes/chemhacker/bug402_nicer_skin_for_video'

Browse Source 
Conflicts:
	mediagoblin/templates/mediagoblin/media_displays/video.html
This commit is contained in:
Christopher Allan Webber
2012-03-13 15:40:59 -05:00
parent 849cf91fc8 560e22e7d2
commit 19e67f5955
9 changed files with 4224 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mediagoblin/static/js/extlib/video-js Symbolic link
View File

@@ -0,0 +1 @@
../../../../extlib/video-js

7
mediagoblin/templates/mediagoblin/media_displays/video.html
View File

@@ -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"