diff -r 07ab28bca482 -r d366aa22bd79 web/polemicaltimeline.php
--- a/web/polemicaltimeline.php	Wed May 02 19:19:51 2012 +0200
+++ b/web/polemicaltimeline.php	Thu May 03 17:52:07 2012 +0200
@@ -60,102 +60,78 @@
 	
 	<script type="text/javascript">
   		// Configuration Polemical Timeline
-  		if (typeof jQuery == "undefined") {
-  		    jQuery = IriSP.jQuery;
-  		}
-  		<?php
-      		if(is_array($translate->_('config__metadata'))):
-  			reset($translate->_('config__metadata'));
-  		    $first_key = key($translate->_('config__metadata'));
-  		?>
-  		var metadatas = jQuery.parseJSON('<?php echo(json_encode($translate->_('config__metadata'))); ?>');
-  		var url = jQuery.url();
-  		var metadata_key = url.fparam('metadata');
-  		if(typeof metadata_key === "undefined" || metadata_key.length === 0) {
-  			metadata_key = "<?php echo($first_key);?>";
-  		}
-  		<?php else: ?>
-  		var metadatas = { metadata: {url: "<?php echo($translate->_('config__metadata'));?>"} };
-  		var metadata_key = "metadata";
-  		<?php endif;?>
+	if (typeof jQuery == "undefined") {
+	    jQuery = IriSP.jQuery;
+	}
+	<?php
+  		if(is_array($translate->_('config__metadata'))):
+		reset($translate->_('config__metadata'));
+	    $first_key = key($translate->_('config__metadata'));
+	?>
+	var metadatas = jQuery.parseJSON('<?php echo(json_encode($translate->_('config__metadata'))); ?>');
+	var url = jQuery.url();
+	var metadata_key = url.fparam('metadata');
+	if(typeof metadata_key === "undefined" || metadata_key.length === 0) {
+		metadata_key = "<?php echo($first_key);?>";
+	}
+	<?php else: ?>
+	var metadatas = { metadata: {url: "<?php echo($translate->_('config__metadata'));?>"} };
+	var metadata_key = "metadata";
+	<?php endif;?>
+  		
+	
     IriSP.libFiles.defaultDir = "<?php echo(registry_url('libdir','js'));?>";
+    IriSP.widgetsDir = "<?php echo(registry_url('ldtwidgets','js'));?>";
     IriSP.jwplayer_swf_path = "<?php echo(URL_ROOT); ?>res/mediaplayer/player.swf";
-    IriSP.language = "<?php echo($actual) ?>"
-    var json_url = metadatas[metadata_key].url;
-
-    var config = {            
-        gui:{
-            width:650,
-            height:800,              
-            container:'LdtPlayer',
+    IriSP.language = "<?php echo($actual) ?>";
+    
+    var _metadata = {
+        url: metadatas[metadata_key].url + '?callback=?',
+        format: 'ldt'
+    };
+    var _config = {            
+        gui: {
+            width: 600,
+            height: 800,
+            container: 'LdtPlayer',
+            default_options: {
+                metadata: _metadata
+            },
             css:'<?php echo(registry_url('metadataplayer','css'));?>',
-            default_options : {
-                metadata:{
-                format:'cinelab',
-                src: json_url,
-                type:'json'},
-                width: 650
-            },
             widgets: [
-            {
-                type: "PolemicWidget",
-                requires: [{
-                    type: "TooltipWidget",
-                    width: 180,
-                    height: 160,
-                    metadata : {
-                        type:'empty'
-                    }
-                }],
-                height: 5
-            },
-            {type: "SliderWidget"},        
-            {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
-             mode: "radio",
-             disable_annotate_btn: true},
-            {type: "SegmentsWidget",
-             requires: [{
-              type: "TooltipWidget",
-              width: 180,
-              height: 160,
-              }],
-                width: 650
-            },                      
-            {type: "ArrowWidget"},
-            {type: "TweetsWidget"},
-            {type: "AnnotationsWidget"},
-            {type: "AnnotationsListWidget",
-             container: "AnnotationsListContainer",
-             ajax_mode: false},
-            {type: "TagCloudWidget",
-             container: "TagcloudContainer",
-        <?php if (isset($config['hashtag'])) echo "excludeWords: ".json_encode(array($config['hashtag'])).","; ?>
-            excludePattern: /^@/
-        },{
-            type: "TraceWidget",
-         //   js_console : true,
-            url: "http://traces.advene.org:5000/",
-            requestmode: 'GET',
-            syncmode: "sync"
+                { type: "Polemic" },
+                { type: "Slider" },
+                {
+                    type: "Controller",
+                    disable_annotate_btn: true
+                },
+                { type: "Segments" },
+                { type: "Arrow" },
+                { type: "Annotation" },
+                { type: "Tweet" },
+                {
+                    type: "Tagcloud",
+                    container: "TagcloudContainer",
+                    exclude_pattern: /^@/,
+                    custom_stopwords: <?php echo json_encode(array($config['hashtag'])) ?>
+                },
+                {
+                    type: "AnnotationsList",
+                    //ajax_url : "http://ldt.iri.centrepompidou.fr/ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}?callback=?", 
+                    //foreign_url : "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/{{media}}/{{project}}/{{annotationType}}#id={{annotation}}",
+                    container: "AnnotationsListContainer"
+                },
+                { type: "Mediafragment"},
+            ]
+        },
+        player:{
+            type:'jwplayer', // player type
+            live: true, 
+            height: 360, 
+            width: 600, 
+            provider: "rtmp",
+            autostart: true
         }
-        ]
-        },
-      player:{
-          type:'jwplayer',
-          live: true, 
-          height: 400, 
-          width: 650, 
-          provider: "rtmp",
-          autostart: true
-      },
-      modules: [
-               { type: "MediaFragment",
-                         metadata:{
-                       format:'cinelab',
-                           src:json_url,
-                             type:'json'}
-                        }]
-
     };
 
 		jQuery(document).ready(function() {
@@ -293,7 +269,7 @@
                 <h3>Mots-clés</h3>
             </li>
             <li class="acctexte" style="display: none;">
-                <div class="tagcloud" id="TagcloudContainer"></div>
+                <div id="TagcloudContainer"></div>
             </li>
         </ul>
 		
@@ -314,7 +290,7 @@
 		<div id="LdtPlayer"></div>
 	  </div>
 <script type="text/javascript">
-    IriSP.initPlayer(config, json_url);
+    var _myPlayer = new IriSP.Metadataplayer(_config, _metadata);
 </script>
   </div>