# HG changeset patch
# User veltr
# Date 1367846069 -7200
# Node ID 009427475db27db5571327eeffe8bd32aa84cfae
# Parent  9b8df8d779f5e2336c049acdb2d7133af797534c
Improvements for MDP and CG

diff -r 9b8df8d779f5 -r 009427475db2 client/css/renkan.css
--- a/client/css/renkan.css	Wed Apr 24 10:30:28 2013 +0200
+++ b/client/css/renkan.css	Mon May 06 15:14:29 2013 +0200
@@ -386,6 +386,10 @@
     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;
 }
diff -r 9b8df8d779f5 -r 009427475db2 client/js/defaults.js
--- a/client/js/defaults.js	Wed Apr 24 10:30:28 2013 +0200
+++ b/client/js/defaults.js	Mon May 06 15:14:29 2013 +0200
@@ -29,6 +29,8 @@
     allow_double_click: true,
         /* Allows Double Click to create a node on an empty background */
     element_delete_delay: 5000,
+        /* Delay between clicking on the bin on an element and really deleting it */
+    autoscale_padding: 50,
     
     /* MINI-MAP OPTIONS */
     
@@ -36,6 +38,7 @@
         /* Show a small map at the bottom right */
     minimap_width: 160,
     minimap_height: 120,
+    minimap_padding: 20,
     minimap_background_color: "#ffffff",
     minimap_border_color: "#cccccc",
     minimap_highlight_color: "#ffff00",
@@ -86,6 +89,40 @@
     tooltip_top_color: "#f0f0f0",
     tooltip_bottom_color: "#d0d0d0",
     tooltip_border_color: "#808080",
-    tooltip_border_width: 1
+    tooltip_border_width: 1,
+    
+    /* NODE EDITOR OPTIONS */
+    
+    show_node_editor_uri: true,
+    show_node_editor_description: true,
+    show_node_editor_size: true,
+    show_node_editor_color: true,
+    show_node_editor_image: true,
+    show_node_editor_creator: true,
+    
+    /* NODE TOOLTIP OPTIONS */
+    
+    show_node_tooltip_uri: true,
+    show_node_tooltip_description: true,
+    show_node_tooltip_color: true,
+    show_node_tooltip_image: true,
+    show_node_tooltip_creator: true,
+    
+    /* EDGE EDITOR OPTIONS */
+    
+    show_edge_editor_uri: true,
+    show_edge_editor_color: true,
+    show_edge_editor_direction: true,
+    show_edge_editor_nodes: true,
+    show_edge_editor_creator: true,
+    
+    /* EDGE TOOLTIP OPTIONS */
+    
+    show_edge_tooltip_uri: true,
+    show_edge_tooltip_color: true,
+    show_edge_tooltip_nodes: true,
+    show_edge_tooltip_creator: true
+    
+    /* */
     
 };
diff -r 9b8df8d779f5 -r 009427475db2 client/js/paper-renderer.js
--- a/client/js/paper-renderer.js	Wed Apr 24 10:30:28 2013 +0200
+++ b/client/js/paper-renderer.js	Mon May 06 15:14:29 2013 +0200
@@ -1,5 +1,4 @@
 Rkns.Renderer = {
-    _MINIMAP_MARGIN: 20,
     _MIN_DRAG_DISTANCE: 2,
     _NODE_BUTTON_WIDTH: 40,
     _EDGE_BUTTON_INNER: 2,
@@ -11,7 +10,6 @@
     _NODE_SIZE_STEP: Math.LN2/4,
     _MIN_SCALE: 1/20,
     _MAX_SCALE: 20,
-    _AUTOSCALE_MARGIN: 50,
     _MOUSEMOVE_RATE: 80,
     _DOUBLETAP_DELAY: 800,
     _DOUBLETAP_DISTANCE: 20*20,
@@ -838,24 +836,24 @@
 Rkns.Renderer.NodeEditor.prototype.template = Rkns._.template(
     '<h2><span class="Rk-CloseX">&times;</span><%-renkan.translate("Edit Node")%></span></h2>'
     + '<p><label><%-renkan.translate("Title:")%></label><input class="Rk-Edit-Title" type="text" value="<%-node.title%>"/></p>'
-    + '<p><label><%-renkan.translate("URI:")%></label><input class="Rk-Edit-URI" type="text" value="<%-node.uri%>"/><a class="Rk-Edit-Goto" href="<%-node.uri%>" target="_blank"></a></p>'
-    + '<p><label><%-renkan.translate("Description:")%></label><textarea class="Rk-Edit-Description"><%-node.description%></textarea></p>'
-    + '<p><span class="Rk-Editor-Label"><%-renkan.translate("Size:")%></span><a href="#" class="Rk-Edit-Size-Down">-</a><span class="Rk-Edit-Size-Value"><%-node.size%></span><a href="#" class="Rk-Edit-Size-Up">+</a></p>'
-    + '<div class="Rk-Editor-p"><span class="Rk-Editor-Label"><%-renkan.translate("Node color:")%></span><div class="Rk-Edit-ColorPicker-Wrapper"><span class="Rk-Edit-Color" style="background:<%-node.color%>;"><span class="Rk-Edit-ColorTip"></span></span><ul class="Rk-Edit-ColorPicker">'
-    + '<% _(Rkns.pickerColors).each(function(c) { %><li data-color="<%=c%>" style="background: <%=c%>"></li><% }); %></ul><span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span></div></div>'
-    + '<img class="Rk-Edit-ImgPreview" src="<%-node.image || node.image_placeholder%>" />'
+    + '<% if (options.show_node_editor_uri) { %><p><label><%-renkan.translate("URI:")%></label><input class="Rk-Edit-URI" type="text" value="<%-node.uri%>"/><a class="Rk-Edit-Goto" href="<%-node.uri%>" target="_blank"></a></p><% } %>'
+    + '<% if (options.show_node_editor_description) { %><p><label><%-renkan.translate("Description:")%></label><textarea class="Rk-Edit-Description"><%-node.description%></textarea></p><% } %>'
+    + '<% if (options.show_node_editor_size) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Size:")%></span><a href="#" class="Rk-Edit-Size-Down">-</a><span class="Rk-Edit-Size-Value"><%-node.size%></span><a href="#" class="Rk-Edit-Size-Up">+</a></p><% } %>'
+    + '<% if (options.show_node_editor_color) { %><div class="Rk-Editor-p"><span class="Rk-Editor-Label"><%-renkan.translate("Node color:")%></span><div class="Rk-Edit-ColorPicker-Wrapper"><span class="Rk-Edit-Color" style="background:<%-node.color%>;"><span class="Rk-Edit-ColorTip"></span></span><ul class="Rk-Edit-ColorPicker">'
+    + '<% _(Rkns.pickerColors).each(function(c) { %><li data-color="<%=c%>" style="background: <%=c%>"></li><% }); %></ul><span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span></div></div><% } %>'
+    + '<% if (options.show_node_editor_image) { %><img class="Rk-Edit-ImgPreview" src="<%-node.image || node.image_placeholder%>" />'
     + '<p><label><%-renkan.translate("Image URL:")%></label><input class="Rk-Edit-Image" type="text" value="<%-node.image%>"/></p>'
-    + '<p><label><%-renkan.translate("Choose Image File:")%></label><input class="Rk-Edit-Image-File" type="file" accept="image/*"/></p>'    
-    + '<% if (node.has_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span> <span class="Rk-UserColor" style="background:<%-node.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(node.created_by_title, 25) %></p><% } %>'
+    + '<p><label><%-renkan.translate("Choose Image File:")%></label><input class="Rk-Edit-Image-File" type="file" accept="image/*"/></p><% } %>'    
+    + '<% if (options.show_node_editor_creator && node.has_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span> <span class="Rk-UserColor" style="background:<%-node.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(node.created_by_title, 25) %></p><% } %>'
 );
 
 Rkns.Renderer.NodeEditor.prototype.readOnlyTemplate = Rkns._.template(
-    '<h2><span class="Rk-CloseX">&times;</span><span class="Rk-UserColor" style="background:<%-node.color%>;"></span>'
+    '<h2><span class="Rk-CloseX">&times;</span><% if (options.show_node_tooltip_color) { %><span class="Rk-UserColor" style="background:<%-node.color%>;"></span><% } %>'
     + '<span class="Rk-Display-Title"><% if (node.uri) { %><a href="<%-node.uri%>" target="_blank"><% } %><%-node.title%><% if (node.uri) { %></a><% } %></span></h2>'
-    + '<% if (node.uri) { %><p class="Rk-Display-URI"><a href="<%-node.uri%>" target="_blank"><%-node.short_uri%></a></p><% } %>'
-    + '<p><%-node.description%></p>'
-    + '<% if (node.image) { %><img class="Rk-Display-ImgPreview" src="<%-node.image%>" /><% } %>'
-    + '<% if (node.has_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span><span class="Rk-UserColor" style="background:<%-node.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(node.created_by_title, 25) %></p><% } %>'
+    + '<% if (node.uri && options.show_node_tooltip_uri) { %><p class="Rk-Display-URI"><a href="<%-node.uri%>" target="_blank"><%-node.short_uri%></a></p><% } %>'
+    + '<% if (options.show_node_tooltip_description) { %><p><%-node.description%></p><% } %>'
+    + '<% if (node.image && options.show_node_tooltip_image) { %><img class="Rk-Display-ImgPreview" src="<%-node.image%>" /><% } %>'
+    + '<% if (node.has_creator && options.show_node_tooltip_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span><span class="Rk-UserColor" style="background:<%-node.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(node.created_by_title, 25) %></p><% } %>'
 );
 
 Rkns.Renderer.NodeEditor.prototype.draw = function() {
@@ -879,7 +877,8 @@
                 created_by_title: _created_by.get("title"),
                 size: (_size > 0 ? "+" : "") + _size
             },
-            renkan: this.renkan
+            renkan: this.renkan,
+            options: this.options
         }));
     this.redraw();
     var _this = this,
@@ -895,16 +894,19 @@
         var onFieldChange = Rkns._(function() {
             Rkns._(function() {
                 if (_this.renderer.isEditable()) {
-                    var _uri = _this.editor_$.find(".Rk-Edit-URI").val(),
-                        _image = _this.editor_$.find(".Rk-Edit-Image").val();
-                    _this.editor_$.find(".Rk-Edit-ImgPreview").attr("src", _image || _image_placeholder);
-                    _this.editor_$.find(".Rk-Edit-Goto").attr("href",_uri);
                     var _data = {
-                        title: _this.editor_$.find(".Rk-Edit-Title").val(),
-                        description: _this.editor_$.find(".Rk-Edit-Description").val(),
-                        uri: _uri,
-                        image: _image
+                        title: _this.editor_$.find(".Rk-Edit-Title").val()
                     };
+                    if (_this.options.show_node_editor_url) {
+                        _data.uri = _this.editor_$.find(".Rk-Edit-URI").val();
+                    }
+                    if (_this.options.show_node_editor_image) {
+                        _data.image = _this.editor_$.find(".Rk-Edit-Image").val();
+                        _this.editor_$.find(".Rk-Edit-ImgPreview").attr("src", _data.image || _image_placeholder);
+                    }
+                    if (_this.options.show_node_editor_description) {
+                        _data.description = _this.editor_$.find(".Rk-Edit-Description").val();
+                    }
                     _model.set(_data);
                     _this.redraw();
                 } else {
@@ -1015,28 +1017,28 @@
 Rkns.Renderer.EdgeEditor.prototype.template = Rkns._.template(
     '<h2><span class="Rk-CloseX">&times;</span><%-renkan.translate("Edit Edge")%></span></h2>'
     + '<p><label><%-renkan.translate("Title:")%></label><input class="Rk-Edit-Title" type="text" value="<%-edge.title%>"/></p>'
-    + '<p><label><%-renkan.translate("URI:")%></label><input class="Rk-Edit-URI" type="text" value="<%-edge.uri%>"/><a class="Rk-Edit-Goto" href="<%-edge.uri%>" target="_blank"></a></p>'
-    + '<% if (properties.length) { %><p><label><%-renkan.translate("Choose from vocabulary:")%></label><select class="Rk-Edit-Vocabulary">'
-    + '<% _(properties).each(function(ontology) { %><option class="Rk-Edit-Vocabulary-Class" value=""><%- renkan.translate(ontology.label) %></option>'
+    + '<% if (options.show_edge_editor_uri) { %><p><label><%-renkan.translate("URI:")%></label><input class="Rk-Edit-URI" type="text" value="<%-edge.uri%>"/><a class="Rk-Edit-Goto" href="<%-edge.uri%>" target="_blank"></a></p>'
+    + '<% if (options.properties.length) { %><p><label><%-renkan.translate("Choose from vocabulary:")%></label><select class="Rk-Edit-Vocabulary">'
+    + '<% _(options.properties).each(function(ontology) { %><option class="Rk-Edit-Vocabulary-Class" value=""><%- renkan.translate(ontology.label) %></option>'
     + '<% _(ontology.properties).each(function(property) { var uri = ontology["base-uri"] + property.uri; %><option class="Rk-Edit-Vocabulary-Property" value="<%- uri %>'
     + '"<% if (uri === edge.uri) { %> selected<% } %>><%- renkan.translate(property.label) %></option>'
-    + '<% }) %><% }) %></select></p><% } %>'
-    + '<div class="Rk-Editor-p"><span class="Rk-Editor-Label"><%-renkan.translate("Edge color:")%></span><div class="Rk-Edit-ColorPicker-Wrapper"><span class="Rk-Edit-Color" style="background:<%-edge.color%>;"><span class="Rk-Edit-ColorTip"></span></span><ul class="Rk-Edit-ColorPicker">'
-    + '<% _(Rkns.pickerColors).each(function(c) { %><li data-color="<%=c%>" style="background: <%=c%>"></li><% }); %></ul><span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span></div></div>'
-    + '<p><span class="Rk-Edit-Direction"><%- renkan.translate("Change edge direction") %></span></p>'
-    + '<p><span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span><span class="Rk-UserColor" style="background:<%-edge.from_color%>;"></span><%- Rkns.Renderer.shortenText(edge.from_title, 25) %></p>'
-    + '<p><span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span><span class="Rk-UserColor" style="background:<%-edge.to_color%>;"></span><%- Rkns.Renderer.shortenText(edge.to_title, 25) %></p>'
-    + '<% if (edge.has_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span><span class="Rk-UserColor" style="background:<%-edge.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(edge.created_by_title, 25) %></p><% } %>'
+    + '<% }) %><% }) %></select></p><% } } %>'
+    + '<% if (options.show_edge_editor_color) { %><div class="Rk-Editor-p"><span class="Rk-Editor-Label"><%-renkan.translate("Edge color:")%></span><div class="Rk-Edit-ColorPicker-Wrapper"><span class="Rk-Edit-Color" style="background:<%-edge.color%>;"><span class="Rk-Edit-ColorTip"></span></span><ul class="Rk-Edit-ColorPicker">'
+    + '<% _(Rkns.pickerColors).each(function(c) { %><li data-color="<%=c%>" style="background: <%=c%>"></li><% }); %></ul><span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span></div></div><% } %>'
+    + '<% if (options.show_edge_editor_direction) { %><p><span class="Rk-Edit-Direction"><%- renkan.translate("Change edge direction") %></span></p><% } %>'
+    + '<% if (options.show_edge_editor_nodes) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span><span class="Rk-UserColor" style="background:<%-edge.from_color%>;"></span><%- Rkns.Renderer.shortenText(edge.from_title, 25) %></p>'
+    + '<p><span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span><span class="Rk-UserColor" style="background:<%-edge.to_color%>;"></span><%- Rkns.Renderer.shortenText(edge.to_title, 25) %></p><% } %>'
+    + '<% if (options.show_edge_editor_creator && edge.has_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span><span class="Rk-UserColor" style="background:<%-edge.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(edge.created_by_title, 25) %></p><% } %>'
 );
 
 Rkns.Renderer.EdgeEditor.prototype.readOnlyTemplate = Rkns._.template(
-    '<h2><span class="Rk-CloseX">&times;</span><span class="Rk-UserColor" style="background:<%-edge.color%>;"></span>'
+    '<h2><span class="Rk-CloseX">&times;</span><% if (options.show_edge_tooltip_color) { %><span class="Rk-UserColor" style="background:<%-edge.color%>;"></span><% } %>'
     + '<span class="Rk-Display-Title"><% if (edge.uri) { %><a href="<%-edge.uri%>" target="_blank"><% } %><%-edge.title%><% if (edge.uri) { %></a><% } %></span></h2>'
-    + '<% if (edge.uri) { %><p class="Rk-Display-URI"><a href="<%-edge.uri%>" target="_blank"><%-edge.short_uri%></a></p><% } %>'
+    + '<% if (options.show_edge_tooltip_uri && edge.uri) { %><p class="Rk-Display-URI"><a href="<%-edge.uri%>" target="_blank"><%-edge.short_uri%></a></p><% } %>'
     + '<p><%-edge.description%></p>'
-    + '<p><span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span><span class="Rk-UserColor" style="background:<%-edge.from_color%>;"></span><%- Rkns.Renderer.shortenText(edge.from_title, 25) %></p>'
-    + '<p><span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span><span class="Rk-UserColor" style="background:<%-edge.to_color%>;"></span><%- Rkns.Renderer.shortenText(edge.to_title, 25) %></p>'
-    + '<% if (edge.has_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span><span class="Rk-UserColor" style="background:<%-edge.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(edge.created_by_title, 25) %></p><% } %>'
+    + '<% if (options.show_edge_tooltip_nodes) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span><span class="Rk-UserColor" style="background:<%-edge.from_color%>;"></span><%- Rkns.Renderer.shortenText(edge.from_title, 25) %></p>'
+    + '<p><span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span><span class="Rk-UserColor" style="background:<%-edge.to_color%>;"></span><%- Rkns.Renderer.shortenText(edge.to_title, 25) %></p><% } %>'
+    + '<% if (options.show_edge_tooltip_creator && edge.has_creator) { %><p><span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span><span class="Rk-UserColor" style="background:<%-edge.created_by_color%>;"></span><%- Rkns.Renderer.shortenText(edge.created_by_title, 25) %></p><% } %>'
 );
 
 Rkns.Renderer.EdgeEditor.prototype.draw = function() {
@@ -1062,7 +1064,7 @@
                 created_by_title: _created_by.get("title")
             },
             renkan: this.renkan,
-            properties: this.options.properties
+            options: this.options,
         }));
     this.redraw();
     var _this = this,
@@ -1077,11 +1079,13 @@
         var onFieldChange = Rkns._(function() {
             Rkns._(function() {
                 if (_this.renderer.isEditable()) {
-                    _this.editor_$.find(".Rk-Edit-Goto").attr("href",_this.editor_$.find(".Rk-Edit-URI").val());
                     var _data = {
-                        title: _this.editor_$.find(".Rk-Edit-Title").val(),
-                        uri: _this.editor_$.find(".Rk-Edit-URI").val()
+                        title: _this.editor_$.find(".Rk-Edit-Title").val()
                     };
+                    if (_this.options.show_edge_editor_uri) {
+                        _data.uri = _this.editor_$.find(".Rk-Edit-URI").val();
+                    }
+                    _this.editor_$.find(".Rk-Edit-Goto").attr("href",_data.uri);
                     _model.set(_data);
                     paper.view.draw();
                 } else {
@@ -2001,7 +2005,7 @@
             _miny = Math.min.apply(Math, _yy),
             _maxx = Math.max.apply(Math, _xx),
             _maxy = Math.max.apply(Math, _yy);
-        var _scale = Math.max(Rkns.Renderer._MIN_SCALE, Math.min(Rkns.Renderer._MAX_SCALE, (paper.view.size.width - 2 * Rkns.Renderer._AUTOSCALE_MARGIN) / (_maxx - _minx), (paper.view.size.height - 2 * Rkns.Renderer._AUTOSCALE_MARGIN) / (_maxy - _miny)));
+        var _scale = Math.max(Rkns.Renderer._MIN_SCALE, Math.min(Rkns.Renderer._MAX_SCALE, (paper.view.size.width - 2 * this.renkan.options.autoscale_padding) / (_maxx - _minx), (paper.view.size.height - 2 * this.renkan.options.autoscale_padding) / (_maxy - _miny)));
         this.setScale(_scale, paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale)));
     }
     if (nodes.length === 1) {
@@ -2027,8 +2031,8 @@
         var _scale = Math.min(
             this.scale * .8 * this.renkan.options.minimap_width / paper.view.bounds.width,
             this.scale * .8 * this.renkan.options.minimap_height / paper.view.bounds.height,
-            ( this.renkan.options.minimap_width - 2 * Rkns.Renderer._MINIMAP_MARGIN ) / (_maxx - _minx),
-            ( this.renkan.options.minimap_height - 2 * Rkns.Renderer._MINIMAP_MARGIN ) / (_maxy - _miny)
+            ( this.renkan.options.minimap_width - 2 * this.renkan.options.minimap_padding ) / (_maxx - _minx),
+            ( this.renkan.options.minimap_height - 2 * this.renkan.options.minimap_padding ) / (_maxy - _miny)
         );
         this.minimap.offset = this.minimap.size.divide(2).subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale));
         this.minimap.scale = _scale;
diff -r 9b8df8d779f5 -r 009427475db2 client/publish-test.html
--- a/client/publish-test.html	Wed Apr 24 10:30:28 2013 +0200
+++ b/client/publish-test.html	Mon May 06 15:14:29 2013 +0200
@@ -27,7 +27,7 @@
                     show_bins: false
                 });
                 Rkns.jsonIO(_renkan, {
-                    url: "data/simple-persist.php"
+                    url: "http://renkan.iri-research.org/renkan/rest/projects/ef7ea617-df99-4c73-b4b6-0408f2e503f3"
                 });
             });
         </script>
diff -r 9b8df8d779f5 -r 009427475db2 metadataplayer/json/renkan-2.json
--- a/metadataplayer/json/renkan-2.json	Wed Apr 24 10:30:28 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,328 +0,0 @@
-{
-    "title": "Discussion Stiegler-Renucci",
-    "users": [
-        {
-            "_id": "u-anonymous",
-            "title": "anonymous",
-            "uri": "",
-            "description": "",
-            "color": "#dd00dd"
-        }, {
-            "_id": "u-cybunk",
-            "title": "Samuel",
-            "uri": "http://twitter.com/cybunk",
-            "description": "",
-            "color": "#e00000"
-        }, {
-            "_id": "u-raphv",
-            "title": "Raphael",
-            "uri": "http://twitter.com/raphv",
-            "description": "",
-            "color": "#00a000"
-        }
-    ],
-    "nodes": [
-        {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "title": "Robin Renucci : Conversation avec Bernard Stiegler",
-            "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=s_569B4FC3-C84E-4527-8999-4102A11BFA0A",
-            "description": "ロバン・ルヌッチによるプレゼンテーション（ベルナール・スティグレールとの対談）\n (langue française フランス語)",
-            "position": {
-                "x": -65,
-                "y": -123.5
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/ldt-segment.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0002",
-            "title": "Wikipedia: Robin Renucci",
-            "uri": "http://fr.wikipedia.org/wiki/Robin_Renucci",
-            "description": "Daniel Robin-Renucci, connu sous le nom de scène de Robin Renucci, est un acteur  et un réalisateur  français , né le 11 juillet  1956  au  ... ",
-            "position": {
-                "x": -280,
-                "y": -251.5
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0004",
-            "title": "Wikipedia: Bernard Stiegler",
-            "uri": "http://fr.wikipedia.org/wiki/Bernard_Stiegler",
-            "description": "Bernard Stiegler, né le 1 | avril | 1952, est un philosophe  français  qui axe sa réflexion sur les enjeux des mutations actuelles —  ... ",
-            "position": {
-                "x": -343,
-                "y": 78.5
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0006",
-            "title": "Tweet",
-            "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=8ec66540-cb76-4c82-a6a5-d6d8c92962f2-127762445681967104",
-            "description": "Vincent Puig: #tfcem Robin Renucci, membre Ars Idustrialis, prône la reconnaissance de la valeur de l'individu au coté de l'artiste (Education populaire)",
-            "position": {
-                "x": -155,
-                "y": 140
-            },
-            "image": "http://a1.twimg.com/profile_images/379424006/PortaitVP120Ko_normal.jpg",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0007",
-            "title": "Tweet",
-            "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=5cabe2c8-fbbc-4e14-b1a9-3e8954a3c3c2-127765207803101185",
-            "description": "Vincent Puig: #tfcem Stiegler relance la polémique sur la démocratisation cuturelle, Culture pour tous ou Culture pour chacun. Un enjeu électroral 2012==",
-            "position": {
-                "x": 176,
-                "y": 59
-            },
-            "image": "http://a1.twimg.com/profile_images/379424006/PortaitVP120Ko_normal.jpg",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0008",
-            "title": "Tweet",
-            "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=db404779-04ca-4c9e-9329-9d6dddbdaf7c-127773107187499009",
-            "description": "Vincent Puig: #tfcem L'origine de la démocratie ? L'écriture qui est dans le numérique dans un processus de profonde mutation??",
-            "position": {
-                "x": 1,
-                "y": 102
-            },
-            "image": "http://a1.twimg.com/profile_images/379424006/PortaitVP120Ko_normal.jpg",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0009",
-            "title": "Introduction de Renucci par Stiegler",
-            "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=s_D19F89A3-21CE-C53A-79E4-40F3839CBF17",
-            "description": "ベルナール・スティグレールによるロバン・ルヌッチの紹介(langue française フランス語)",
-            "position": {
-                "x": -304,
-                "y": -89
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/ldt-segment.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-000b",
-            "title": "Stiegler : Chocs technologiques ...",
-            "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=s_6C326EED-B91A-AEDF-032D-40D9A60AAD7E",
-            "description": "ベルナール・スティグレールによるプレゼンテーション『テクノロジーの衝撃と大学の諸課題――デジタル・スタディーズの時代』 (langue française フランス語)",
-            "position": {
-                "x": -505,
-                "y": -123
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/ldt-segment.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0010",
-            "title": "Introduction de Fujihata par Ishida",
-            "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=s_048BB538-83E9-58D6-18B2-411A24D12FEA",
-            "description": "石田英敬による藤幡正樹の紹介(langue française フランス語)",
-            "position": {
-                "x": 128,
-                "y": -198
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/ldt-segment.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0015",
-            "title": "Wikipedia: Culture",
-            "uri": "http://fr.wikipedia.org/wiki/Culture",
-            "description": "En philosophie , le mot culture désigne ce qui est différent de la nature , c'est-à-dire ce qui est de l'ordre de l'acquis et non de l'inné ... ",
-            "position": {
-                "x": 329,
-                "y": -78
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0017",
-            "title": "Wikipedia: Démocratie",
-            "uri": "http://fr.wikipedia.org/wiki/D%C3%A9mocratie",
-            "description": "La démocratie (du grec ancien. δημοκρατία / grc-Latn | dēmokratía souveraineté du peuple », de grec ancien | δῆμος / Lang | grc-Latn |  ... ",
-            "position": {
-                "x": 72,
-                "y": 268
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-001a",
-            "title": "Wikipedia: Démocratisation",
-            "uri": "http://fr.wikipedia.org/wiki/D%C3%A9mocratisation",
-            "description": "Le terme démocratisation est équivoque.  Il peut désigner le:  Renforcement du caractère démocratique  d’un régime politique (par exemple en ... ",
-            "position": {
-                "x": 250,
-                "y": 234
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-001d",
-            "title": "Wikipedia: Politique culturelle française",
-            "uri": "http://fr.wikipedia.org/wiki/Politique_culturelle_fran%C3%A7aise",
-            "description": "De la démocratisation à la démocratie culturelle: Image:Bibliotheque nationale de France-fr. jpg | La Très grande bibliothèque, décidée par  ... ",
-            "position": {
-                "x": 358,
-                "y": 69
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "node-2012-09-07-7e8a09d3a0309d08-0020",
-            "title": "Wikipedia: Éducation populaire",
-            "uri": "http://fr.wikipedia.org/wiki/%C3%89ducation_populaire",
-            "description": "L éducation populaire est un vaste courant de pensée qui cherche principalement à promouvoir en dehors des structures traditionnelles  ... ",
-            "position": {
-                "x": -264,
-                "y": 256
-            },
-            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
-            "created_by": "u-anonymous"
-        }
-    ],
-    "edges": [
-        {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0003",
-            "title": "participant",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0002",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0005",
-            "title": "participant",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0004",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-000a",
-            "title": "introduction à",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0009",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-000c",
-            "title": "précède",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-000b",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0009",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-000d",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0002",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0009",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-000e",
-            "title": "participant",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0009",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0004",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-000f",
-            "title": "participant",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0004",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-000b",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0011",
-            "title": "suit",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0010",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0012",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0008",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0013",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0006",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0014",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0007",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0001",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0016",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0015",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0007",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0018",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0017",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0008",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-001b",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-001a",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0007",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-001c",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0017",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-001a",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-001e",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0015",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-001d",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-001f",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-001a",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-001d",
-            "created_by": "u-anonymous"
-        }, {
-            "_id": "edge-2012-09-07-7e8a09d3a0309d08-0021",
-            "title": "(untitled edge)",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-09-07-7e8a09d3a0309d08-0020",
-            "to": "node-2012-09-07-7e8a09d3a0309d08-0006",
-            "created_by": "u-anonymous"
-        }
-    ]
-}
\ No newline at end of file
diff -r 9b8df8d779f5 -r 009427475db2 metadataplayer/renkan.htm
--- a/metadataplayer/renkan.htm	Wed Apr 24 10:30:28 2013 +0200
+++ b/metadataplayer/renkan.htm	Mon May 06 15:14:29 2013 +0200
@@ -59,7 +59,7 @@
                 {
                     type: "Renkan",
                     container: "RenkanContainer",
-                    data: [ "json/renkan.json", "json/renkan-2.json" ]
+                    data: "json/renkan.json"
                 },
                 { type: "Mediafragment"}
             ]