From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 26 Jan 2015 00:20:56 +0000 (+0100)
Subject: add CBV for embed player
X-Git-Tag: 1.5~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3a7111f8e815c700e7c7ab6522dd6b056f3f733b;p=telemeta.git

add CBV for embed player
---

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 37179626..0ca8eb24 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -84,9 +84,7 @@ urlpatterns = patterns('',
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/edit/$', ItemEditView.as_view(), name="telemeta-item-edit"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/copy/$', ItemCopyView.as_view(), name="telemeta-item-copy"),
     url(r'^archives/items_add/$', ItemAddView.as_view(), name="telemeta-item-add"),
-    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/$', item_view.item_detail, dict(template='telemeta/mediaitem_player.html'), name="telemeta-item-player"),
-    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/simple/$', item_view.item_detail, dict(template='telemeta/mediaitem_player_simple.html'), name="telemeta-item-player-simple"),
-    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/countour/$', item_view.item_detail, dict(template='telemeta/mediaitem_player_contour.html'), name="telemeta-item-player-contour"),
+    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/$', ItemPlayerDefaultView.as_view(), name="telemeta-item-player"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', item_view.item_delete, name="telemeta-item-delete"),
     url(r'^archives/items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/view/$', item_view.related_media_item_stream, name="telemeta-item-related"),
     url(r'^archives/items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/download/$', item_view.related_media_item_download, name="telemeta-item-related-download"),
diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 5c1c8ccc..598410e6 100644
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -993,6 +993,7 @@ class ItemDetailView(ItemViewMixin, DetailView):
         return context
 
 
+
 class DublinCoreToFormatMetadata(object):
     """ a mapping class to get item DublinCore metadata dictionaries
     in various audio metadata format (MP3, OGG, etc...)"""
@@ -1078,3 +1079,9 @@ class ItemMarkerJsonView(View):
         response['Content-Disposition'] = "attachment; filename=%s.%s" % \
                                              (item.code, 'json')
         return response
+
+
+class ItemPlayerDefaultView(ItemDetailView):
+
+    template_name = 'telemeta/mediaitem_player.html'
+