Mercurial Mercurial > eulalie / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback changes made for the player, bumpup version nb V00.06
authorymh <ymh.work@gmail.com>
Sat, 12 Jun 2010 02:11:56 +0200
changeset 33 6eea55d40942
parent 32 a6b49630c546
child 34 dd6e8c420f63
rollback changes made for the player, bumpup version nb
client/player/js/LdtPlayer.js file | annotate | diff | comparison | revisions
web/eulalie/__init__.py file | annotate | diff | comparison | revisions
web/eulalie/templates/eulalie/partial/embed.html file | annotate | diff | comparison | revisions
web/static/js/LdtPlayer.js file | annotate | diff | comparison | revisions 
--- a/client/player/js/LdtPlayer.js	Sat Jun 12 01:57:53 2010 +0200
+++ b/client/player/js/LdtPlayer.js	Sat Jun 12 02:11:56 2010 +0200
@@ -146,7 +146,7 @@
 		if (tmp) { tmp.innerHTML = "volume: " + currentVolume; }
 	}
 
-	function createPlayer(width,height,url, playerUrl) {
+	function createPlayer(width,height,url) {
 	
 		myUrlFragment = url.split("/");
 		//
@@ -174,7 +174,7 @@
 			name:"Ldtplayer1"
 		}
 
-		swfobject.embedSWF(playerUrl, "ldtPlaceHolder", width, height, "9.0.115", false, flashvars, params, attributes);
+		swfobject.embedSWF("swf/player.swf", "ldtPlaceHolder", width, height, "9.0.115", false, flashvars, params, attributes);
 	}
 	
 
@@ -218,20 +218,20 @@
 		/* START PARSING ----------------------- */
 		/* metas , medias , annotation-types , annotations , lists , tags , views */
 		/* # fonction avec 1 seul  media et 1 seul annotation type  code a cleaner */
-		/* # cr�er le player 				   */
+		/* # créer le player 				   */
 		//$jIRI.each(json.medias, function(i,item) {
 		//});
 		$jIRI("<div></div>").appendTo("#output");
 		MyMedia = new  Media(json.medias[0].id,json.medias[0].url,json.medias[0]["dc:duration"],json.medias[0]['dc:title'],json.medias[0]['dc:description']);
 		MyMedia.createPlayer(playerLdtWidth,playerLdtHeight);
 
-		/* # cr�er lignes 				   */
+		/* # créer lignes 				   */
 		/*$jIRI.each(json['annotation-types'], function(i,item) {
 		});*/	
 		MyLdt = new Ligne (json['annotation-types'][0].id,json['annotation-types'][0]['dc:title'],json['annotation-types'][0]['dc:description'],json.medias[0]["dc:duration"]);
 		//alert("duration : "+json.medias[0]["dc:duration"]);
 		
-		/* # cr�er les annotations 				   */
+		/* # créer les annotations 				   */
 		$jIRI.each(json.annotations, function(i,item) {
 
 			MyLdt.addAnnotation(
@@ -374,7 +374,7 @@
 		this.addAnnotation = addLigneAnnotation;
 		this.checkTime 	= checkTimeLigne;
 		this.duration = duration;
-		trace("LIGNE  ","cr�er ");
+		trace("LIGNE  ","créer ");
 	}
 	
 	function addLigneAnnotation(id,begin,end,media,title,description,color){
@@ -451,7 +451,7 @@
 		this.onClick 		= onClickAnnotation;
 		this.toolTip 		= rollOverAnnotation;
 		this.draw 			= drawAnnotation;
-		trace("annotation ","r�ussi")
+		trace("annotation ","réussi")
 	}
 	
 	function Annotation (id,begin,end,media,title,description,color,duration){
@@ -478,7 +478,7 @@
 	
 	function drawAnnotation (){
 		//alert (this.duration);
-		startPourcent = timeToPourcent(this.begin,this.duration); // temps du m�dia 
+		startPourcent = timeToPourcent(this.begin,this.duration); // temps du média 
 		endPourcent = timeToPourcent(this.end,this.duration)-startPourcent;
 				
 		$AnnotationTemplate = "<div title='"+this.title+"' id='"+this.id+"'  class='ui-slider-range ui-slider-range-min ui-widget-header iri-chapter' width='100%' style='left:"+startPourcent+"%; width:"+endPourcent+"%; padding-top:15px; border-left:solid 1px #aaaaaa; border-right:solid 1px #aaaaaa;' onclick=\"player.sendEvent('SEEK', '"+Math.round(this.begin/1000)+"');$jIRI('#ShowAnnotation').slideDown().delay(5000).slideUp();\"  ></div> ";
--- a/web/eulalie/__init__.py	Sat Jun 12 01:57:53 2010 +0200
+++ b/web/eulalie/__init__.py	Sat Jun 12 02:11:56 2010 +0200
@@ -1,4 +1,4 @@
-VERSION = (0,5)
+VERSION = (0,6)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
 
--- a/web/eulalie/templates/eulalie/partial/embed.html	Sat Jun 12 01:57:53 2010 +0200
+++ b/web/eulalie/templates/eulalie/partial/embed.html	Sat Jun 12 02:11:56 2010 +0200
@@ -1,5 +1,5 @@
 <div id="{{ player_id }}">
 </div>
 <script type="text/javascript">
-    playerLdt(550,310, "{{ json_url }}","{{ player_id }}","{{WEB_URL}}{{MEDIA_URL}}swf/player.swf");
+    playerLdt(550,310, "{{ json_url }}","{{ player_id }}");
 </script>
\ No newline at end of file
--- a/web/static/js/LdtPlayer.js	Sat Jun 12 01:57:53 2010 +0200
+++ b/web/static/js/LdtPlayer.js	Sat Jun 12 02:11:56 2010 +0200
@@ -146,7 +146,7 @@
 		if (tmp) { tmp.innerHTML = "volume: " + currentVolume; }
 	}
 
-	function createPlayer(width,height,url, playerUrl) {
+	function createPlayer(width,height,url) {
 	
 		myUrlFragment = url.split("/");
 		//
@@ -174,7 +174,7 @@
 			name:"Ldtplayer1"
 		}
 
-		swfobject.embedSWF(playerUrl, "ldtPlaceHolder", width, height, "9.0.115", false, flashvars, params, attributes);
+		swfobject.embedSWF("swf/player.swf", "ldtPlaceHolder", width, height, "9.0.115", false, flashvars, params, attributes);
 	}
 	
 
@@ -218,20 +218,20 @@
 		/* START PARSING ----------------------- */
 		/* metas , medias , annotation-types , annotations , lists , tags , views */
 		/* # fonction avec 1 seul  media et 1 seul annotation type  code a cleaner */
-		/* # cr�er le player 				   */
+		/* # créer le player 				   */
 		//$jIRI.each(json.medias, function(i,item) {
 		//});
 		$jIRI("<div></div>").appendTo("#output");
 		MyMedia = new  Media(json.medias[0].id,json.medias[0].url,json.medias[0]["dc:duration"],json.medias[0]['dc:title'],json.medias[0]['dc:description']);
 		MyMedia.createPlayer(playerLdtWidth,playerLdtHeight);
 
-		/* # cr�er lignes 				   */
+		/* # créer lignes 				   */
 		/*$jIRI.each(json['annotation-types'], function(i,item) {
 		});*/	
 		MyLdt = new Ligne (json['annotation-types'][0].id,json['annotation-types'][0]['dc:title'],json['annotation-types'][0]['dc:description'],json.medias[0]["dc:duration"]);
 		//alert("duration : "+json.medias[0]["dc:duration"]);
 		
-		/* # cr�er les annotations 				   */
+		/* # créer les annotations 				   */
 		$jIRI.each(json.annotations, function(i,item) {
 
 			MyLdt.addAnnotation(
@@ -374,7 +374,7 @@
 		this.addAnnotation = addLigneAnnotation;
 		this.checkTime 	= checkTimeLigne;
 		this.duration = duration;
-		trace("LIGNE  ","cr�er ");
+		trace("LIGNE  ","créer ");
 	}
 	
 	function addLigneAnnotation(id,begin,end,media,title,description,color){
@@ -451,7 +451,7 @@
 		this.onClick 		= onClickAnnotation;
 		this.toolTip 		= rollOverAnnotation;
 		this.draw 			= drawAnnotation;
-		trace("annotation ","r�ussi")
+		trace("annotation ","réussi")
 	}
 	
 	function Annotation (id,begin,end,media,title,description,color,duration){
@@ -478,7 +478,7 @@
 	
 	function drawAnnotation (){
 		//alert (this.duration);
-		startPourcent = timeToPourcent(this.begin,this.duration); // temps du m�dia 
+		startPourcent = timeToPourcent(this.begin,this.duration); // temps du média 
 		endPourcent = timeToPourcent(this.end,this.duration)-startPourcent;
 				
 		$AnnotationTemplate = "<div title='"+this.title+"' id='"+this.id+"'  class='ui-slider-range ui-slider-range-min ui-widget-header iri-chapter' width='100%' style='left:"+startPourcent+"%; width:"+endPourcent+"%; padding-top:15px; border-left:solid 1px #aaaaaa; border-right:solid 1px #aaaaaa;' onclick=\"player.sendEvent('SEEK', '"+Math.round(this.begin/1000)+"');$jIRI('#ShowAnnotation').slideDown().delay(5000).slideUp();\"  ></div> ";
eulalie