# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1346149770 -7200
# Node ID b48fe0f2d5b1b62e684d5c4965bd38ded9944e81
# Parent  f59daf0830d25e91f25a8d234360daa7439e1c46
Removed Protocol on FENS 2012

diff -r f59daf0830d2 -r b48fe0f2d5b1 web/fens2012-designmetadata/config.php
--- a/web/fens2012-designmetadata/config.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/fens2012-designmetadata/config.php	Tue Aug 28 12:29:30 2012 +0200
@@ -83,5 +83,5 @@
 
     // After the event
 	'metadata'    => "86f2eff0-c9da-11e1-9443-00145ea4a2be",
-	'protocol_level' => 3,
+//	'protocol_level' => 3,
 );
\ No newline at end of file
diff -r f59daf0830d2 -r b48fe0f2d5b1 web/fens2012-edito-datajournalisme/config.php
--- a/web/fens2012-edito-datajournalisme/config.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/fens2012-edito-datajournalisme/config.php	Tue Aug 28 12:29:30 2012 +0200
@@ -107,5 +107,5 @@
 
     // After the event
 	'metadata'    => "982fb558-c9dc-11e1-9443-00145ea4a2be",
-	'protocol_level' => 3,
+//	'protocol_level' => 3,
 );
\ No newline at end of file
diff -r f59daf0830d2 -r b48fe0f2d5b1 web/fens2012-gamestudies/config.php
--- a/web/fens2012-gamestudies/config.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/fens2012-gamestudies/config.php	Tue Aug 28 12:29:30 2012 +0200
@@ -122,5 +122,5 @@
         ),
     ),
     
-    'protocol_level' => 3
+//    'protocol_level' => 3
 );
\ No newline at end of file
diff -r f59daf0830d2 -r b48fe0f2d5b1 web/fens2012-museo-culture-opendata/config.php
--- a/web/fens2012-museo-culture-opendata/config.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/fens2012-museo-culture-opendata/config.php	Tue Aug 28 12:29:30 2012 +0200
@@ -92,5 +92,5 @@
 
     // After the event
 	'metadata'    => "743934fe-c9db-11e1-9443-00145ea4a2be",
-	'protocol_level' => 3,
+//	'protocol_level' => 3,
 );
\ No newline at end of file
diff -r f59daf0830d2 -r b48fe0f2d5b1 web/fens2012-vinyl-numerique/config.php
--- a/web/fens2012-vinyl-numerique/config.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/fens2012-vinyl-numerique/config.php	Tue Aug 28 12:29:30 2012 +0200
@@ -89,5 +89,5 @@
 
     // After the event
 	'metadata'    => "1a97cc0c-c9dc-11e1-9443-00145ea4a2be",
-	'protocol_level' => 3,
+//	'protocol_level' => 3,
 );
\ No newline at end of file
diff -r f59daf0830d2 -r b48fe0f2d5b1 web/fens2012-wiid/config.php
--- a/web/fens2012-wiid/config.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/fens2012-wiid/config.php	Tue Aug 28 12:29:30 2012 +0200
@@ -107,5 +107,5 @@
 
     // After the event
 	'metadata'    => "5a0efee4-d4a1-11e1-b918-00145ea4a2be",
-	'protocol_level' => 3
+//	'protocol_level' => 3
 );
\ No newline at end of file
diff -r f59daf0830d2 -r b48fe0f2d5b1 web/player_embed.php
--- a/web/player_embed.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/player_embed.php	Tue Aug 28 12:29:30 2012 +0200
@@ -88,11 +88,7 @@
                     annotation_type: [ "chap", "découpage" ]
                 },
                 { type: "Tweet" },
-                { type: "Mediafragment"},
-                {
-                    type: "Trace",
-                    default_subject: "Polemic"
-                }
+                { type: "Mediafragment"}
             ]
         },
         player:{
diff -r f59daf0830d2 -r b48fe0f2d5b1 web/polemicaltimeline.php
--- a/web/polemicaltimeline.php	Fri Aug 24 13:07:29 2012 +0200
+++ b/web/polemicaltimeline.php	Tue Aug 28 12:29:30 2012 +0200
@@ -164,6 +164,7 @@
                     annotation_type: [ "chap", "découpage" ]
                 },
                 { type: "Tweet" },
+<?php if (!$use_protocol): ?>
                 {
                     type: "Tagcloud",
                     container: "TagcloudContainer",
@@ -175,13 +176,11 @@
                     //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"
-<?php if ($protocol_level < 3): ?>
-                    ,
-                    polemics: []
-<?php endif; ?>
                 },
 <?php endif; ?>
+<?php endif; ?>
                 { type: "Mediafragment"},
+<?php if ($use_protocol): ?>
                 {
                     type: "Trace",
                     tracer: _tracer,
@@ -191,6 +190,7 @@
                     },
                     js_console: true
                 }
+<?php endif; ?>
             ]
         },
         player:{