Polemic tweet - <?php echo($config['title']); ?>

# HG changeset patch # User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> # Date 1309292636 -7200 # Node ID 2bf0fd3432bfa606df027d2ffbdd7697476064f2 # Parent ace2d571aefc11f34c9fb8aa546ff949e27f5e9d put more than one content for the polemical timeline diff -r ace2d571aefc -r 2bf0fd3432bf web/mashup/config.php --- a/web/mashup/config.php Tue Jun 28 12:23:36 2011 +0200 +++ b/web/mashup/config.php Tue Jun 28 22:23:56 2011 +0200 @@ -42,8 +42,14 @@ | Inflammable ", // After the event - 'metadata' => "", - 'player' => "res/metadataplayer/src/js/LdtPlayer.js" + 'metadata' => array( + 'conference'=> + array('url'=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/b2754186-a0c9-11e0-b8bd-00145ea49a02", 'display'=>'Conférence'), + 'tableronde'=> + array('url'=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/3f877114-a0cc-11e0-bc41-00145ea49a02", 'display'=>'Table Ronde') + ), + 'player' => "res/metadataplayer/src/js/LdtPlayer.js", + 'duration' => "4606" ); $player_width = 600; diff -r ace2d571aefc -r 2bf0fd3432bf web/mashup/polemicaltimeline.php --- a/web/mashup/polemicaltimeline.php Tue Jun 28 12:23:36 2011 +0200 +++ b/web/mashup/polemicaltimeline.php Tue Jun 28 22:23:56 2011 +0200 @@ -9,12 +9,14 @@ // objet actuel include_once 'config.php'; +$url = (!empty($_SERVER['HTTPS'])) ? "https://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'] : "http://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']; + ?> - Polemic tweet - <?php echo($config['title']); ?> + Polemic tweet - <?php echo($config['title']); ?> - <?php echo($url); ?> @@ -23,9 +25,14 @@ + + + @@ -76,25 +83,43 @@ position : absolute; } - + + + - + - - - @@ -139,8 +179,18 @@ _("Partager"); ?>

- -

/> _("Japonais"); ?>

- -

- - - - - -

+ +

= 0) { + res = hash_part.replace(/t=\d*/, "t="+time); + } + else { + res = hash_part; + if(res.length === 0) { + res = "#"; + } + if(hash_part.length > 0 && hash_part !=="#" ) { + res = res + "&"; + } + res = res + "t="+time; + } + return res; +}; + __IriSP.ignoreTimeFragment = function(url){ if (url.split("#")[1] != null) { var pageurl= url.split("#")[0]; } return pageurl; -} +}; /* CODE SPECIAL JW PLAYER creation + listener */ @@ -765,7 +806,7 @@ // need a methode to // re execute if this swf call does'nt work -} +}; @@ -782,7 +823,7 @@ __IriSP.DailymotionAddListeners(); __IriSP.MyApiPlayer.ready(playerid); -} +}; __IriSP.DailymotionAddListeners = function () { if (__IriSP.player) { __IriSP.trace("__IriSP.addListeners","ADD Listener "); @@ -794,7 +835,7 @@ } else { __IriSP.setTimeout("__IriSP.DailymotionAddListeners()",100); } -} +}; __IriSP.DailymotionPositionListener = function() { __IriSP.currentPosition = __IriSP.player.getCurrentTime(); @@ -808,7 +849,7 @@ */ setTimeout("__IriSP.DailymotionPositionListener()",10); -} +}; /* API YOUTUBE */ onYouTubePlayerReady= function (playerid){ @@ -827,7 +868,7 @@ __IriSP.YouTubeAddListeners(); __IriSP.trace("onYouTubePlayerReady=",time); //__IriSP.MyApiPlayer.ready(playerid); -} +}; __IriSP.YouTubeAddListeners = function () { if (__IriSP.player) { __IriSP.trace("__IriSP.addListeners","ADD Listener "); @@ -838,7 +879,7 @@ } else { __IriSP.setTimeout("__IriSP.YouTubePositionListener()",100); } -} +}; __IriSP.YouTubePositionListener = function() { __IriSP.currentPosition = __IriSP.player.getCurrentTime(); @@ -853,7 +894,7 @@ setTimeout("__IriSP.YouTubePositionListener()",10); -} +}; __IriSP.YouTubeStateMonitor = function (obj) { __IriSP.player.addModelListener('__IriSP.YouTubeStateMonitor ', newstate); //alert(newstate+" "+obj.newstate); @@ -880,7 +921,7 @@ //changePageUrlOffset(currentPosition); } -} +}; /* API VIMEO */ onVimeoPlayerReady= function (playerid){ @@ -899,7 +940,7 @@ __IriSP.YouTubeAddListeners(); __IriSP.trace("onYouTubePlayerReady=",time); //__IriSP.MyApiPlayer.ready(playerid); -} +}; __IriSP.VimeoAddListeners = function () { if (__IriSP.player) { __IriSP.trace("__IriSP.addListeners","ADD Listener "); @@ -910,7 +951,7 @@ } else { __IriSP.setTimeout("__IriSP.YouTubePositionListener()",100); } -} +}; __IriSP.VimeoPositionListener = function() { __IriSP.currentPosition = __IriSP.player.getCurrentTime(); @@ -925,7 +966,7 @@ setTimeout("__IriSP.YouTubePositionListener()",10); -} +}; __IriSP.VimeoStateMonitor = function (obj) { __IriSP.player.addModelListener('__IriSP.YouTubeStateMonitor ', newstate); //alert(newstate+" "+obj.newstate); @@ -952,7 +993,7 @@ //changePageUrlOffset(currentPosition); } -} +}; /* API JW PLAYER */ __IriSP.playerReady = function (thePlayer) { @@ -975,7 +1016,7 @@ __IriSP.addListeners(); //__IriSP.trace("__IriSP.playerReady"," LISTENER END"); -} +}; __IriSP.addListeners = function () { if (__IriSP.player) { __IriSP.trace("__IriSP.addListeners","ADD Listener "); @@ -987,7 +1028,7 @@ } // et changer les boutons -} +}; __IriSP.stateMonitor = function (obj) { @@ -1010,7 +1051,7 @@ //changePageUrlOffset(currentPosition); } -} +}; __IriSP.positionListener = function(obj) { //__IriSP.trace("__IriSP.positionListener",obj.position); __IriSP.currentPosition = obj.position; @@ -1025,12 +1066,12 @@ __IriSP.MyLdt.checkTime(__IriSP.currentPosition); -} +}; __IriSP.volumeListener = function (obj) { __IriSP.currentVolume = obj.percentage; var tmp = document.getElementById("vol"); if (tmp) { tmp.innerHTML = "volume: " + __IriSP.currentVolume; } -} +}; @@ -1039,7 +1080,7 @@ // code from http://stackoverflow.com/questions/822452/strip-html-from-text-javascript __IriSP.stripHtml = function(s){ return s.replace(/\\&/g, '&').replace(/\\/g, '>').replace(/\\t/g, ' ').replace(/\\n/g, '
').replace(/'/g, ''').replace(/"/g, '"'); -} +}; // conversion de couleur Decimal vers HexaDecimal || 000 si fff __IriSP.DEC_HEXA_COLOR = function (dec){ var hexa='0123456789ABCDEF',hex=''; @@ -1052,7 +1093,7 @@ hex = hexa.charAt(dec)+hex; //if (hex == "FFCC00"){ hex="";/* by default color of Ldt annotation */ } return(hex); -} +}; /* @@ -1087,30 +1128,30 @@ this.annotationOldRead=""; __IriSP.LDTligne = this; __IriSP.trace("__IriSP.Ligne","CREATE "+__IriSP.LDTligne); -} +}; __IriSP.Ligne.prototype.addAnnotation = function (json){ var myAnnotation = new __IriSP.Annotation(json,this.duration); this.annotations.push(myAnnotation); //__IriSP.trace("__IriSP.Ligne.prototype.addAnnotation ","add annotation "+title); -} +}; __IriSP.Ligne.prototype.onClickLigneAnnotation = function(id){ //changePageUrlOffset(currentPosition); //player.sendEvent('SEEK', this.start); //__IriSP.trace("SEEK",this.start); -} +}; __IriSP.Ligne.prototype.searchLigneAnnotation = function(id){ /*for (){ }*/ -} +}; __IriSP.Ligne.prototype.listAnnotations = function(){ -} +}; __IriSP.Ligne.prototype.nextAnnotation = function (){ var annotationCibleNumber = this.numAnnotation(this.annotationOldRead)+1; var annotationCible = this.annotations[annotationCibleNumber]; if(annotationCibleNumber '+' '; @@ -1242,18 +1283,18 @@ this.htmlTags += ' '+__IriSP.MyTags.getTitle(this.tags[i]['id-ref'])+' '+" , "; } } -} +}; __IriSP.Annotation.prototype.tootTipAnnotation = function() { // 1 chercher le div correspondant // 2 y mettre les information return this.color + ' ' + this.type + ' apple'; -} +}; __IriSP.Annotation.prototype.onRollOverAnnotation = function (){ //this.tootTip(); -} +}; __IriSP.Annotation.prototype.timeToPourcent = function(time,timetotal){ return (parseInt(Math.round(time/timetotal*100))); -} +}; /* CLASS Tags */ @@ -1263,7 +1304,7 @@ this.htmlTags = null; this.weigthMax = 0; //this.mySegments = new array(); -} +}; __IriSP.Tags.prototype.addAnnotation = function (annotation){ for (var i = 0; i < this.myTags.length; ++i){ this.myTags[i].mySegments = new Array(); @@ -1271,7 +1312,7 @@ for (var j = 0; j < annotation.tags.length; ++j){ if (this.myTags[i]['id'] == annotation.tags[j]['id-ref']){ this.myTags[i].mySegments.push([annotation.begin,annotation.end,annotation.id]); - var weigthTempo = this.myTags[i].mySegments.length + var weigthTempo = this.myTags[i].mySegments.length; var tempo = this.myTags[i].mySegments[weigthTempo-1]; //__IriSP.trace ("__IriSP.Tags.prototype.addAnnotation "," "+this.myTags[i]['meta']['dc:title']+" "+this.myTags[i]['id']+" : "+tempo[0]+" - "+tempo[1]); @@ -1282,7 +1323,7 @@ } } } -} +}; __IriSP.Tags.prototype.getTitle = function (id){ for (var i = 0; i < this.myTags.length; ++i){ if(this.myTags[i]['id']==id){ @@ -1290,7 +1331,7 @@ } } -} +}; __IriSP.Tags.prototype.draw = function (){ __IriSP.trace("__IriSP.Tags.prototype.draw"," !!! WELL START " ); @@ -1307,7 +1348,7 @@ __IriSP.jQuery('#Ldt-Tags').html(this.htmlTags); __IriSP.trace("__IriSP.Tags.prototype.draw"," !!!! END WMAX= "+this.weigthMax ); -} +}; __IriSP.Tags.prototype.show = function (id){ var timeStartOffsetA = 100000000000000000000; @@ -1332,12 +1373,12 @@ if(timeStartOffset> this.myTags[i].mySegments[j][0]){ timeStartOffsetA = this.myTags[i].mySegments[j][0]; timeStartOffsetB = this.myTags[i].mySegments[j][1]; - timeStartID = this.myTags[i].mySegments[j][2] + timeStartID = this.myTags[i].mySegments[j][2]; } if(timeStartOffset> this.myTags[i].mySegments[j][0]){ timeEndOffsetA = this.myTags[i].mySegments[j][0]; timeEndOffsetB = this.myTags[i].mySegments[j][1]; - timeEndID = this.myTags[i].mySegments[j][2] + timeEndID = this.myTags[i].mySegments[j][2]; } } @@ -1357,7 +1398,7 @@ -} +}; /* CLASS TRACE */ @@ -1369,11 +1410,5 @@ __IriSP.traceNum += 1; __IriSP.jQuery("

"+__IriSP.traceNum+" - "+msg+" : "+value+"

").appendTo("#Ldt-output"); } +}; -} - - - - - - \ No newline at end of file