# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1366820356 -7200
# Node ID 5ae47c6af545ba01ea5a8f35c09ac32b503535b6
# Parent  6b7c534792b7a5beb9e9b4c82b0b7b72a58b4d56
Added Renkans for eduinov-2013

diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/apprendre-avec-tice-1/config.php
--- a/web/eduinov-2013/apprendre-avec-tice-1/config.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/apprendre-avec-tice-1/config.php	Wed Apr 24 18:19:16 2013 +0200
@@ -112,5 +112,7 @@
  	'archive_description' => 'Journées de l’Innovation 2013, Ministère de l’Éducation Nationale',
 
     // After the event
-	'metadata'    => "87abcc34-9d13-11e2-959a-00145ea4a2be"
+	'metadata'    => "87abcc34-9d13-11e2-959a-00145ea4a2be",
+    
+    'renkan' => 'http://renkan.iri-research.org/renkan/rest/projects/ef7ea617-df99-4c73-b4b6-0408f2e503f3?callback=?'
 );
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/apprendre-avec-tice-1/index.php
--- a/web/eduinov-2013/apprendre-avec-tice-1/index.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/apprendre-avec-tice-1/index.php	Wed Apr 24 18:19:16 2013 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: polemicaltimeline.php");
+header("Location: renkan.php");
 exit();
 ?>
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/apprendre-avec-tice-2/config.php
--- a/web/eduinov-2013/apprendre-avec-tice-2/config.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/apprendre-avec-tice-2/config.php	Wed Apr 24 18:19:16 2013 +0200
@@ -112,5 +112,7 @@
  	'archive_description' => 'Journées de l’Innovation 2013, Ministère de l’Éducation Nationale',
 
     // After the event
-	'metadata'    => "f007b7c0-9d13-11e2-b8d2-00145ea4a2be"
+	'metadata'    => "f007b7c0-9d13-11e2-b8d2-00145ea4a2be",
+	
+    'renkan' => 'http://renkan.iri-research.org/renkan/rest/projects/ef7ea617-df99-4c73-b4b6-0408f2e503f3?callback=?'
 );
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/apprendre-avec-tice-2/index.php
--- a/web/eduinov-2013/apprendre-avec-tice-2/index.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/apprendre-avec-tice-2/index.php	Wed Apr 24 18:19:16 2013 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: polemicaltimeline.php");
+header("Location: renkan.php");
 exit();
 ?>
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/egalite-filles-garcons/config.php
--- a/web/eduinov-2013/egalite-filles-garcons/config.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/egalite-filles-garcons/config.php	Wed Apr 24 18:19:16 2013 +0200
@@ -112,5 +112,7 @@
  	'archive_description' => 'Journées de l’Innovation 2013, Ministère de l’Éducation Nationale',
 
     // After the event
-	'metadata'    => "dd07416c-9d23-11e2-b8d2-00145ea4a2be"
+	'metadata'    => "dd07416c-9d23-11e2-b8d2-00145ea4a2be",
+	
+	"renkan" => "http://renkan.iri-research.org/renkan/rest/projects/78a4eddf-7a75-475a-a880-4513284ec0bf?callback=?",
 );
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/egalite-filles-garcons/index.php
--- a/web/eduinov-2013/egalite-filles-garcons/index.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/egalite-filles-garcons/index.php	Wed Apr 24 18:19:16 2013 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: polemicaltimeline.php");
+header("Location: renkan.php");
 exit();
 ?>
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/eleves-decrocheurs/config.php
--- a/web/eduinov-2013/eleves-decrocheurs/config.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/eleves-decrocheurs/config.php	Wed Apr 24 18:19:16 2013 +0200
@@ -112,5 +112,7 @@
  	'archive_description' => 'Journées de l’Innovation 2013, Ministère de l’Éducation Nationale',
 
     // After the event
-	'metadata'    => "8e4112c4-9d23-11e2-85e3-00145ea4a2be"
+	'metadata'    => "8e4112c4-9d23-11e2-85e3-00145ea4a2be",
+    
+    'renkan' => 'http://renkan.iri-research.org/renkan/rest/projects/4c975169-8177-4695-9313-57c254198eb8?callback=?'
 );
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/eleves-decrocheurs/index.php
--- a/web/eduinov-2013/eleves-decrocheurs/index.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/eleves-decrocheurs/index.php	Wed Apr 24 18:19:16 2013 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: polemicaltimeline.php");
+header("Location: renkan.php");
 exit();
 ?>
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/intervention-ministre/config.php
--- a/web/eduinov-2013/intervention-ministre/config.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/intervention-ministre/config.php	Wed Apr 24 18:19:16 2013 +0200
@@ -112,5 +112,7 @@
  	'archive_description' => 'Journées de l’Innovation 2013, Ministère de l’Éducation Nationale',
 
     // After the event
-	'metadata'    => "4254fd62-9d14-11e2-b8d2-00145ea4a2be"
+	'metadata'    => "4254fd62-9d14-11e2-b8d2-00145ea4a2be",
+	
+    'renkan' => 'http://renkan.iri-research.org/renkan/rest/projects/c867cae8-5d07-4eeb-a68b-616c9471b5fe?callback=?'
 );
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/intervention-ministre/index.php
--- a/web/eduinov-2013/intervention-ministre/index.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/intervention-ministre/index.php	Wed Apr 24 18:19:16 2013 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: polemicaltimeline.php");
+header("Location: renkan.php");
 exit();
 ?>
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/numerique-outils-usages/config.php
--- a/web/eduinov-2013/numerique-outils-usages/config.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/numerique-outils-usages/config.php	Wed Apr 24 18:19:16 2013 +0200
@@ -112,5 +112,7 @@
  	'archive_description' => 'Journées de l’Innovation 2013, Ministère de l’Éducation Nationale',
 
     // After the event
-	'metadata'    => "4eae5822-a8e2-11e2-be4f-00145ea4a2be"
+	'metadata'    => "4eae5822-a8e2-11e2-be4f-00145ea4a2be",
+    
+    'renkan' => 'http://renkan.iri-research.org/renkan/rest/projects/4565e1bd-8085-4117-9b2d-d97c36afb9ee?callback=?'
 );
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/numerique-outils-usages/index.php
--- a/web/eduinov-2013/numerique-outils-usages/index.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/numerique-outils-usages/index.php	Wed Apr 24 18:19:16 2013 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: polemicaltimeline.php");
+header("Location: renkan.php");
 exit();
 ?>
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/plus-de-maitres-que-de-classes/config.php
--- a/web/eduinov-2013/plus-de-maitres-que-de-classes/config.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/plus-de-maitres-que-de-classes/config.php	Wed Apr 24 18:19:16 2013 +0200
@@ -112,5 +112,7 @@
  	'archive_description' => 'Journées de l’Innovation 2013, Ministère de l’Éducation Nationale',
 
     // After the event
-	'metadata'    => "5d434ea2-9d24-11e2-b8d2-00145ea4a2be"
+	'metadata'    => "5d434ea2-9d24-11e2-b8d2-00145ea4a2be",
+    
+    'renkan' => 'http://renkan.iri-research.org/renkan/rest/projects/6f82e6e7-cf79-40b6-b44c-38a145500287?callback=?'
 );
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/eduinov-2013/plus-de-maitres-que-de-classes/index.php
--- a/web/eduinov-2013/plus-de-maitres-que-de-classes/index.php	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/eduinov-2013/plus-de-maitres-que-de-classes/index.php	Wed Apr 24 18:19:16 2013 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: polemicaltimeline.php");
+header("Location: renkan.php");
 exit();
 ?>
\ No newline at end of file
diff -r 6b7c534792b7 -r 5ae47c6af545 web/res/metadataplayer/Renkan.css
--- a/web/res/metadataplayer/Renkan.css	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/res/metadataplayer/Renkan.css	Wed Apr 24 18:19:16 2013 +0200
@@ -103,12 +103,17 @@
     margin: 5px auto; display: block; max-width: 255px !important; max-height: 120px !important;
 }
 
+
 .Rk-ZoomButtons {
     position: absolute; left: 0; top: 35px; cursor: pointer;
 }
 
+.Rk-Editing-Space-Full .Rk-ZoomButtons {
+    top: 0;
+}
+
 .Rk-ZoomIn, .Rk-ZoomOut {
-    width: 21px; height: 20px; background: url(../img/zoombuttons.png); margin: 5px;
+    width: 21px; height: 20px; background: url(img/zoombuttons.png); margin: 5px;
 }
 
 .Rk-ZoomIn:hover {
diff -r 6b7c534792b7 -r 5ae47c6af545 web/res/metadataplayer/Renkan.js
--- a/web/res/metadataplayer/Renkan.js	Wed Apr 24 10:56:14 2013 +0200
+++ b/web/res/metadataplayer/Renkan.js	Wed Apr 24 18:19:16 2013 +0200
@@ -49,6 +49,7 @@
                     uri: _uri,
                     selected: false,
                     node: _node,
+                    annotation: _ann,
                     begin: _ann.begin - _preroll,
                     end: _ann.end + _preroll
                 }
@@ -81,8 +82,7 @@
                     }
                 });
                 _node.on("clicked", function() {
-                    _this.media.setCurrentTime(_ann.begin);
-                    _this.player.trigger("Mediafragment.setHashToAnnotation", _ann.id);
+                    _ann.trigger("click");
                 });
             });
         }
@@ -108,7 +108,9 @@
                 return t.uri == href;
             });
         if (times.length) {
-            _this.media.setCurrentTime(times[0].begin);
+            IriSP._(times).each(function(t) {
+                t.annotation.trigger("click");
+            });
             return false;
         }
     });