diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-09-23 02:35:57 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-09-23 02:35:57 +0200 |
| commit | 93bdab9daad3ae431afd41a2efaefae05a555d88 (patch) | |
| tree | 2586f778bbba650600c1d8a1480230e32a15bb34 /mediagoblin/templates | |
| parent | 9122a9d047765574bb0d11436522a6c868da86cc (diff) | |
| download | mediagoblin-93bdab9daad3ae431afd41a2efaefae05a555d88.tar.lz mediagoblin-93bdab9daad3ae431afd41a2efaefae05a555d88.tar.xz mediagoblin-93bdab9daad3ae431afd41a2efaefae05a555d88.zip | |
Multimedia support - Commiting from a not yet finished state - Details below
* DONE Initially testing with arista
** DONE Video display templates
*** TODO Multi-browser support
** TODO Video thumbnails
** TODO Link to original video
** TODO Video cropping
Also contains a lot of "debug" print's
Diffstat (limited to 'mediagoblin/templates')
3 files changed, 26 insertions, 15 deletions
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..37586924 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -0,0 +1,8 @@ +{% extends 'mediagoblin/user_pages/media.html' %} +{% block mediagoblin_media %} + <video width="640" height="" controls> + <source src="{{ request.app.public_store.file_url( + media['media_files']['medium']) }}" + type='video/webm; codecs="vp8, vorbis"' /> + </video> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 442bef6d..82a48e7c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -24,24 +24,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)) %} - - {# 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']) }}"> + {% 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']) }}"> + <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"> |