# HG changeset patch # User ymh # Date 1303135416 -7200 # Node ID 517f98ea6b7e6ab1806eb9ed01dba8876204e32f # Parent a06fab661ac4f5f32d7d00141668bf54485d7b6e update metadataplayer diff -r a06fab661ac4 -r 517f98ea6b7e src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Apr 18 13:12:57 2011 +0200 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Apr 18 16:03:36 2011 +0200 @@ -1,5 +1,8 @@ {% load i18n %} - + + + diff -r a06fab661ac4 -r 517f98ea6b7e src/ldt/ldt/media/css/workspace.css --- a/src/ldt/ldt/media/css/workspace.css Mon Apr 18 13:12:57 2011 +0200 +++ b/src/ldt/ldt/media/css/workspace.css Mon Apr 18 16:03:36 2011 +0200 @@ -101,7 +101,7 @@ .contenttitle { width: 411px; - padding: 4px 10px 4px 5px; + padding: 2px 10px 2px 5px; } .contenttitlelink,.contenttitlelink:link,.contenttitlelink:hover,.contenttitlelink:visited { @@ -117,7 +117,7 @@ .projecttitle { width: 367px; - padding: 4px 10px 4px 5px; + padding: 2px 10px 2px 5px; } .projectscontentsfooter { diff -r a06fab661ac4 -r 517f98ea6b7e src/ldt/ldt/media/js/LdtPlayer.min.js --- a/src/ldt/ldt/media/js/LdtPlayer.min.js Mon Apr 18 13:12:57 2011 +0200 +++ b/src/ldt/ldt/media/js/LdtPlayer.min.js Mon Apr 18 16:03:36 2011 +0200 @@ -16,38 +16,44 @@ * The fact that you are presently reading this means that you have had * knowledge of the CeCILL-C license and that you accept its terms. */ -if(window.__IriSP===undefined)var __IriSP={};__IriSP.config=undefined; -__IriSP.configDefault={metadata:{format:"cinelab",src:"",load:"jsonp"},gui:{width:650,height:0,mode:"radio",container:"LdtPlayer",debug:false,css:"../src/css/LdtPlayer.css"},player:{type:"jwplayer",src:"../res/swf/player.swf",params:{allowfullscreen:"true",allowscriptaccess:"always",wmode:"transparent"},flashvars:{streamer:"streamer",file:"file",live:"true",autostart:"true",controlbar:"none", -playerready:"__IriSP.playerReady"},attributes:{id:"Ldtplayer1",name:"Ldtplayer1"}},module:null};__IriSP.lib={jQuery:"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js",jQueryUI:"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js",jQueryToolTip:"http://cdn.jquerytools.org/1.2.4/all/jquery.tools.min.js",swfObject:"http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js",cssjQueryUI:"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css"}; -__IriSP.LdtShareTool="\n\n \n \n "; +if(window.__IriSP===undefined)var __IriSP={};__IriSP.traceNum=0;__IriSP.trace=function(a,b){if(__IriSP.config.gui.debug===true){__IriSP.traceNum+=1;__IriSP.jQuery("

"+__IriSP.traceNum+" - "+a+" : "+b+"

").appendTo("#Ldt-output")}};__IriSP.config=undefined; +__IriSP.configDefault={metadata:{format:"cinelab",src:"",load:"jsonp"},gui:{width:650,height:0,mode:"radio",container:"LdtPlayer",debug:false,css:"../src/css/LdtPlayer.css"},player:{type:"jwplayer",src:"../res/swf/player.swf",params:{allowfullscreen:"true",allowscriptaccess:"always",wmode:"transparent"},flashvars:{streamer:"streamer",file:"file",live:"true",autostart:"false",controlbar:"none",playerready:"__IriSP.playerReady"},attributes:{id:"Ldtplayer1",name:"Ldtplayer1"}},module:null}; +__IriSP.lib={jQuery:"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js",jQueryUI:"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js",jQueryToolTip:"http://cdn.jquerytools.org/1.2.4/all/jquery.tools.min.js",swfObject:"http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js",cssjQueryUI:"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css"};__IriSP.LdtShareTool="\n\n \n \n "; __IriSP.MyLdt=null;__IriSP.MyTags=null;__IriSP.MyApiPlayer=null;__IriSP.player=null;__IriSP.Durration=null;__IriSP.playerLdtWidth=null;__IriSP.playerLdtHeight=null; -__IriSP.init=function(a){function b(){var f=document.createElement("script");f.setAttribute("type","text/javascript");f.setAttribute("src",__IriSP.lib.jQueryToolTip);f.onload=c;f.onreadystatechange=function(){if(this.readyState=="complete"||this.readyState=="loaded")c("jquery.tools.min.js loded")};var i=document.createElement("script");i.setAttribute("type","text/javascript");i.setAttribute("src",__IriSP.lib.swfObject);i.onload=c;i.onreadystatechange=function(){if(this.readyState=="complete"||this.readyState== -"loaded")c("swfobject.js loded")};var j=document.createElement("script");j.setAttribute("type","text/javascript");j.setAttribute("src",__IriSP.lib.jQueryUI);j.onload=c;j.onreadystatechange=function(){if(this.readyState=="complete"||this.readyState=="loaded")c("jquery-ui.min.js loded")};(document.getElementsByTagName("head")[0]||document.documentElement).appendChild(f);(document.getElementsByTagName("head")[0]||document.documentElement).appendChild(j);(document.getElementsByTagName("head")[0]||document.documentElement).appendChild(i)} -function c(){g+=1;g===3&&d()}function d(){__IriSP.jQuery=window.jQuery.noConflict(true);__IriSP.jQuery(document).ready(function(f){var i=__IriSP.jQuery("",{rel:"stylesheet",type:"text/css",href:__IriSP.lib.cssjQueryUI,"class":"dynamic_css"}),j=__IriSP.jQuery("",{rel:"stylesheet",type:"text/css",href:__IriSP.config.gui.css,"class":"dynamic_css"});i.appendTo("head");j.appendTo("head");f.browser.msie&&f(".dynamic_css").clone().appendTo("head");__IriSP.createMyHtml();__IriSP.jQuery.ajax({dataType:__IriSP.config.metadata.load, -url:h,success:function(e){__IriSP.trace("ajax","success");if(e==="")alert("ERREUR DE CHARGEMENT JSON");else{new __IriSP.Media(e.medias[0].id,e.medias[0].href,e.medias[0].meta["dc:duration"],e.medias[0]["dc:title"],e.medias[0]["dc:description"]);__IriSP.trace("__IriSP.MyApiPlayer",__IriSP.config.gui.width+" "+__IriSP.config.gui.height+" "+e.medias[0].href+" "+e.medias[0].meta["dc:duration"]+" "+e.medias[0].meta.item.value);__IriSP.MyApiPlayer=new __IriSP.APIplayer(__IriSP.config.gui.width,__IriSP.config.gui.height, -e.medias[0].href,e.medias[0].meta["dc:duration"],e.medias[0].meta.item.value);__IriSP.trace("__IriSP.init.main","__IriSP.Ligne");__IriSP.MyLdt=new __IriSP.Ligne(e["annotation-types"][0].id,e["annotation-types"][0]["dc:title"],e["annotation-types"][0]["dc:description"],e.medias[0].meta["dc:duration"]);__IriSP.trace("__IriSP.init.main","__IriSP.Tags");__IriSP.MyTags=new __IriSP.Tags(e.tags);__IriSP.jQuery.each(e.annotations,function(l,k){k.meta["id-ref"]==__IriSP.MyLdt.id&&__IriSP.MyLdt.addAnnotation(k.id, -k.begin,k.end,k.media,k.content.title,k.content.description,k.content.color,k.tags)});__IriSP.jQuery.each(e.lists,function(){__IriSP.trace("lists","")});__IriSP.jQuery.each(e.views,function(){__IriSP.trace("views","")})}},error:function(e){alert("ERROR : "+e)}})})}if(a===null)__IriSP.config=__IriSP.configDefault;else{__IriSP.config=a;if(__IriSP.config.player.params==null)__IriSP.config.player.params=__IriSP.configDefault.player.params;if(__IriSP.config.player.flashvars==null)__IriSP.config.player.flashvars= -__IriSP.configDefault.player.flashvars;if(__IriSP.config.player.attributes==null)__IriSP.config.player.attributes=__IriSP.configDefault.player.attributes}var h=__IriSP.config.metadata.src;__IriSP.jQuery=null;if(window.jQuery===undefined||window.jQuery.fn.jquery!=="1.4.2"){a=document.createElement("script");a.setAttribute("type","text/javascript");a.setAttribute("src",__IriSP.lib.jQuery);a.onload=b;a.onreadystatechange=function(){if(this.readyState=="complete"||this.readyState=="loaded")b()};(document.getElementsByTagName("head")[0]|| -document.documentElement).appendChild(a)}else{__IriSP.jQuery=window.jQuery;b()}var g=0}; -__IriSP.createMyHtml=function(){var a=__IriSP.config.gui.width;if(__IriSP.config.gui.mode=="radio")__IriSP.jQuery("

\n\t

\n\t\tGet flash to see this player\t\n\t

\n\t

\n\t\t

\n\t\t\t\n\t\t\t\n\t\t

\n\t\t

\n\t\t\t

\n\t

\n\t\t

\n\t\t\t\n\t\t\t\n\t\t

\n \t

\n\t

\n\t\t

\n \t\t