diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-24 15:24:58 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-24 15:24:58 -0600 |
| commit | 99d2ac1d83962fb4dc38f01d63d2ad4036226765 (patch) | |
| tree | 5c8a3a8c6f7ee5ea3662a6c791855864c5784e1a /mediagoblin/templates | |
| parent | 30188321531e1b0d3c78166498702bbd8c7dc2bc (diff) | |
| parent | 6506b1e22c70b55a73ee4cb391aebaf73db79ef9 (diff) | |
| download | mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.lz mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.xz mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.zip | |
Merge remote-tracking branch 'remotes/jwandborg/master'
Diffstat (limited to 'mediagoblin/templates')
4 files changed, 49 insertions, 14 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index ede5f5c6..3dd9c8ff 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/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html new file mode 100644 index 00000000..ad60fa94 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -0,0 +1 @@ +{% extends 'mediagoblin/user_pages/media.html' %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html new file mode 100644 index 00000000..5b8ec789 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -0,0 +1,25 @@ +{% extends 'mediagoblin/user_pages/media.html' %} +{% block mediagoblin_media %} + <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( + media['media_files']['original']) }}"> + {%- trans -%} + Original + {%- endtrans -%} + </a> + </p> + {% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index adbb66db..7434664c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -26,24 +26,26 @@ {% if media %} <div class="grid_11 alpha"> <div class="media_image_container"> - {% set display_media = request.app.public_store.file_url( - media.get_display_media(media.media_files)) %} + {% block mediagoblin_media %} + {% set display_media = request.app.public_store.file_url( + media.get_display_media(media.media_files)) %} - {# if there's a medium file size, that means the medium size - # isn't the original... so link to the original! - #} - {% if media['media_files'].has_key('medium') %} - <a href="{{ request.app.public_store.file_url( - media['media_files']['original']) }}"> + {# if there's a medium file size, that means the medium size + # isn't the original... so link to the original! + #} + {% if media['media_files'].has_key('medium') %} + <a href="{{ request.app.public_store.file_url( + media['media_files']['original']) }}"> + <img class="media_image" + src="{{ display_media }}" + alt="Image for {{ media.title }}" /> + </a> + {% else %} <img class="media_image" src="{{ display_media }}" alt="Image for {{ media.title }}" /> - </a> - {% else %} - <img class="media_image" - src="{{ display_media }}" - alt="Image for {{ media.title }}" /> - {% endif %} + {% endif %} + {% endblock %} </div> <h2 class="media_title"> |