# HG changeset patch # User ymh # Date 1362158752 -3600 # Node ID 3bda04d364ddacf666b652e3494b65cb305ce715 # Parent e1b6be4d85a47f4cecce2cf6e88ff190301bd8dc# Parent d56201bf14469400951225a1e8ec9b532f5140f2 Merge with d56201bf14469400951225a1e8ec9b532f5140f2 diff -r d56201bf1446 -r 3bda04d364dd .hgtags --- a/.hgtags Fri Mar 01 18:05:02 2013 +0100 +++ b/.hgtags Fri Mar 01 18:25:52 2013 +0100 @@ -142,3 +142,4 @@ 726f2cf3f020c6d4dd1075acb6b94de2dbec5685 V01.42 c4d6ddd5f718d1e55441247aa4c4366a5d7be470 V01.43 996bb5b1adbc920f8ecb49f9d7b45f51a8aa3c04 V01.44 +62be1eedf90855ab3cef1ab8a9f0c66130638673 V01.45 diff -r d56201bf1446 -r 3bda04d364dd src/ldt/ldt/api/ldt/resources/project.py --- a/src/ldt/ldt/api/ldt/resources/project.py Fri Mar 01 18:05:02 2013 +0100 +++ b/src/ldt/ldt/api/ldt/resources/project.py Fri Mar 01 18:25:52 2013 +0100 @@ -11,6 +11,7 @@ from tastypie.authorization import Authorization from tastypie.resources import Bundle, ModelResource, ALL from tastypie import fields +from tastypie.exceptions import BadRequest class ProjectResource(ModelResource): @@ -63,4 +64,7 @@ assign('ldt_utils.view_project', everyone, bundle.obj) protect_models() return bundle + + def obj_delete_list(self, request=None, **kwargs): + raise BadRequest("PUT with a list of projects is forbidden.") \ No newline at end of file diff -r d56201bf1446 -r 3bda04d364dd src/ldt/ldt/static/ldt/metadataplayer/HtmlPlayer.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/static/ldt/metadataplayer/HtmlPlayer.js Fri Mar 01 18:25:52 2013 +0100 @@ -0,0 +1,127 @@ +IriSP.Widgets.HtmlPlayer = function(player, config) { + IriSP.Widgets.Widget.call(this, player, config); +}; + +IriSP.Widgets.HtmlPlayer.prototype = new IriSP.Widgets.Widget(); + + +IriSP.Widgets.HtmlPlayer.prototype.defaults = { +} + +IriSP.Widgets.HtmlPlayer.prototype.draw = function() { + + + if (typeof this.video === "undefined") { + this.video = this.media.video; + } + + if (this.url_transform) { + this.video = this.url_transform(this.video); + } + + var videoEl = IriSP.jQuery('