# HG changeset patch # User verrierj # Date 1327940473 -3600 # Node ID 9ee8cc15e2442333cd1156966f43023b68810129 # Parent 5a64128bfe55e6a7a8f4a69916c311aa3c4aac7c Add setting to metadataplayer for API url diff -r 5a64128bfe55 -r 9ee8cc15e244 src/ldt/ldt/api/ldt/handlers.py --- a/src/ldt/ldt/api/ldt/handlers.py Mon Jan 30 16:46:50 2012 +0100 +++ b/src/ldt/ldt/api/ldt/handlers.py Mon Jan 30 17:21:13 2012 +0100 @@ -236,6 +236,8 @@ """ returns segments about content iri_id between timecodes begin and end """ + begin = int(begin) + end = int(end) content = Content.objects.get(iri_id=iri_id) segments = Segment.objects.filter(content=content).filter( diff -r 5a64128bfe55 -r 9ee8cc15e244 src/ldt/ldt/api/ldt/urls.py --- a/src/ldt/ldt/api/ldt/urls.py Mon Jan 30 16:46:50 2012 +0100 +++ b/src/ldt/ldt/api/ldt/urls.py Mon Jan 30 17:21:13 2012 +0100 @@ -9,7 +9,7 @@ urlpatterns = patterns('', url(r'projects/(?P[^/.]+)\.?(?P.*)$', project_handler, name='project_api'), url(r'contents/(?P[^/.]+)\.?(?P.*)$', content_handler, name='content_api'), - url(r'segments/(?P.*)/(?P\d+)/(?P\d+)$', segment_handler, name='segment_api'), + url(r'segments/(?P.*)/(?P.*)/(?P.*)$', segment_handler, name='segment_api'), ) diff -r 5a64128bfe55 -r 9ee8cc15e244 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Mon Jan 30 16:46:50 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Mon Jan 30 17:21:13 2012 +0100 @@ -13,7 +13,12 @@ IriSP.widgetsDefaults["createAnnotationWidget"] = {}; IriSP.widgetsDefaults["createAnnotationWidget"].cinecast_version = false; + + IriSP.widgetsDefaults["AnnotationsListWidget"] = {}; + IriSP.widgetsDefaults["AnnotationsListWidget"].project_url = "{{WEB_URL}}{% url segment_api iri_id='{content}' begin='{begin}' end='{end}' %}"; + IriSP.platform_url = "{{WEB_URL}}{{BASE_URL}}"; + var config = { gui:{ @@ -141,7 +146,7 @@ }] }; - debugger; + IriSP.initPlayer(config, "{{ json_url }}");