# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1321872397 -3600
# Node ID 04bccad7fe535e22ca0bee48749318c3461452be
# Parent  b3f66379fed7719da9062f11fde293c314b32416# Parent  f9347f6653b3e4825ad0ae0fd56ea2a06c4c738a
Merge with fc3a3573167b93f96b781d870c693b0992f9274b

diff -r b3f66379fed7 -r 04bccad7fe53 web/res/metadataplayer.polemic/src/js/polemic.js
--- a/web/res/metadataplayer.polemic/src/js/polemic.js	Thu Nov 17 19:08:32 2011 +0100
+++ b/web/res/metadataplayer.polemic/src/js/polemic.js	Mon Nov 21 11:46:37 2011 +0100
@@ -502,10 +502,13 @@
 									e.mouseover(function () {
 										//this.attr({stroke:"#fff","stroke-width":5});
 										//this.toFront();
+										_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.PT.mouseover(time:"+this.time+",id:"+this.id+")"]);
 									}).mouseout(function () {
 										//this.attr({stroke:"#00","stroke-width":0.1});	
+										_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.PT.mouseout(time:"+this.time+",id:"+this.id+")"]);
 									}).mousedown(function () {
 										__IriSP.MyApiPlayer.seek(this.time/1000);
+										_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.PT.mousedown(time:"+this.time+",id:"+this.id+")"]);
 									});
 									__IriSP.jQuery(e.node).attr('id', 't'+k+'');
 									__IriSP.jQuery(e.node).attr('title', frames[i].mytweetsID[k].title);
@@ -546,6 +549,8 @@
 			__IriSP.jQuery("#tipcolor").css("background-color", tipColor);
 			__IriSP.jQuery("#tiptext").text(tipText);
 			__IriSP.jQuery("#tip").show();
+			_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"!!MetaDatPlayer.PT.mouseover("+this.time+","+this.id+")"]);
+			
 		}else{
 			if (typeof(__IriSP) !== 'undefined' && typeof(__IriSP.jQuery) === 'function') {
 				__IriSP.jQuery("#tip").css("left", -10000).css("top", -100000);
diff -r b3f66379fed7 -r 04bccad7fe53 web/res/metadataplayer/src/js/LdtPlayer.js
--- a/web/res/metadataplayer/src/js/LdtPlayer.js	Thu Nov 17 19:08:32 2011 +0100
+++ b/web/res/metadataplayer/src/js/LdtPlayer.js	Mon Nov 21 11:46:37 2011 +0100
@@ -485,6 +485,8 @@
 			step: 0.1,
 			slide: function(event, ui) {
 				__IriSP.MyApiPlayer.seek(ui.value);
+				_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.Slide.seek("+ui.value+")"]);
+				
 			}
 		});
 		__IriSP.trace("__IriSP.createInterface","ICI");
@@ -614,7 +616,11 @@
 		
 		__IriSP.trace("__IriSP.APIplayer.prototype.play.status",status);
 		if (status!=1){	__IriSP.player.playVideo();
+			_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.C.play()"]);
+			
 		}else{__IriSP.player.pauseVideo();
+			_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.C.pause()"]);
+			
 		}
 		
 	} else if(__IriSP.config.player.type=='vimeo') {
@@ -1255,7 +1261,8 @@
 	var endPourcent 	= this.timeToPourcent(this.end,this.duration)-startPourcent;
 	var titleForDiv		= this.title.substr(0,55);
 	
-	__IriSP.jQueryAnnotationTemplate = "<div title='"+__IriSP.stripHtml(titleForDiv)+"' 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; background:#"+__IriSP.DEC_HEXA_COLOR(this.color)+";\" onClick=\"__IriSP.MyApiPlayer.seek('"+Math.round(this.begin/1000)+"');__IriSP.jQuery('#Ldt-ShowAnnotation').slideDown();\"    ></div> ";
+	__IriSP.jQueryAnnotationTemplate = "<div title='"+__IriSP.stripHtml(titleForDiv)+"' 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; background:#"+__IriSP.DEC_HEXA_COLOR(this.color)+
+	";\" onClick=\"__IriSP.MyApiPlayer.seek('"+Math.round(this.begin/1000)+"');__IriSP.jQuery('#Ldt-ShowAnnotation').slideDown();_gaq.push(['_trackPageview','"+location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.C.mousedown(begin:"+this.begin+",id:"+this.id+",end:"+this.end+"']);\" ></div> ";
 	//alert(this.color+" : "+DEC_HEXA_COLOR(this.color));
 	
 
@@ -1270,8 +1277,12 @@
 	__IriSP.jQuery("#"+this.id).fadeTo(0,0.3);
 	__IriSP.jQuery("#"+this.id).mouseover(function() {
 		__IriSP.jQuery("#"+this.id).animate({opacity: 0.6}, 5);
+		_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.C.mouseover(begin:"+this.begin+",id:"+this.id+",end:"+this.end+")"]);
+		
 	}).mouseout(function(){		
 		__IriSP.jQuery("#"+this.id).animate({opacity: 0.3}, 5);
+		_gaq.push(['_trackPageview', location.pathname + location.search + location.hash+"/#!/MetaDatPlayer.C.mouseout(begin:"+this.begin+",id:"+this.id+",end:"+this.end+")"]);
+		
 	});
 	__IriSP.trace("__IriSP.Annotation.prototype.draw","ADD ANOTATION : "+this.begin+" "+this.end+" "+__IriSP.stripHtml(this.title)+" | "+startPourcent+" | "+endPourcent+" | duration = "+this.duration);