--- a/web/mashup/polemicaltimeline.php	Tue Jun 28 22:23:56 2011 +0200
+++ b/web/mashup/polemicaltimeline.php	Thu Jun 30 02:10:21 2011 +0200
@@ -98,7 +98,7 @@
   			metadata_key = "<?php echo($first_key);?>";
   		} 
   		<?php else: ?>
-  		var metadatas = { metadata: {url: "<?php echo($config['metadata'])?>"} };
+  		var metadatas = { metadata: {url: "<?php echo($config['metadata'])?>", duration: <?php echo($config['duration'])?>} };
   		var metadata_key = "metadata"; 
   		<?php endif;?>
   		
@@ -109,7 +109,7 @@
 					width:<?php echo($player_width); ?>,
 					height:<?php echo($player_height); ?>,
 					heightmax:<?php echo($player_height); ?>,
-					duration:<?php echo($config['duration']); ?>,
+					duration:metadatas[metadata_key].duration,
 					metadata:metadatas[metadata_key].url
 					};
   	</script>
@@ -132,18 +132,7 @@
 			jQuery("#mdselect_"+metadata_key).attr("selected","selected");
 			jQuery("#mdselect").change(function() {
 				var metadata_key = this.options[this.selectedIndex].value;
-				var hashpart = window.location.hash;
-				var window_location = window.location.href;
-				if(hashpart.length === 0) {
-					hashpart = "#metadata="+metadata_key;
-				}
-				else if (hashpart.indexOf("metadata=")>=0) {
-					hashpart = hashpart.replace(/metadata=[\w\d]*/, "metadata="+metadata_key)
-				}
-				else {
-					hashpart += "&metadata="+metadata_key;
-				}
-				window.location.hash = hashpart;
+				window.location.hash = "#metadata="+metadata_key;
 				window.location.href = window.location.href;
 				window.location.reload(true);
 			});
@@ -181,6 +170,7 @@
 	  </ul>
 	<?php if(is_array($config['metadata'])):?>
 	<ul id="content_select_ul" class="menu mdselect">
+	    <?php print $translate->_("changer de contenu"); ?><br/>
 	    <select id="mdselect">
 	    	<?php foreach ($config['metadata'] as $key => $value):?>
 	    	<option value="<?php echo($key); ?>" id="mdselect_<?php echo($key); ?>" ><?php echo($value['display']); ?></option>