maj

user/pages/02._interviews/09._solen/text.md

@@ -22,7 +22,7 @@ Suite à ça on a été mis en contact avec une prof d’archi qui a chapeauté
 
 **Quelles activités pratiques-tu dans St-Denis, tu me parlais du Chant tout à l’heure ?**
 Là je viens d’arrêter le chant car notre prof est partie dans le sud. Je vais de temps en temps à Rajganawak voir des spectacles. Je trouve qu’il manque des choses pour la vie nocturne à Saint-Denis, Rajganawak participe à changer ça. Ici, au Pavillon, il y a bien des événements mais c’est plus informel. Tu peux facilement y improviser un petit concert, une performance artistique.. mais ce n’est pas communiqué. On vient surtout pour y boire des verres.
-Andromède, une fille qui faisait du chant avec moi, est très investie dans la vie associative. Elle est sur un projet qui s’appelle [le jardin des chaumettes](#mp_jardinchaumettes) [](https://jardindeschaumettes.wordpress.com/?target=_blank&classes=linkext).
+Andromède, une fille qui faisait du chant avec moi, est très investie dans la vie associative. Elle est sur un projet qui s’appelle [le jardin des chaumettes](#mp_chaumettes,#img_chaumettes) [](https://jardindeschaumettes.wordpress.com/?target=_blank&classes=linkext).
 
 
 **Quel usage des outils numériques tu as, pour communiquer, te tenir au courant ?**

user/pages/04._streetmap/_cafe-le-basilic/mappoint.md

@@ -1,8 +1,9 @@
 ---
 title: 'Café Le Basilic'
 image_align: left
-id: mp_cafebasilic
+id: mp_lebasilic
 target: '#int_martine,#rct_050917'
 lat: '48.93560'
 long: '2.35825'
 ---
+

user/pages/04._streetmap/_place-de-la-republique/mappoint.md

@@ -1,7 +1,7 @@
 ---
 title: 'Le Café Pierre'
 image_align: left
-id: mp_cafépierre
+id: mp_cafepierre
 target: '#int_victoria,#rct_250717'
 lat: '48.868657'
 long: '2.363167'

user/themes/r2c/js/script.js

@@ -1,9 +1,5 @@
-// addClass
-function synchro() {
-
-}
 // Streetmap
-function map(targets) {
+function map(h_parts, markerObj) {
   var mymap = L.map('mapid').setView([48.9367935,2.3569287], 17);
   setTimeout(mymap.invalidateSize.bind(map));
   L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
@@ -24,11 +20,11 @@ function map(targets) {
   for (var i = 0; i < dyn_data.mappoints.length; i++) {
     id = dyn_data.mappoints[i].id;
 
-    targets = typeof dyn_data.mappoints[i].target != 'undefined' ? dyn_data.mappoints[i].target.split(',') : [];
+    targets2 = typeof dyn_data.mappoints[i].target != 'undefined' ? dyn_data.mappoints[i].target.split(',') : [];
 
     markers[id] = L.marker([dyn_data.mappoints[i].lat, dyn_data.mappoints[i].long], {
       icon: greenIcon,
-      targets:targets
+      targets:targets2
     })
       .on("click", function(e){
         // e c'est l'evenement click html normal
@@ -41,50 +37,27 @@ function map(targets) {
       .addTo(mymap);
     markers[id]._icon.id = id;
     var cible = dyn_data.mappoints[i].target;
-  }
+    markerObj = markers[id];
+    console.log('markerObj',markerObj);
 
-  $("a").click(function(){
-    console.log('targets',targets);
-  });
+  }
 };
 
-function markerFunction(targets, markers ){
-  // console.log('id', hash);
-
-  // var hrefs = $(this).attr("alt").split(',');
-  // // console.log('hrefs', hrefs);
-  // var h, h_parts;
-  // for (var i = 0; i < hrefs.length; i++) {
-  //   h = hrefs[i];
-  //   h_parts = h.match(/^#(([^_]+)_(.+)$)/);
-  //   // console.log('h_parts', h_parts);
-
-  // console.log('targets',targets);
-  // console.log('markers[id]',markers[0]);
-  // $("a").click(function(){
-  //   markerFunction($(this)[0].hash);
-  //   console.log('$(this)[0]',$(this)[0].hash);
-  // });
-  // if (targets == markers[0]) {
-  //   console.log('cc');
-  //   markers.openPopup;
-  // }
-   // for (var i in markers){
-   //     var markerID = markers[i]._icon.id;
-   //     console.log('markerID',markers[i]);
-   //     var hrefsMarker = markerID.split(',');
-   //     var hM, h_partsM;
-   //
-   //     for (var i = 0; i < hrefsMarker.length; i++) {
-   //       hM = hrefsMarker[i];
-   //      h_partsM = hM.match(/^#(([^_]+)_(.+)$)/);
-   //     console.log('h_partsM', hM);
-   //   }
-   //
-   //     if (hM == id){
-   //         markers[i].openPopup();
-   //     };
-   // }
+function markerFunction(markers, h_parts){
+  var target = $('#streetmap.mCustomScrollbar');
+  var href = target.find(markers);
+  console.log('marker', markers);
+  console.log('h_parts', h_parts);
+  // console.log('href',href);
+  // console.log('target',target);
+  // var href = target.find(h_parts[0]);
+  h_part1 = h_parts[0];
+  for (var i in markers){
+    if (markers == h_part1 ) {
+      console.log('true');
+        // markerV.openPopup(); //marche pas
+    }
+  }
 }
 
 // change mouse_event
@@ -278,9 +251,9 @@ function drag() {
           "height": 'auto',
         })
         // if itw < 200
-        var test = ui.position.left - 225;
+        var test = ui.position.left - 225
         var testPourcent = ( p * parseFloat(test) / oW ) + "%";
-        var img200 = ( p * parseFloat(  ((pos.left) ) / oW) + "%" );
+        var img200 = ( p * parseFloat(  ((pos.left )) / oW) + "%" );
         if ( $itw.width() < 200) {
           $recits.css({
             "width": img200,
@@ -313,14 +286,14 @@ function drag() {
 // draggable
 function dragcanvas() {
   var $reseau = $('#reseaux-sociaux canvas');
-  var $links = $('#links svg g')
+  var $links = $('#links svg')
 
   $links.draggable({
     scroll: false
   });
-  $reseau.draggable({
-    scroll: false
-  });
+  // $reseau.draggable({
+  //   scroll: false
+  // });
 }
 
 // hidden scroll + synchro
@@ -350,7 +323,9 @@ function scrollBlockTo($block, href){
 function fillColorMapLink(targets, h_parts){
 
   var target = $('#links.mCustomScrollbar');
+  console.log('target',target);
   var href = target.find(h_parts[0]);
+  console.log(href);
   var $text0 = $(this).find(href);
   var text = $('.nodes text.group1');
   var text2 = $('.nodes text.group2');
@@ -376,7 +351,7 @@ function fillColorMapLink(targets, h_parts){
   }
 }
 
-function synchBloks(targets) {
+function synchBloks(targets, h_parts) {
   console.log('synchBloks : targets', targets);
 
   var h, h_parts;
@@ -402,10 +377,10 @@ function synchBloks(targets) {
         scrollBlockTo($('#links.mCustomScrollbar'), h);
         fillColorMapLink(h, h_parts);
         break;
-      // case 'rs':
-      //   var target = $('#reseaux-sociaux.mCustomScrollbar');
-      //   scrollBlockTo();
-      //   break;
+      case 'rs':
+        var target = $('#reseaux-sociaux.mCustomScrollbar');
+        paperjs(h, h_parts);
+        break;
       // case '':
         // etc
         // break;
@@ -414,9 +389,10 @@ function synchBloks(targets) {
   }
 }
 
-function paperjs() {
+function paperjs(targets, h_parts) {
+
   paper.install(window);
-  window.onload = function() {
+  window.onload = function(targets, h_parts) {
 		// Get a reference to the canvas object
 		var canvas = document.getElementById('canvas');
 		// Create an empty project and a view for the canvas:
@@ -435,16 +411,15 @@ function paperjs() {
       path.blendMode = 'multiply';
       path.closed = true;
       path.fullySelected = false;
-      path._reseaux = "facebook";
+      path._reseaux = "OutilsGoogle";
 
-      console.log('path',path);
       var path2 = new paper.Path({
         fillColor: 'grey',
       });
       path2.blendMode = 'multiply';
       path2.closed = true;
       path2.fullySelected = false;
-      path._reseaux = "instagram";
+      path2._reseaux = "OutilsFramasoft";
 
       var path3 = new paper.Path({
         fillColor: 'grey',
@@ -452,7 +427,7 @@ function paperjs() {
       path3.blendMode = 'multiply';
       path3.closed = true;
       path3.fullySelected = false;
-      path._reseaux = "Whatsapp";
+      path3._reseaux = "Slack";
 
       var path4 = new paper.Path({
         fillColor: 'grey',
@@ -460,7 +435,7 @@ function paperjs() {
       path4.blendMode = 'multiply';
       path4.closed = true;
       path4.fullySelected = false;
-      path._reseaux = "framasoft";
+      path4._reseaux = "Facebook";
 
       var path5 = new paper.Path({
         fillColor: 'grey',
@@ -468,7 +443,7 @@ function paperjs() {
       path5.blendMode = 'multiply';
       path5.closed = true;
       path5.fullySelected = false;
-      path._reseaux = "skype";
+      path5._reseaux = "Messenger";
 
       var path6 = new paper.Path({
         fillColor: 'grey',
@@ -476,7 +451,7 @@ function paperjs() {
       path6.blendMode = 'multiply';
       path6.closed = true;
       path6.fullySelected = false;
-      path._reseaux = "email";
+      path6._reseaux = "Whatsapp";
 
       var path7 = new paper.Path({
         fillColor: 'grey',
@@ -484,7 +459,7 @@ function paperjs() {
       path7.blendMode = 'multiply';
       path7.closed = true;
       path7.fullySelected = false;
-      path._reseaux = "siteweb";
+      path7._reseaux = "Instagram";
 
       var path8 = new paper.Path({
         fillColor: 'grey',
@@ -492,7 +467,55 @@ function paperjs() {
       path8.blendMode = 'multiply';
       path8.closed = true;
       path8.fullySelected = false;
-      path._reseaux = "outilsgoogle";
+      path8._reseaux = "Skype";
+
+      var path9 = new paper.Path({
+        fillColor: 'grey',
+      });
+      path9.blendMode = 'multiply';
+      path9.closed = true;
+      path9.fullySelected = false;
+      path9._reseaux = "Tinder";
+
+      var path10 = new paper.Path({
+        fillColor: 'grey',
+      });
+      path10.blendMode = 'multiply';
+      path10.closed = true;
+      path10.fullySelected = false;
+      path10._reseaux = "Wiki";
+
+      var path11 = new paper.Path({
+        fillColor: 'grey',
+      });
+      path11.blendMode = 'multiply';
+      path11.closed = true;
+      path11.fullySelected = false;
+      path11._reseaux = "Mails";
+
+      var path12 = new paper.Path({
+        fillColor: 'grey',
+      });
+      path12.blendMode = 'multiply';
+      path12.closed = true;
+      path12.fullySelected = false;
+      path12._reseaux = "SitesWeb";
+
+      var path13 = new paper.Path({
+        fillColor: 'grey',
+      });
+      path13.blendMode = 'multiply';
+      path13.closed = true;
+      path13.fullySelected = false;
+      path13._reseaux = "Twitter";
+
+      var path14 = new paper.Path({
+        fillColor: 'grey',
+      });
+      path14.blendMode = 'multiply';
+      path14.closed = true;
+      path14.fullySelected = false;
+      path14._reseaux = "AirBnb";
 
     for (var i = 0; i <= amount.length; i++) {
       var maxPoint = new paper.Point(100, 100);
@@ -505,14 +528,15 @@ function paperjs() {
         path6.add(point);
         path7.add(point);
         path8.add(point);
-        // path3.add(point);
+        path9.add(point);
+        path10.add(point);
+        path11.add(point);
+        path12.add(point);
+        path13.add(point);
+        path14.add(point);
     }
     // dimension blob
     // position blog
-    // for (var i = 0; i < amount.length; i++) {
-    //   var RSin = Math.random();
-    //   console.log('RSin',RSin);
-    // }
 
       view.onFrame = function(event) {
 
@@ -526,22 +550,31 @@ function paperjs() {
           var segment6 = path6.segments[i];
           var segment7 = path7.segments[i];
           var segment8 = path8.segments[i];
+          var segment9 = path9.segments[i];
+          var segment10 = path10.segments[i];
+          var segment11 = path11.segments[i];
+          var segment12 = path12.segments[i];
+          var segment13 = path13.segments[i];
+          var segment14 = path14.segments[i];
 
           // Size blob
-            // Facebook
-            var width = 350; var height = 200;
-            // instagram
-            var width2 = 50; var height2 = 60;
-            // Whatsapp
-            var width3 = 150; var height3 = 90;
-            var width4 = 100; var height4 = 160;
-            var width6 = 100; var height6 = 80;
-            var width5 = 40; var height5 = 100;
-            var width7 = 150; var height7 = 200;
-            var width8 = 30; var height8 = 10;
+          var width = 100; var height = 120;
+          var width2 = 110; var height2 = 120;
+          var width3 = 50; var height3 = 140;
+          var width4 = 110; var height4 = 120;
+          var width6 = 90; var height6 = 95;
+          var width5 = 80; var height5 = 120;
+          var width7 = 120; var height7 = 120;
+          var width8 = 95; var height8 = 130;
+          var width9 = 150; var height9 = 80;
+          var width10 = 100; var height10 = 110;
+          var width11 = 90; var height11 = 100;
+          var width12 = 115; var height12 = 70;
+          var width13 = 100; var height13 = 115;
+          var width14 = 100; var height14 = 120;
 
             // vistesse de deplacement
-            var v = 0.01;
+          var v = 0.01;
 
           var movx = Math.sin(event.time * (v + 0.05)) * 400; var movy = Math.cos(event.time * (v + 0.02)) * 200;
           var movx2 = Math.sin(event.time * (v + 0.02)) * 380; var movy2 = Math.cos(event.time * (v + 0.08)) * 210;
@@ -549,8 +582,14 @@ function paperjs() {
           var movx4 = Math.sin(event.time * (v + 0.04)) * 420; var movy4 = Math.cos(event.time * (v + 0.06)) * 180;
           var movx5 = Math.sin(event.time * (v + 0.05)) * 440; var movy5 = Math.cos(event.time * (v + 0.05)) * 190;
           var movx6 = Math.sin(event.time * (v + 0.02)) * 390; var movy6 = Math.cos(event.time * (v + 0.04)) * 230;
-          var movx8 = Math.sin(event.time * (v + 0.03)) * 410; var movy7 = Math.cos(event.time * (v + 0.03)) * 170;
-          var movx7 = Math.sin(event.time * (v + 0.04)) * 400; var movy8 = Math.cos(event.time * (v + 0.02)) * 200;
+          var movx7 = Math.sin(event.time * (v + 0.03)) * 410; var movy7 = Math.cos(event.time * (v + 0.03)) * 170;
+          var movx8 = Math.sin(event.time * (v + 0.04)) * 400; var movy8 = Math.cos(event.time * (v + 0.02)) * 200;
+          var movx9 = Math.sin(event.time * (v + 0.04)) * 350; var movy9 = Math.cos(event.time * (v + 0.02)) * 120;
+          var movx10 = Math.sin(event.time * (v + 0.04)) * 420; var movy10 = Math.cos(event.time * (v + 0.02)) * 220;
+          var movx11 = Math.sin(event.time * (v + 0.04)) * 400; var movy11 = Math.cos(event.time * (v + 0.02)) * 225;
+          var movx12 = Math.sin(event.time * (v + 0.04)) * 200; var movy12 = Math.cos(event.time * (v + 0.02)) * 180;
+          var movx13 = Math.sin(event.time * (v + 0.04)) * 350; var movy13 = Math.cos(event.time * (v + 0.02)) * 175;
+          var movx14 = Math.sin(event.time * (v + 0.04)) * 380; var movy14 = Math.cos(event.time * (v + 0.02)) * 200;
 
           // contour blob
           var sinus = Math.sin(event.time * ( - 0.05) + i); var cos = Math.cos(event.time *  ( - 0.05) + i);
@@ -561,6 +600,12 @@ function paperjs() {
           var sinus6 = Math.sin(event.time * (0.12) + i); var cos6 = Math.cos(event.time *  (0.12) + i);
           var sinus7 = Math.sin(event.time * ( - 0.25) + i); var cos7 = Math.cos(event.time *  ( - 0.25) + i);
           var sinus8 = Math.sin(event.time * (0.18) + i); var cos8 = Math.cos(event.time *  (0.18) + i);
+          var sinus9 = Math.sin(event.time * ( - 0.18) + i); var cos9 = Math.cos(event.time *  ( - 0.18) + i);
+          var sinus10 = Math.sin(event.time * (0.1) + i); var cos10 = Math.cos(event.time *  (0.1) + i);
+          var sinus11 = Math.sin(event.time * (0.18) + i); var cos11 = Math.cos(event.time *  (0.18) + i);
+          var sinus12 = Math.sin(event.time * (0.08) + i); var cos12 = Math.cos(event.time *  (0.08) + i);
+          var sinus13 = Math.sin(event.time * (0.01) + i); var cos13 = Math.cos(event.time *  (0.01) + i);
+          var sinus14 = Math.sin(event.time * (0.05) + i); var cos14 = Math.cos(event.time *  (0.05) + i);
 
           var rotatex = Math.sin(event.time * Math.PI/360) + i;
           var rotatex2 = Math.sin(event.time * Math.PI/21) + i;
@@ -570,15 +615,27 @@ function paperjs() {
           var rotatex6 = Math.sin(event.time * Math.PI/354) + i;
           var rotatex7 = Math.sin(event.time * Math.PI/76) + i;
           var rotatex8 = Math.sin(event.time * Math.PI/10) + i;
+          var rotatex9 = Math.sin(event.time * Math.PI/10) + i;
+          var rotatex10 = Math.sin(event.time * Math.PI/10) + i;
+          var rotatex11 = Math.sin(event.time * Math.PI/10) + i;
+          var rotatex12 = Math.sin(event.time * Math.PI/10) + i;
+          var rotatex13 = Math.sin(event.time * Math.PI/10) + i;
+          var rotatex14 = Math.sin(event.time * Math.PI/10) + i;
 
           var left = width - movx + 200; var top = height - movy + 200;
           var left2 = width2 - movx2 + 200; var top2 = height2 - movy2 + 50;
           var left3 = width3 - movx3 + 190; var top3 = height3 - movy3 + 30;
           var left4 = width4 - movx4 + 50; var top4 = height4 - movy4 + 90;
           var left5 = width5 - movx5 + 220; var top5 = height5 - movy5 + 25;
-          var left6 = width6 - movx6 + 160; var top6 = height6 - movy6 + 150;
+          var left6 = width6 - movx6 + 160; var top6 = height6 - movy6 - 150;
           var left7 = width7 - movx7 + 180; var top7 = height7 - movy7 + 160;
           var left8 = width8 - movx8 + 220; var top8 = height8 - movy8 + 200;
+          var left9 = width9 - movx9 + 60; var top9 = height9 - movy9 + 20;
+          var left10 = width10 - movx10 - 155; var top10 = height10 - movy10 + 350;
+          var left11 = width11 - movx11 + 300; var top11 = height11 - movy11 - 150;
+          var left12 = width12 - movx12 - 255; var top12 = height12 - movy12 + 350;
+          var left13 = width13 - movx13 + 75; var top13 = height13 - movy13 + 150;
+          var left14 = width14 - movx14 - 90; var top14 = height14 - movy14 + 30;
 
           segment.point.x = cos * width + left + 400; segment.point.y = sinus * height + top + 150;
           segment2.point.x = cos2 * width2 + left2 + 400; segment2.point.y = sinus2 * height2 + top2 + 150;
@@ -588,6 +645,12 @@ function paperjs() {
           segment6.point.x = cos6 * width6 + left6 + 400; segment6.point.y = sinus6 * height6 + top6 + 150;
           segment7.point.x = cos7 * width7 + left7 + 400; segment7.point.y = sinus7 * height7 + top7 + 150;
           segment8.point.x = cos8 * width8 + left8 + 400; segment8.point.y = sinus8 * height8 + top8 + 150;
+          segment9.point.x = cos9 * width9 + left9 + 400; segment9.point.y = sinus9 * height9 + top9 + 150;
+          segment10.point.x = cos10 * width10 + left10 + 400; segment10.point.y = sinus10 * height10 + top10 + 150;
+          segment11.point.x = cos11 * width11 + left11 + 400; segment11.point.y = sinus11 * height11 + top11 + 150;
+          segment12.point.x = cos12 * width12 + left12 + 400; segment12.point.y = sinus12 * height12 + top12 + 150;
+          segment13.point.x = cos13 * width13 + left13 + 400; segment13.point.y = sinus13 * height13 + top13 + 150;
+          segment14.point.x = cos14 * width14 + left14 + 400; segment14.point.y = sinus14 * height14 + top14 + 150;
 
           // Rotate blob
           path.rotate(rotatex);
@@ -598,6 +661,12 @@ function paperjs() {
           path6.rotate(rotatex6);
           path7.rotate(rotatex7);
           path8.rotate(rotatex8);
+          path9.rotate(rotatex9);
+          path10.rotate(rotatex10);
+          path11.rotate(rotatex11);
+          path12.rotate(rotatex12);
+          path13.rotate(rotatex13);
+          path14.rotate(rotatex14);
 
           // Smooth
           path.smooth();
@@ -608,32 +677,89 @@ function paperjs() {
           path6.smooth();
           path7.smooth();
           path8.smooth();
+          path9.smooth();
+          path10.smooth();
+          path11.smooth();
+          path12.smooth();
+          path13.smooth();
+          path14.smooth();
         }
       }
-      $("a[href^='#facebook']").click(function(){
-        path.fillColor =  'blue';
-        console.log('true');
-      });
-      $("a[href^='#twitter']").click(function(){
-        path2.fillColor =  'red';
-        console.log('true');
-      });
-      $("a[href^='#instagram']").click(function(){
-        path.fillColor =  'pink';
-        console.log('true');
-      });
-	}
 
+      // var target = $('#reseauxsociaux.mCustomScrollbar');
+      // console.log('h_parts2',h_parts[1]);
+      // var href = target.find(h_parts);
+      // console.log('href',href);
+
+      $("a[href^='#rs_twitter']").hover(
+        function() {path.fillColor = 'blue';},
+        function() {path.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_sitesweb']").hover(
+        function() {path2.fillColor = 'blue';},
+        function() {path2.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_mails']").hover(
+        function() {path3.fillColor = 'blue';},
+        function() {path3.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_wiki']").hover(
+        function() {path4.fillColor = 'blue';},
+        function() {path4.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_tinder']").hover(
+        function() {path5.fillColor = 'blue';},
+        function() {path5.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_skype']").hover(
+        function() {path6.fillColor = 'blue';},
+        function() {path6.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_instagram']").hover(
+        function() {path7.fillColor = 'blue';},
+        function() {path7.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_whatsapp']").hover(
+        function() {path8.fillColor = 'blue';},
+        function() {path8.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_messenger']").hover(
+        function() {path9.fillColor = 'blue';},
+        function() {path9.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_facebook']").hover(
+        function() {path10.fillColor = 'blue';},
+        function() {path10.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_slack']").hover(
+        function() {path11.fillColor = 'blue';},
+        function() {path11.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_outilsframasoft']").hover(
+        function() {path12.fillColor = 'blue';},
+        function() {path12.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_outilsgoogle']").hover(
+        function() {path13.fillColor = 'blue';},
+        function() {path13.fillColor = 'grey';}
+      );
+      $("a[href^='#rs_airBnb']").hover(
+        function() {path14.fillColor = 'blue';},
+        function() {path14.fillColor = 'grey';}
+      );
+	}
 }
 
+
 $(document).ready(function() {
   // paperjs();
   // clickcanvena();
   mCustomScrollbar();
   clickhand();
   drag();
-  // dragcanvas();
+  // markerFunction();
+  dragcanvas();
   map();
-  // paperjs();
+  paperjs();
   // D3js();
 });

user/themes/r2c/js/script_d3js.js

@@ -1,24 +1,24 @@
     var $container = $('#links');
-    
+
 
       var width = $container.outerWidth(true);
       var height = $container.outerHeight(true);
       var svg = d3.select("#links svg");
       Addwidth = svg.attr("width", '100%'),
-      Addheight = svg.attr("height", '100%');
+      Addheight = svg.attr("height", '200%');
 
   var color = d3.scaleOrdinal(d3.schemeCategory20);
 
   var simulation = d3.forceSimulation()
       .force("link", d3.forceLink().distance(20).id(function(d) { return d.id; }))
       .force("charge", d3.forceManyBody())
-      .force("center", d3.forceCenter(width + (width /2)- 20, height + (height/2) - 30));
+      .force("center", d3.forceCenter(width + (width /2)- 20, height + (height/2)));
 
   d3.json("user/themes/r2c/json/miserables.json", function(error, graph) {
     if (error) throw error;
 
     var link = svg.append("g")
-      .attr("class", "links")
+      .attr("class", "links graph")
       // .attr("left", "auto")
       .selectAll("line")
       .data(graph.links)
@@ -26,7 +26,7 @@
       .attr("stroke-width", function(d) { return Math.sqrt(d.value); });
 
       var node = svg.append("g")
-        .attr("class", "nodes")
+        .attr("class", "nodes graph")
         .selectAll("text")
         .data(graph.nodes)
         .enter().append("text")

user/themes/r2c/json/miserables.json

@@ -1,10 +1,10 @@
 {
   "nodes": [
     {"identifiant":"lk_ocelau", "cible": "#rct_260717,#int_ocelau,#img_oceane", "id": "Oceane", "group": 1},
-    {"identifiant":"lk_cinema", "cible": "#mp_cinema,#img_cinema", "id": "Ecran 93", "group": 2},
+    {"identifiant":"lk_cinema", "cible": "#mp_cinema,#img_cinema", "id": "Ecran 93", "group": 1},
     {"identifiant":"lk_bachir", "cible": "#rct_060617", "id": "Bachir", "group": 3},
     {"identifiant":"lk_wiebke","cible":"#mp_pointCarre,#rct_120717,#img_wiebke","id": "Wiebke", "group": 3},
-    {"identifiant":"lk_manon","cible":"#mp_chezmanon,#rct_120917,#img_manon","id": "Manon", "group": 1},
+    {"identifiant":"lk_manon","cible":"#mp_chezmanon,#rct_120917,#img_manon,#int_manon","id": "Manon", "group": 1},
     {"identifiant":"lk_andreea","cible":"#int_andreea,#rct_120717,#img_andreea","id": "Andreea", "group": 1},
     {"identifiant":"lk_laurent","cible":"#int_ocelau,#rct_260717,#img_laurent","id": "Laurent", "group": 1},
     {"identifiant":"lk_nadia","cible":"#rct_130917,#int_nadia,#img_nadia","id": "Nadia", "group": 1},
@@ -71,6 +71,11 @@
     {"source": "Oceane", "target": "Laurent", "value": 2},
     {"source": "Oceane", "target": "Collectif Mund Gawi", "value": 2},
     {"source": "L'oasis", "target": "Collectif Mund Gawi", "value": 2},
+    {"source": "L'oasis", "target": "Dechets d'art", "value": 2},
+    {"source": "L'oasis", "target": "Shakti 21", "value": 2},
+    {"source": "L'oasis", "target": "Clinamen","value": 2},
+    {"source": "L'oasis", "target": "Rien ne se perd", "value": 2},
+    {"source": "L'oasis", "target": "Landy Kadi", "value": 2},
     {"source": "Oceane", "target": "L'oasis", "value": 2},
     {"source": "Laurent", "target": "L'oasis", "value": 1},
     {"source": "Oceane", "target": "Cop'Billon", "value": 1},

user/themes/r2c/scss/template/_section.scss

@@ -46,7 +46,7 @@ body{
       overflow-y: hidden;
       margin: 0;
       width: $W33;
-      min-width: 200px;
+      // min-width: 200px;
       height: $H50-25;
       z-index: 998;
       &:nth-child(3n+2){
@@ -110,7 +110,7 @@ body{
       }
         svg{
           position: absolute;
-          top: 50px;
+          // top: 50px;
           left: 0;
 
         }

user/themes/r2c/templates/partials/base.html.twig

@@ -86,8 +86,8 @@
 
         <script src="user/themes/r2c/js/leaflet.js" crossorigin=""></script>
 
-        {% do assets.addJs('theme://js/script.js', {group:'bottom'}) %}
         {% do assets.addJs('theme://js/paper_full.js', {group:'bottom'}) %}
+        {% do assets.addJs('theme://js/script.js', {group:'bottom'}) %}
 
     {% endblock %}