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/user_pages/views.py | |
| 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/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 6a82d718..5458c694 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -29,6 +29,8 @@ from mediagoblin.decorators import (uses_pagination, get_user_media_entry, from werkzeug.contrib.atom import AtomFeed +from mediagoblin.media_types import get_media_manager + @uses_pagination def user_home(request, page): @@ -113,9 +115,11 @@ def media_home(request, media, page, **kwargs): comment_form = user_forms.MediaCommentForm(request.POST) + media_template_name = get_media_manager(media['media_type'])['display_template'] + return render_to_response( request, - 'mediagoblin/user_pages/media.html', + media_template_name, {'media': media, 'comments': comments, 'pagination': pagination, |