Mercurial Mercurial > tweet_live / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed Protocol on FENS 2012 V01.99
authorRaphael Velt <raph.velt@gmail.com>
Tue, 28 Aug 2012 12:29:30 +0200
changeset 685 b48fe0f2d5b1
parent 684 f59daf0830d2
child 686 3fb54af6f3cc
Removed Protocol on FENS 2012
web/fens2012-designmetadata/config.php file | annotate | diff | comparison | revisions
web/fens2012-edito-datajournalisme/config.php file | annotate | diff | comparison | revisions
web/fens2012-gamestudies/config.php file | annotate | diff | comparison | revisions
web/fens2012-museo-culture-opendata/config.php file | annotate | diff | comparison | revisions
web/fens2012-vinyl-numerique/config.php file | annotate | diff | comparison | revisions
web/fens2012-wiid/config.php file | annotate | diff | comparison | revisions
web/player_embed.php file | annotate | diff | comparison | revisions
web/polemicaltimeline.php file | annotate | diff | comparison | revisions 
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:{
--- 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:{
tweet_live