figureslibres 5 anos atrás
pai
commit
f1176a3546
65 arquivos alterados com 543 adições e 276 exclusões
  1. 0 0
      user/pages/01._recits/02._11-avril-2017/text.md
  2. 1 1
      user/pages/01._recits/03._3-mai-2017/text.md
  3. 1 1
      user/pages/01._recits/04._6-juin-2017/text.md
  4. 2 2
      user/pages/01._recits/05._19-juin-2017/text.md
  5. 0 1
      user/pages/01._recits/06._6-juillet-2017/text.md
  6. 2 2
      user/pages/01._recits/07._12-juillet-2017/text.md
  7. 1 1
      user/pages/01._recits/08._25-juillet-2017/text.md
  8. 0 0
      user/pages/01._recits/09._26-juillet-2017/text.md
  9. 1 1
      user/pages/01._recits/11._12-septembre-2017/text.md
  10. 0 0
      user/pages/01._recits/12._13-septembre-2017/text.md
  11. 1 1
      user/pages/01._recits/13._3-octobre-2017/text.md
  12. 1 1
      user/pages/01._recits/14._4-octobre-2017/text.md
  13. 2 2
      user/pages/01._recits/15._5-octobre-2017/text.md
  14. 0 0
      user/pages/02._interviews/01._pascale/text.md
  15. 1 1
      user/pages/02._interviews/02._marie-preston/text.md
  16. 4 4
      user/pages/02._interviews/03._andrea/text.md
  17. 1 1
      user/pages/02._interviews/04._victoria/text.md
  18. 0 0
      user/pages/02._interviews/05._oceane-et-laurent/text.md
  19. 0 0
      user/pages/02._interviews/06._martine/text.md
  20. 0 0
      user/pages/02._interviews/07._manon-dumond/text.md
  21. 1 1
      user/pages/02._interviews/08._nadia/text.md
  22. 1 1
      user/pages/02._interviews/09._solen/text.md
  23. 0 0
      user/pages/02._interviews/10._marie-w/text.md
  24. 0 0
      user/pages/02._interviews/11._olivier/text.md
  25. 1 0
      user/pages/04._streetmap/_academie-fratellini/mappoint.md
  26. 1 0
      user/pages/04._streetmap/_adada/mappoint.md
  27. 1 0
      user/pages/04._streetmap/_amap-court-circuit/mappoint.md
  28. 9 0
      user/pages/04._streetmap/_amicale/mappoint.md
  29. 1 0
      user/pages/04._streetmap/_ardeche/mappoint.md
  30. 2 1
      user/pages/04._streetmap/_artefact-93/mappoint.md
  31. 1 0
      user/pages/04._streetmap/_attieke/mappoint.md
  32. 1 0
      user/pages/04._streetmap/_basilique-de-saint-denis/mappoint.md
  33. 1 0
      user/pages/04._streetmap/_bresil/mappoint.md
  34. 1 0
      user/pages/04._streetmap/_bretagne/mappoint.md
  35. 1 0
      user/pages/04._streetmap/_cafe-le-basilic/mappoint.md
  36. 9 0
      user/pages/04._streetmap/_centresocialcoop/mappoint.md
  37. 2 1
      user/pages/04._streetmap/_chapiteau-rajganawak/mappoint.md
  38. 1 0
      user/pages/04._streetmap/_chez-manon/mappoint.md
  39. 1 0
      user/pages/04._streetmap/_chez-marie-w/mappoint.md
  40. 3 2
      user/pages/04._streetmap/_chez-martine/mappoint.md
  41. 1 0
      user/pages/04._streetmap/_chez-pascale/mappoint.md
  42. 1 0
      user/pages/04._streetmap/_chez-solen/mappoint.md
  43. 2 1
      user/pages/04._streetmap/_cinema-ecran-93/mappoint.md
  44. 1 0
      user/pages/04._streetmap/_collectif-mund-gawi/mappoint.md
  45. 8 0
      user/pages/04._streetmap/_guadeloupe/mappoint.md
  46. 2 2
      user/pages/04._streetmap/_jardin-des-chaumettes/mappoint.md
  47. 8 0
      user/pages/04._streetmap/_landykadi/mappoint.md
  48. 8 0
      user/pages/04._streetmap/_place-du-caquet/mappoint.md
  49. 8 0
      user/pages/04._streetmap/_portedeparis/mappoint.md
  50. 1 1
      user/pages/04._streetmap/_theatre-gerard-philipe/mappoint.md
  51. 1 2
      user/pages/05._links/_link-2/text.md
  52. 1 2
      user/pages/05._links/_link/text.md
  53. 6 1
      user/themes/r2c/blueprints/modular/mappoint.yaml
  54. 8 4
      user/themes/r2c/css-compiled/template.css
  55. 0 0
      user/themes/r2c/css-compiled/template.min.css
  56. 15 2
      user/themes/r2c/css/styles_3djs.css
  57. 46 0
      user/themes/r2c/images/fleche-03.svg
  58. 49 0
      user/themes/r2c/images/pointeur-04.svg
  59. 59 0
      user/themes/r2c/images/pointeur2.svg
  60. 87 97
      user/themes/r2c/js/script.js
  61. 3 2
      user/themes/r2c/js/script_d3js.js
  62. 142 122
      user/themes/r2c/json/miserables.json
  63. 17 10
      user/themes/r2c/scss/template/_section.scss
  64. 10 1
      user/themes/r2c/scss/template/_typography.scss
  65. 3 4
      user/themes/r2c/templates/modular/links.html.twig

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/01._recits/02._11-avril-2017/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
user/pages/01._recits/03._3-mai-2017/text.md


+ 1 - 1
user/pages/01._recits/04._6-juin-2017/text.md

@@ -7,6 +7,6 @@ id: rct_060617
 Je fais aujourd'hui la connaissance de [Loyce](#lk_loyce), en stage à Synesthésie et étudiante à [Paris 8](#mp_paris8,#img_paris8). 
 Je teste avec elle le format d’interview que j'ai imaginé et la mise en contact avec une tierce personne. Elle m’envoie vers [Marie.P](#img_mariep#lk_mariep), artiste et enseignante à Paris 8: elle a été l'une de ses étudiantes.
 [Bachir](#lk_bachir), qui a justement travaillé avec elle lors d’un atelier à Synesthésie, nous met en lien directement par mail.
-Dans l'après-midi, je découvre l’emplacement de la [Maison Jaune](#mp_maisonjaune,#img_mj1), alors fermée. Sur la devanture, une affiche présente un projet de [Tricot Partage](#img_tp), et indique qu'il est porté par une personne dénommée Pascale. Je retrouve les infos sur la [page Facebook](https://www.facebook.com/maisonjaunesaintdenis/?target=_blank?classes=linkext) et contacte Pascale pour lui proposer une rencontre. 
+Dans l'après-midi, je découvre l’emplacement de la [Maison Jaune](#mp_maisonjaune,#img_mj1), alors fermée. Sur la devanture, une affiche présente un projet de [Tricot Partage](#img_tp), et indique qu'il est porté par une personne dénommée Pascale. Je retrouve les infos sur la [page Facebook](https://www.facebook.com/maisonjaunesaintdenis/?target=_blank&classes=linkext) et contacte Pascale pour lui proposer une rencontre. 
 Peu familière de l’environnement, l’aspect labyrinthique de la [Dalle](#mp_dalle,#img_ilot8), faite de coins et de recoins, ne m’invite pas à m’y ballader : la formation de l’espace accentue chez moi le sentiment d’être perdue.
 Avant de repartir, je déambulle dans le centre de Saint-Denis, marchant au hasard. J’essaye de me rendre plus familière du centre mais ai tendance à graviter peu loin de la [station de métro ](#mp_metrobasilique)que je connais. 

+ 2 - 2
user/pages/01._recits/05._19-juin-2017/text.md

@@ -4,7 +4,7 @@ image_align: left
 id: rct_190617
 ---
 
-Il y a quelques jours, j'ai échangé avec [Pasacale](#int_pascale) dont j'avais eu vent du travail sur [l'affiche](#img_mj2) de la Maison Jaune.
+Il y a quelques jours, j'ai échangé avec [Pascale](#int_pascale) dont j'avais eu vent du travail sur [l'affiche](#img_mj2) de la Maison Jaune.
 En début d'après midi, nous nous retrouvons à la Maison Jaune, où Pascale me fait découvrir le lieu. Elle m’explique : _« C’est une maison de quartier qui a ouvert au mois de Novembre. l’idée c’est que cet espace soit mis à disposition des habitants, qu’on y organise des choses mais aussi qu’il y ai de la place pour leurs propres initiatives… »_
 Pascale a découvert le lieu en octobre 2016, en passant devant. Elle n’habite pas loin et était justement à la recherche d’un lieu pour son projet de [tricot-partage](#img_tp2), un projet de tricot solidaire.
 Je lui demande de m’en dire plus sur son projet et fait vite le lien avec le [patchwork](#img_tp) de formes tricotées, monumental, qui git au sol de la Maison Jaune :
@@ -21,4 +21,4 @@ Elle note cependant que _«la communication papier et la communication numériqu
 Pendant notre entretien, apparaît Sofiane, un habitant impliqué dans le collectif de la Maison Jaune, qui projette d'y organiser des ateliers de patisseries, étant lui-même en formation patissier. 
 On sent dans ce lieu l’émulation de quelque chose qui naît, qui ne sait pas toujours où il va mais qui est bien là.
 Ce premier échange a été très instructif et Pascale m’ayant évoqué plusieurs lieux de Saint-Denis, je profite de l'après-midi pour les repérer. En chemin, je croise des tricoteuses: un petit groupe [tricote dans la rue](#img_streetmamie), sur les arbres, les barrières. Ca fait tout de suite écho avec le projet tricot-partage de Pascale, et me pousse à m'arrêter discuter.
-C'est comme ça que je fais la connaissance d'[Océane](#img_oceane#lk_oceane), de l'association [Dechets d'arts](#lk_dechetsdart), qui participe ici à une ["opération street mamies"](https://www.facebook.com/streetmamies/?target=_blank), me dit-elle. Elle me laisse sa carte pour que nous nous recontactions plus tard.
+C'est comme ça que je fais la connaissance d'[Océane](#img_oceane#lk_oceane), de l'association [Dechets d'arts](#lk_dechetsdart), qui participe ici à une ["opération street mamies"](https://www.facebook.com/streetmamies/?target=_blank&classes=linkext), me dit-elle. Elle me laisse sa carte pour que nous nous recontactions plus tard.

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 1
user/pages/01._recits/06._6-juillet-2017/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 2 - 2
user/pages/01._recits/07._12-juillet-2017/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
user/pages/01._recits/08._25-juillet-2017/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/01._recits/09._26-juillet-2017/text.md


+ 1 - 1
user/pages/01._recits/11._12-septembre-2017/text.md

@@ -1,7 +1,7 @@
 ---
 title: '12 septembre 2017'
 image_align: left
-id: rct_12092017
+id: rct_120917
 ---
 
 Depuis quelques semaines, je suis en contact avec [Manon](#img_manon,#lk_manon), dont [Wiebke](#lk_wiebke) de Point Carré m'avait donné le numéro de téléphone. Il y a quelques temps déjà, Manon avait mené un projet de cartographie du réseau artistique de Saint-Denis et il a donc semblé évident à Wiebke que nous aurions beaucoup à échanger. Elle ne s’était pas trompée.

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/01._recits/12._13-septembre-2017/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
user/pages/01._recits/13._3-octobre-2017/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
user/pages/01._recits/14._4-octobre-2017/text.md


+ 2 - 2
user/pages/01._recits/15._5-octobre-2017/text.md

@@ -1,12 +1,12 @@
 ---
 title: '5 octobre 2017'
 image_align: left
-id: rct_05102017
+id: rct_051017
 ---
 
 Lorsque j’avais rencontré Pascale la première fois, elle m’avait évoqué la crêperie [« La Bigoudène » ](#img_labigoudene,#mp_labigoudene)comme un lieu assez fréquenté par les Dyonisiens. Je profite d’avoir du temps ce midi pour y déjeuner.
 Un rayon de soleil bienvenu me permet de m’installer en terrasse, avec vue sur [la Basilique](#img_basilique). Autour de moi, j’entend les discussions d’un service de mairie venu déjeuner là.
-Il est 16H lorsque je retrouve [Olivier ](#img_olivier,#lk_olivier)au 4 Place Paul Langevin, local de l’[AMAP Court-circuit.](http://www.amap-court-circuit.org/?target=_blank?classes=linkext)
+Il est 16H lorsque je retrouve [Olivier ](#img_olivier,#lk_olivier)au 4 Place Paul Langevin, local de l’[AMAP Court-circuit.](http://www.amap-court-circuit.org/?target=_blank&classes=linkext)
 J’ai pu rencontrer Olivier par le biais d’[Elodie](#lk_elodie), membre de synesthésie. Elle s’est installée recemment sur Saint-Denis dans la colocation d’Olivier dont elle a eu vent par la mailing list de l’AMAP.
 Ce n’est donc pas par hasard que nous nous retrouvons dans [ce local](#mp_amap), car si ma rencontre avec olivier est relié à l’Amap, pour lui, c’est toute sa vie dyonisienne qui l’est.
 En effet, arrivé il y a 3 ans à Saint-Denis, c’est par la rencontre d’une « amapienne » comme il dit, qu’il s’est inscrit à court-circuit et qu’il a pu s’ouvrir sur la ville :

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/02._interviews/01._pascale/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
user/pages/02._interviews/02._marie-preston/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 4 - 4
user/pages/02._interviews/03._andrea/text.md


+ 1 - 1
user/pages/02._interviews/04._victoria/text.md

@@ -36,7 +36,7 @@ Mon copain  participe aussi à un lieu qui a été crée par des habitants de Sa
 
 Oui complètement, on se tiens au courant quand on se rencontre ou on s’envoie quelques messages, des mails ou des sms mais on a pas tellement investis les plate-formes styles Facebook avec les événements etc. Ca se fait plus discrètement peut être mais ça fonctionne très bien.
 On utilise beaucoup l’affiche dans les quartiers donc ça a tendance à rester très local et à fédérer des groupes d’habitants. 
-Pour la Kabane on a utilisé pas mal les outils [Framasoft](#) [](https://framasoft.org/en/?target=_blank?classes=linkext), des framapad etc, on a essayé d’éviter les google docs et compagnie au sein du collectif car la question du [logiciel libre](https://fr.wikipedia.org/wiki/Logiciel_libre?target=_blank?classes=linkext) et de l’outil collaboratif était important pour nous. Pour faire le lien avec d’autres étudiant on utilisait surtout les listes de mails.
+Pour la Kabane on a utilisé pas mal les outils [Framasoft](#) [](https://framasoft.org/en/?target=_blank&classes=linkext), des framapad etc, on a essayé d’éviter les google docs et compagnie au sein du collectif car la question du [logiciel libre](https://fr.wikipedia.org/wiki/Logiciel_libre?target=_blank&classes=linkext) et de l’outil collaboratif était important pour nous. Pour faire le lien avec d’autres étudiant on utilisait surtout les listes de mails.
 On a beaucoup de gens qui ne sont pas sur [Facebook ]()dans nos contacts et on essaye aussi de s’émanciper car on a tendance à s’enfermer dans les infos qui s’y trouves et à ne plus chercher l’information ailleurs.
 
 

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/02._interviews/05._oceane-et-laurent/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/02._interviews/06._martine/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/02._interviews/07._manon-dumond/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
user/pages/02._interviews/08._nadia/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
user/pages/02._interviews/09._solen/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/02._interviews/10._marie-w/text.md


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/pages/02._interviews/11._olivier/text.md


+ 1 - 0
user/pages/04._streetmap/_academie-fratellini/mappoint.md

@@ -2,6 +2,7 @@
 title: 'Académie Fratellini'
 image_align: left
 id: mp_academie
+target: '#int_manon,#lk_academie'
 lat: '48.916722'
 long: '2.353250'
 ---

+ 1 - 0
user/pages/04._streetmap/_adada/mappoint.md

@@ -2,6 +2,7 @@
 title: Adada
 image_align: left
 id: mp_adada
+target: '#lk_adada'
 lat: '48.9343034'
 long: '2.3551049'
 ---

+ 1 - 0
user/pages/04._streetmap/_amap-court-circuit/mappoint.md

@@ -2,6 +2,7 @@
 title: 'AMAP Court-Circuit'
 image_align: left
 id: mp_amap
+target: '#img_amapdoc,#int_olivier,#lk_amap'
 lat: '48.9398404'
 long: '2.3602853'
 ---

+ 9 - 0
user/pages/04._streetmap/_amicale/mappoint.md

@@ -0,0 +1,9 @@
+---
+title: Amicale
+image_align: left
+id: mp_amicale
+target: '#int_martine'
+lat: '48.937859'
+long: '2.357840'
+---
+

+ 1 - 0
user/pages/04._streetmap/_ardeche/mappoint.md

@@ -2,6 +2,7 @@
 title: Ardèche
 image_align: left
 id: mp_ardeche
+target: '#int_pascale'
 lat: '44.758603'
 long: '4.570236'
 ---

+ 2 - 1
user/pages/04._streetmap/_artefact-93/mappoint.md

@@ -1,7 +1,8 @@
 ---
 title: 'Artefact 93'
 image_align: left
-id: mp_artefact93
+id: mp_artefact
+target: '#lk_artefact,#img_artefact'
 lat: '48.935891'
 long: '2.358353'
 ---

+ 1 - 0
user/pages/04._streetmap/_attieke/mappoint.md

@@ -2,6 +2,7 @@
 title: Attieke
 image_align: left
 id: mp_attieke
+target: '#lk_attieke,#img_ak'
 lat: '48.932705'
 long: '2.351645'
 ---

+ 1 - 0
user/pages/04._streetmap/_basilique-de-saint-denis/mappoint.md

@@ -2,6 +2,7 @@
 title: 'Basilique de Saint-Denis'
 image_align: left
 id: mp_basilique
+target: '#img_basilique'
 lat: '48.93549'
 long: '2.35964 '
 ---

+ 1 - 0
user/pages/04._streetmap/_bresil/mappoint.md

@@ -2,6 +2,7 @@
 title: Bresil
 image_align: left
 id: mp_bresil
+target: '#img_victoria,#int_victoria'
 lat: '-14.234499'
 long: '-51.922310'
 ---

+ 1 - 0
user/pages/04._streetmap/_bretagne/mappoint.md

@@ -2,6 +2,7 @@
 title: Bretagne
 image_align: left
 id: mp_bretagne
+target: '#int_pascale'
 lat: '48.202230'
 long: '-2.927534'
 ---

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

@@ -2,6 +2,7 @@
 title: 'Café Le Basilic'
 image_align: left
 id: mp_lebasilic
+target: '#int_martine,#rct_050917'
 lat: '48.93560'
 long: '2.35825'
 ---

+ 9 - 0
user/pages/04._streetmap/_centresocialcoop/mappoint.md

@@ -0,0 +1,9 @@
+---
+title: 'Maison des projets'
+image_align: left
+id: mp_mdp
+target: '#img_centresocial,#int_nadia,#rct_130917'
+lat: '48.936761'
+long: '2.360506'
+---
+

+ 2 - 1
user/pages/04._streetmap/_chapiteau-rajganawak/mappoint.md

@@ -1,7 +1,8 @@
 ---
 title: 'Chapiteau Rajganawak'
 image_align: left
-id: mp_rajganawak
+id: mp_chapiteau
+target: '#lk_chapiteau,#img_chapiteau'
 lat: '48.936069'
 long: '2.347987'
 ---

+ 1 - 0
user/pages/04._streetmap/_chez-manon/mappoint.md

@@ -2,6 +2,7 @@
 title: 'Chez Manon'
 image_align: left
 id: mp_chezmanon
+target: '#lk_manon,#int_manon,#rct_120917,#img_manon'
 lat: '48.938442'
 long: '2.352610'
 ---

+ 1 - 0
user/pages/04._streetmap/_chez-marie-w/mappoint.md

@@ -2,6 +2,7 @@
 title: 'Chez Marie W'
 image_align: left
 id: mp_chezmariew
+target: '#lk_mariew,#int_mariew,#img_ruemariew,#rct_041017'
 lat: '48.948835'
 long: '2.357842'
 ---

+ 3 - 2
user/pages/04._streetmap/_chez-martine/mappoint.md

@@ -2,7 +2,8 @@
 title: 'Chez Martine'
 image_align: left
 id: mp_chezmartine
-lat: '48.937856'
-long: '2.357771'
+target: '#lk_martine,#img_martine,#int_martine,#rct_050917'
+lat: '48.938467'
+long: '2.356516'
 ---
 

+ 1 - 0
user/pages/04._streetmap/_chez-pascale/mappoint.md

@@ -2,6 +2,7 @@
 title: 'Chez Pascale'
 image_align: left
 id: mp_chezpascale
+target: '#img_pascale,#int_pascale,#rct_190617,#lk_pascale'
 lat: '48.937563'
 long: '2.359294'
 ---

+ 1 - 0
user/pages/04._streetmap/_chez-solen/mappoint.md

@@ -2,6 +2,7 @@
 title: 'Chez Solen'
 image_align: left
 id: mp_chezsolen
+target: '#lk_solen,#img_solen,#int_solen,#rct_041017'
 lat: '48.934323'
 long: '2.355832'
 ---

+ 2 - 1
user/pages/04._streetmap/_cinema-ecran-93/mappoint.md

@@ -1,7 +1,8 @@
 ---
 title: 'Cinéma Ecran 93'
 image_align: left
-id: mp_ecran93
+id: mp_cinema
+target: '#lk_cinema,#img_cinema'
 lat: '48.936845'
 long: '2.359116'
 ---

+ 1 - 0
user/pages/04._streetmap/_collectif-mund-gawi/mappoint.md

@@ -2,6 +2,7 @@
 title: 'L''oasis'
 image_align: left
 id: mp_oasis
+target: '#int_ocelau,#img_oasis,#lk_oasis,#rct_260717'
 lat: '48.939549'
 long: '2.355947'
 ---

+ 8 - 0
user/pages/04._streetmap/_guadeloupe/mappoint.md

@@ -0,0 +1,8 @@
+---
+title: Guadeloupe
+image_align: left
+id: mp_guadeloupe
+lat: '16.258902'
+long: '-61.577210'
+---
+

+ 2 - 2
user/pages/04._streetmap/_jardin-des-chaumettes/mappoint.md

@@ -2,7 +2,7 @@
 title: 'Jardin des chaumettes'
 image_align: left
 id: mp_jardinchaumettes
-lat: '48.937419'
-long: '2.352746'
+lat: '48.937584'
+long: '2.353159'
 ---
 

+ 8 - 0
user/pages/04._streetmap/_landykadi/mappoint.md

@@ -0,0 +1,8 @@
+---
+title: landykadi
+image_align: left
+id: m_landykadi
+lat: '48.91639'
+long: '2.36703'
+---
+

+ 8 - 0
user/pages/04._streetmap/_place-du-caquet/mappoint.md

@@ -0,0 +1,8 @@
+---
+title: 'Place du Caquet'
+image_align: left
+id: mp_placecaquet
+lat: '48.937182'
+long: '2.359497'
+---
+

+ 8 - 0
user/pages/04._streetmap/_portedeparis/mappoint.md

@@ -0,0 +1,8 @@
+---
+title: 'Porte de Paris'
+image_align: left
+id: mp_porte
+lat: '48.929777'
+long: '2.356819'
+---
+

+ 1 - 1
user/pages/04._streetmap/_theatre-gerard-philipe/mappoint.md

@@ -1,7 +1,7 @@
 ---
 title: 'Théâtre Gérard Philipe'
 image_align: left
-id: mp_thv
+id: mp_tgp
 lat: '48.938449'
 long: '2.350671'
 ---

+ 1 - 2
user/pages/05._links/_link-2/text.md

@@ -1,5 +1,5 @@
 ---
-title: Julien
+title: 
 image_align: left
 id: '#Oceane'
 content:
@@ -8,4 +8,3 @@ content:
         by: ''
         dir: ''
 ---
-

+ 1 - 2
user/pages/05._links/_link/text.md

@@ -1,5 +1,5 @@
 ---
-title: Oceane
+title: 
 image_align: left
 id: '#Oceane'
 content:
@@ -8,4 +8,3 @@ content:
         by: ''
         dir: ''
 ---
-

+ 6 - 1
user/themes/r2c/blueprints/modular/mappoint.yaml

@@ -31,6 +31,11 @@ form:
                   label: Id
                   multiple: true
 
+                header.target:
+                  type: text
+                  label: Cible
+                  multiple: true
+
             coordonees:
               type: section
               title: Coordonées
@@ -39,7 +44,7 @@ form:
                 header.lat:
                   type: text
                   label: Latitude
-                  
+
                 header.long:
                   type: text
                   label: Longitude

Diferenças do arquivo suprimidas por serem muito extensas
+ 8 - 4
user/themes/r2c/css-compiled/template.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
user/themes/r2c/css-compiled/template.min.css


+ 15 - 2
user/themes/r2c/css/styles_3djs.css

@@ -3,11 +3,24 @@
   stroke-opacity: 0.6;
 }
 
+/* .nodes text{
+  display: block;
+} */
 .nodes text {
   -webkit-user-select: none!important;
      -moz-user-select: none!important;
       -ms-user-select: none!important;
           user-select: none!important;
-  cursor: -webkit-grab;
-  cursor: grab;
+  cursor: -webkit-pointer;
+  cursor: pointer;
+}
+
+.nodes text.group1{
+  fill:black;
+}
+.nodes text.group2{
+  fill:grey;
+}
+.nodes text.group3{
+  fill:lightgrey;
 }

Diferenças do arquivo suprimidas por serem muito extensas
+ 46 - 0
user/themes/r2c/images/fleche-03.svg


+ 49 - 0
user/themes/r2c/images/pointeur-04.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="-255 362.1 21.9 59.9"
+   xml:space="preserve"
+   sodipodi:docname="pointeur-04.svg"
+   width="21.9"
+   height="59.900002"
+   inkscape:version="0.92.2 2405546, 2018-03-11"><metadata
+   id="metadata8"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs6" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1051"
+   id="namedview4"
+   showgrid="false"
+   inkscape:zoom="1.9865319"
+   inkscape:cx="-17.403391"
+   inkscape:cy="59.400002"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Calque_1" />
+<polygon
+   id="XMLID_101_"
+   points="-211.3,392.5 -222.3,418.1 -211.3,452.4 -200.4,418.1 "
+   transform="translate(-32.7,-30.400003)" />
+</svg>

+ 59 - 0
user/themes/r2c/images/pointeur2.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg854"
+   version="1.1"
+   viewBox="0 0 3.96875 12.964583"
+   height="49"
+   width="15">
+  <defs
+     id="defs848" />
+  <metadata
+     id="metadata851">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:none"
+     transform="translate(0,-284.0354)"
+     id="layer1">
+    <path
+       id="path1480"
+       d="m 1.8780692,288.5782 -1.04179696,2.07887 1.04179696,3.20099 1.0984933,-3.22461 z"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path1484"
+       d="m 0.8362722,290.65707 1.041797,0.46066 1.0984933,-0.48428 v 0"
+       style="fill:none;stroke:#ffffff;stroke-width:0.05;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path1486"
+       d="m 0.83627224,290.65707 1.04179696,-0.21852 1.0984933,0.1949"
+       style="fill:none;stroke:#ffffff;stroke-width:0.02;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer2">
+    <path
+       id="path1489"
+       d="M 1.9398264,11.077231 0.14198693,5.5641112 1.9418591,6.3624417 3.8143069,5.5350812 Z"
+       style="fill:none;stroke:none;stroke-width:0.45981485px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path1491"
+       d="M 1.9398264,11.077231 0.14924447,5.5713689 1.9273441,6.3624417 3.8143069,5.5350812 Z"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.45981485px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path1495"
+       d="M 1.9273441,1.9063066 0.16105623,5.434328 1.9346017,6.2194949 3.8124557,5.4039461 Z"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.45981485px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>

+ 87 - 97
user/themes/r2c/js/script.js

@@ -1,13 +1,11 @@
-function gestionarray() {
-  // dyn_data.split();
-  console.log(dyn_data.mappoints[1].id);
-  $("#page").addClass(dyn_data.mappoints[1].id);
+// addClass
+function Cmaplink() {
 
 }
-
+// Streetmap
 function map() {
   var mymap = L.map('mapid').setView([48.9367935,2.3569287], 17);
-setTimeout(mymap.invalidateSize.bind(map));
+  setTimeout(mymap.invalidateSize.bind(map));
   L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
     maxZoom: 18,
     id: 'mapbox.streets'
@@ -15,13 +13,13 @@ setTimeout(mymap.invalidateSize.bind(map));
 
   var LeafIcon = L.Icon.extend({
     options: {
-      iconSize:     [50, 50],
-      iconAnchor:   [25, 25],
+      iconSize:     [15, 49],
+      iconAnchor:   [7.5, 5],
     }
   });
 
   var markers = {};
-  var greenIcon = new LeafIcon({iconUrl: 'user/themes/r2c/images/handler.svg'})
+  var greenIcon = new LeafIcon({iconUrl: 'user/themes/r2c/images/pointeur2.svg'})
 
   for (var i = 0; i < dyn_data.mappoints.length; i++) {
     var id = dyn_data.mappoints[i].id;
@@ -30,17 +28,15 @@ setTimeout(mymap.invalidateSize.bind(map));
     markers[id]._icon.id = id;
   }
 
+  var mappoints = $('#streetmap img');
+  for (var i = 0; i < dyn_data.mappoints.length; i++) {
+    var target = dyn_data.mappoints[i].target;
+    console.log('target',target);
+    mappoints.attr('href', target );
+  }
 };
 
-function scrollbar(){
-  $(window).on("load",function(){
-            $("#start > div > div").mCustomScrollbar({
-                  axis:"y",
-                  setTop: 0,
-            });
-        });
-}
-
+// change mouse_event
 function clickhand(){
   $(".handler").on("mousedown", function (e) {
       e.preventDefault();
@@ -50,17 +46,14 @@ function clickhand(){
   });
 };
 
-function drag() {
 
+function drag() {
   var $hand = $( ".handler" );
   var $hand1 = $( ".hand1" );
   var $hand2 = $( ".hand2" );
-
   var p = 100;
-
   //marge
   var mrg = 1;
-
   // Blocs
     // find
     var $recits = $hand.parents('#page').find('#recits');
@@ -69,7 +62,6 @@ function drag() {
     var $stmp = $hand.parents('#page').find("#streetmap");
     var $rs = $hand.parents('#page').find("#reseaux-sociaux");
     var $links = $hand.parents('#page').find("#links");
-
     // handler
       // dimension
       var $Whand = parseFloat($hand.outerWidth(true));
@@ -78,40 +70,31 @@ function drag() {
   $hand1.draggable({
     containment: "#start",
     scroll: false,
-
     drag: function(event, ui){
       var oW = parseFloat($("#start").outerWidth(true));
       var oH = parseFloat($("#start").outerHeight(true));
-
       var ajustH = (100 * ( 25/ oH )) + "%";
-
       var stophand = (0.8 * oW) - 130;
           ui.position.left = Math.max( 200, ui.position.left );
           ui.position.left = Math.min( stophand, ui.position.left );
       // handler
         // position
         var pos = $hand1.position();
-
         var pos1 = $hand2.position();
         var pos11 = parseFloat(pos1.left) + 25;
-
         // center handler
         var ajustW = $Whand / 2;
         var ajustH = $Hhand / 2;
-
         // position XY
         var xPos = ( p * parseFloat( ((ui.position.left)) / oW) ) + "%" ;
         var yPos = ( p * parseFloat( ((ui.position.top)) / oH ) ) + "%" ;
-
         var xPos2 = ( p * parseFloat( ((ui.position.left ) ) / oW) ) + "%";
         var yPos2 = ( p * parseFloat( ((ui.position.top ) ) / oH) ) + "%" ;
-
         var xPos3 = ( p * parseFloat( (pos1.left + ajustW) / oW) ) + "%";
         var yPos3 = ( p * parseFloat( (ui.position.top ) / oH) ) + "%" ;
         //handler2
         var $handler2 = $(this).parent().find('.hand2');
         var PosHand = ( parseFloat(p * parseFloat((pos11 - 25) / oW)) - parseFloat(p * parseFloat( (ui.position.left) / oW)) ) + "%";
-
         // application dimension
         $hand2.css({
           'top': yPos3,
@@ -121,26 +104,22 @@ function drag() {
           "height": yPos,
           "left": "-2px",
         })
-
         $itw.css({
           "left":xPos2,
           "width": PosHand,
           "height": yPos,
           "min-width": "200px"
         })
-
         $img.css({
           "height": yPos,
           "min-width": "200px",
         })
-
         $stmp.css({
           "width":xPos,
           "top": yPos2,
           "bottom":"1px",
           "height": 'auto',
         })
-
         $links.css({
           "top": yPos2,
           "left":xPos2,
@@ -148,13 +127,11 @@ function drag() {
           "bottom":"1px",
           "height": 'auto',
         })
-
         $rs.css({
           "top": yPos2,
           "bottom":0,
           "height": 'auto',
         })
-
         // if itw < 200
         var testPourcent = parseFloat( p * parseFloat(ui.position.left + 238) / oW ) + "%";
         var img200 = parseFloat( p * parseFloat( (oW - (pos11 - 25 )) / oW) ) + "%" ;
@@ -189,93 +166,71 @@ function drag() {
     drag: function(event, ui){
       var oW = parseFloat($("#start").outerWidth(true));
       var oH = parseFloat($("#start").outerHeight(true));
-
       var stophand = (oW - 200) - 50;
       console.log(stophand)
           ui.position.left = Math.max( 400, ui.position.left );
           ui.position.left = Math.min( stophand, ui.position.left );
-
       // handler
         // position
         var pos = $hand1.position();
         var pos1 = $hand2.position();
         var pos11 = parseFloat(pos.left) + 25;
-
         // center
         var ajustW = $Whand / 2 - 1;
         var ajustH = $Hhand / 2 + 1;
         var ajustW200 = $Whand / 2 + 6;
-
         var ajustW2 = $Whand / 2 + 1;
         var ajustH2 = $Hhand / 2 + 1;
-
         var ajustW3 = $Whand / 2 + 3;
         var ajustH3 = $Hhand / 2 + 1;
-
         // position XY
         var xPos = ( p * parseFloat( ( oW - (ui.position.left) ) / oW) + "%" );
         var yPos = ( p * parseFloat( (ui.position.top ) / oH ) ) + "%" ;
-
         var xPos2 = ( p * parseFloat( ( oW - (ui.position.left) ) / oW ) ) + "%";
         var yPos2 = ( p * parseFloat( (ui.position.top ) / oH ) ) + "%" ;
-
         // var xPos3 = ( p * parseFloat( (oW - (pos.left)) / oW ) ) + "%";
         var xPos3 = ( p * parseFloat( (pos1.left + ajustW) / oW) ) + "%";
-
         var yPos3 = ( p * parseFloat( (ui.position.top ) / oH ) ) + "%" ;
-
         //handler2
         var $handler2 = $(this).parent().find('.hand2');
-
-
         var PosHand = (parseFloat(xPos3) - parseFloat(xPos)) + "%";
-
         var PosHand1 = ( parseFloat(p * parseFloat( (ui.position.left) / oW)) - parseFloat(p * parseFloat((pos11 - 25) / oW))) + "%";
-
         // application dimension
         $hand1.css({
           'top': yPos3,
         })
-
         $recits.css({
           "height": yPos,
         })
-
         $itw.css({
           "width": PosHand1,
           "height": yPos,
         })
-
         $img.css({
           "width": xPos,
           "height": yPos,
         })
-
         $stmp.css({
           "top": yPos2,
           "bottom":"1px",
           "height": 'auto',
         })
-
         $rs.css({
           "width":xPos,
           "top": yPos2,
           "bottom":0,
           "height": 'auto',
-          })
-
+        })
         $links.css({
           "top": yPos2,
           "width":PosHand1,
           "bottom":"1px",
           "height": 'auto',
         })
-
         // if itw < 200
         var test = ui.position.left - 225;
         var testPourcent = ( p * parseFloat(test) / oW ) + "%";
         var img200 = ( p * parseFloat(  ((pos.left) ) / oW) + "%" );
-
         if ( $itw.width() < 200) {
           $recits.css({
             "width": img200,
@@ -292,21 +247,20 @@ function drag() {
           $hand1.css({
             'left':test,
           })
-        }else {
-
-        }
+        }else {}
     },
+
     stop: function( event, ui ) {
       var parent = $(this).parents("#start");
       $(this).css({
         left:parseInt($(this).css('left'))/parent.width()*100+"%",
         top: parseInt($(this).css('top'))/parent.height()*100+"%",
       });
-
     },
   });
 };
 
+// draggable
 function dragcanvas() {
   var $reseau = $('#reseaux-sociaux canvas');
   var $links = $('#links svg')
@@ -314,60 +268,38 @@ function dragcanvas() {
   $links.draggable({
     scroll: false
   });
-
   $reseau.draggable({
     scroll: false
   });
 }
 
+// hidden scroll + synchro
 function mCustomScrollbar() {
     $('.blocs').mCustomScrollbar({
-          scrollInertia: 100,
+      mouseWheel:{
+        deltaFactor: 5
+      },
+          scrollInertia: 1000,
     });
 
-    $('.blocs').mCustomScrollbar("update");
-
-    $(document).on("click","a[href^='#']",function(e){
+    $(document).on("click","a[href^='#'],#links .nodes text[href^='#'],#streetmap img[href^='#']",function(e){
       e.preventDefault();
-      // var id = [];
-      // var href = $(this).attr("href");
-      // var letter = $.inArray('#', href);
-      // console.log('L',letter);
-      // var target = $(href).parents(".mCustomScrollbar");
-      //
-      //   if(target.length){
-      //     e.preventDefault();
-      //     target.mCustomScrollbar("scrollTo",href,{
-      //       scrollInertia:1000,
-      //       // offset: 0
-      //     });
-      //   }
-      // console.log('target', target);
-      // console.log('href', href);
-
-
       var hrefs = $(this).attr("href").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);
 
-        // a partir de là tu peux synchro chacun des blocks en focntion de
-        //   h_parts[2] est la première partie qui te dit de quel block il s'agit
-        //   h_parts[3] est l'ancre
-        //   etc
         function scrollTo() {
           var href = target.find(h_parts[0]);
-
           e.preventDefault();
           target.mCustomScrollbar("scrollTo",href,{
             scrollInertia:1000,
-            // offset: 0
           });
         }
+
         switch (h_parts[2]) {
           case 'rct':
           var target = $('#recits.mCustomScrollbar');
@@ -388,6 +320,31 @@ function mCustomScrollbar() {
           case 'lk':
             var target = $('#links.mCustomScrollbar');
             scrollTo();
+            var href = target.find(h_parts[0]);
+            var text = $('.nodes text.group1');
+            var text2 = $('.nodes text.group2');
+            var text3 = $('.nodes text.group3');
+            console.log('cc');
+
+            text.css({
+              'font-size':'inherit',
+              'fill':'black',
+            });
+            text2.css({
+              'font-size':'inherit',
+              'fill':'grey',
+            });
+            text3.css({
+              'font-size':'inherit',
+              'fill':'lightgrey',
+            });
+
+            if (href) {
+              href.css({
+                'font-size':'1.2rem',
+                'fill':'blue',
+              });
+            }
             break;
           // case 'rs':
           //   var target = $('#reseaux-sociaux.mCustomScrollbar');
@@ -402,6 +359,40 @@ function mCustomScrollbar() {
     });
 }
 
+function clicklinkmap() {
+  $("text#lk_martine").on("click", function(){
+
+    // var href = target.find(h_parts[0]);
+    // var text = $('.nodes text.group1');
+    // var text2 = $('.nodes text.group2');
+    // var text3 = $('.nodes text.group3');
+    // text.css({
+    //   'font-size':'inherit',
+    //   'fill':'black',
+    // });
+    // text2.css({
+    //   'font-size':'inherit',
+    //   'fill':'grey',
+    // });
+    // text3.css({
+    //   'font-size':'inherit',
+    //   'fill':'lightgrey',
+    // });
+    //
+    // if (href) {
+    //   href.css({
+    //     'font-size':'1.2rem',
+    //     'fill':'blue',
+    //   });
+    // }
+
+    // $("svg .nodes text").css({
+    //   'font-size':'1.2rem',
+    //   'z-index': '999',
+    //   'fill':'blue',
+    // })
+ });
+}
 
 function paperjs() {
   window.onload = function() {
@@ -437,7 +428,6 @@ function paperjs() {
     paper.view.draw();
 
     }
-
   // var pulse = 0.7;
   // var sinus = Math.sin(event.time * pulse + i);
   // var cos = Math.cos(event.time *  pulse + i);
@@ -448,13 +438,13 @@ function paperjs() {
 }
 
 $(document).ready(function() {
-  // gestionarray();
+  clicklinkmap();
   mCustomScrollbar();
   clickhand();
   drag();
   dragcanvas();
   map();
+  clicklinkmap();
   paperjs();
   // D3js();
-  // scrollbar();
 });

+ 3 - 2
user/themes/r2c/js/script_d3js.js

@@ -5,7 +5,7 @@
   var color = d3.scaleOrdinal(d3.schemeCategory20);
 
   var simulation = d3.forceSimulation()
-      .force("link", d3.forceLink().id(function(d) { return d.id; }))
+      .force("link", d3.forceLink(10).distance(50).id(function(d) { return d.id; }))
       .force("charge", d3.forceManyBody())
       .force("center", d3.forceCenter(width / 2, height / 2));
 
@@ -25,7 +25,8 @@
         .data(graph.nodes)
         .enter().append("text")
         .text(function(d) { return d.id; })
-        .attr("fill", function(d) { return color(d.group); })
+        // .attr("fill", function(d) { return color(); })
+        .attr("class",function(d) { return "group" + d.group ;})
         .attr("id",function(d) { return d.identifiant; })
         .attr("href",function(d) { return d.cible; })
         .call(d3.drag()

+ 142 - 122
user/themes/r2c/json/miserables.json

@@ -1,142 +1,162 @@
 {
   "nodes": [
-    {"identifiant":"qui_il_est", "cible": "ou_il_va", "id": "Oceane", "group": 1},
-    {"id": "Wiebke", "group": 1},
-    {"id": "Manon", "group": 1},
-    {"id": "Andreea", "group": 1},
-    {"id": "Laurent", "group": 1},
-    {"id": "Nadia", "group": 1},
-    {"id": "Pascale", "group": 1},
-    {"id": "Martine", "group": 1},
-    {"id": "Line", "group": 1},
-    {"id": "Julien", "group": 1},
-    {"id": "Marie.W", "group": 1},
-    {"id": "Solen", "group": 1},
-    {"id": "Olivier", "group": 1},
-    {"id": "Elodie", "group":1},
-    {"id": "Loyce", "group": 1},
-    {"id": "Marie.P", "group": 1},
-    {"id": "Victoria", "group": 1},
-    {"id": "Attieke", "group": 1},
-    {"id": "Kabane", "group": 1},
-    {"id": "Paris 8", "group":2},
-    {"id": "La fabrique des sociologies", "group": 2},
-    {"id": "Synesthesie", "group": 2},
-    {"id": "Maison jaune", "group": 2},
-    {"id": "Cooperence", "group": 2},
-    {"id": "Jardin Haguette", "group": 2},
-    {"id": "Tricot partage", "group": 2},
-    {"id": "Amap Court-circuit", "group": 2},
-    {"id": "Clinamen", "group": 2},
-    {"id": "Briche", "group": 2},
-    {"id": "Academie Fratellini", "group": 2},
-    {"id": "Point carre", "group": 2},
-    {"id": "Franciade", "group": 2},
-    {"id": "Dechets d'art", "group": 2},
-    {"id": "Collectif Mund Gawi", "group": 2},
-    {"id": "Le 6B", "group": 2},
-    {"id": "Adada", "group": 2},
-    {"id": "Artefact 93", "group": 2},
-    {"id": "Landykadi", "group": 2},
-    {"id": "Rien ne se perd", "group": 2},
-    {"id": "Shakti 21", "group": 2},
-    {"id": "Cop'Billon", "group": 2},
-    {"id": "Street mamies", "group": 2},
-    {"id": "L'oasis", "group": 2},
-    {"id": "Diony's voice", "group": 3},
-    {"id": "Scouts de St Denis", "group": 3},
-    {"id": "Cinéma Ecran 93", "group": 3},
-    {"id": "Crêperie la Bigoudène", "group": 3},
-    {"id": "Jardin Chez Basile", "group": 3},
-    {"id": "Rajganawak", "group": 2},
-    {"id": "YAKA", "group": 2},
-    {"id": "Le Pavillon", "group": 2},
-    {"id": "Chorale du Jazz Club", "group": 2},
-    {"id": "La maison des seniors", "group": 2},
-    {"id": "Théâtre Gérard-Philipe", "group": 3}
+    {"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_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_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},
+    {"identifiant":"lk_pascale","cible":"#rct_190617,#int_pascale,#img_pascale","id": "Pascale", "group": 1},
+    {"identifiant":"lk_martine","cible":"#mp_chezmartine,#rct_050917,#int_martine,#img_martine","id": "Martine", "group": 1},
+    {"identifiant":"lk_line","cible":"#rct_110417","id": "Line", "group": 3},
+    {"identifiant":"lk_mariew","cible":"#rct_041017,#int_mariew,#mp_chezmariew,#img_mariew","id": "Marie.W", "group": 1},
+    {"identifiant":"lk_solen","cible":"#rct_031017,#int_solen,#mp_chezsolen,#img_solen","id": "Solen", "group": 1},
+    {"identifiant":"lk_olivier","cible":"#rct_051017,#int_olivier,#img_olivier","id": "Olivier", "group": 1},
+    {"identifiant":"lk_elodie","cible":"#mp_syn","id": "Elodie", "group":3},
+    {"identifiant":"lk_Loyce","cible":"#mp_syn","id": "Loyce", "group": 3},
+    {"identifiant":"lk_mariep","cible":"#rct_060717,#int_mariep,#img_mariep","id": "Marie.P", "group": 1},
+    {"identifiant":"lk_victoria","cible":"#rct_250717,#int_victoria,#img_victoria","id": "Victoria", "group": 1},
+    {"identifiant":"lk_attieke","cible":"#mp_attieke,#img_attieke","id": "Attieke", "group": 2},
+    {"identifiant":"lk_kabane","cible":"#mp_kabane,#img_kb","id": "Kabane", "group": 2},
+    {"identifiant":"lk_paris8","cible":"#mp_paris8,#img_paris8","id": "Paris 8", "group":2},
+    {"identifiant":"lk_fabrique","cible":"#img_fabrique","id": "La fabrique des sociologies", "group": 2},
+    {"identifiant":"lk_syn","cible":"#mp_syn,#img_syn","id": "Synesthesie", "group": 2},
+    {"identifiant":"lk_maisonjaune","cible":"#mp_maisonjaune,#img_mj1","id": "Maison jaune", "group": 2},
+    {"identifiant":"lk_coop","cible":"#mp_110,#img_centresocial","id": "Cooperence", "group": 2},
+    {"identifiant":"lk_jardinhaguette","cible":"#mp_jardinhaguette,#img_jh3","id": "Jardin Haguette", "group": 2},
+    {"identifiant":"lk_tricotpartage","cible":"#img_tp,#int_pascale","id": "Tricot partage", "group": 2},
+    {"identifiant":"lk_amap","cible":"#mp_amap,#img_amap","id": "Amap Court-circuit", "group": 2},
+    {"identifiant":"lk_clinamen","cible":"#img_clinamen","id": "Clinamen", "group": 2},
+    {"identifiant":"lk_briche","cible":"#mp_briche,#img_briche","id": "La Briche", "group": 2},
+    {"identifiant":"lk_academie","cible":"#mp_academie","id": "Academie Fratellini", "group": 2},
+    {"identifiant":"lk_pointcarre","cible":"#mp_pointcarre,#img_pointcarre,#rct_120717","id": "Point Carre", "group": 2},
+    {"identifiant":"lk_franciade","cible":"#mp_franciade,#img_fr,#int_andreea","id": "Franciade", "group": 2},
+    {"identifiant":"lk_dechetsdart","cible":"#mp_dechetsdart,#img_da,#int_ocelau","id": "Dechets d'art", "group": 2},
+    {"identifiant":"lk_mundgawi","cible":"#mp_oasis,#img_oasis,#int_ocelau","id": "Collectif Mund Gawi", "group": 2},
+    {"identifiant":"lk_6b","cible":"#mp_6b,#img_6b","id": "Le 6B", "group": 2},
+    {"identifiant":"lk_adada","cible":"#mp_adada,#img_adada","id": "60 Adada", "group": 2},
+    {"identifiant":"lk_artefact","cible":"#mp_artefact,#img_artefact","id": "Artefact 93", "group": 2},
+    {"identifiant":"lk_landykadi","cible":"#mp_landykadi,#img_landykadi","id": "Landy Kadi", "group": 2},
+    {"identifiant":"lk_Rien","cible":"#img_rien","id": "Rien ne se perd", "group": 2},
+    {"identifiant":"lk_tgp","cible":"#img_tgp,#mp_tgp","id": "Théâtre Gérard Philipe", "group": 2},
+    {"identifiant":"lk_shakti21","cible":"#mp_shakti21,#img_shakti21","id": "Shakti 21", "group": 2},
+    {"identifiant":"lk_copbi","cible":"#mp_copbi,#img_copbi","id": "Cop'Billon", "group": 2},
+    {"identifiant":"lk_streetmamies","cible":"#img_filmmamies","id": "Street mamies", "group": 2},
+    {"identifiant":"lk_oasis","cible":"#img_oasis,#mp_oasis,#int_ocelau","id": "L'oasis", "group": 2},
+    {"identifiant":"lk_labigoudene","cible":"#img_labigoudene,#mp_labigoudene,#rct_051017","id": "Crêperie la Bigoudène", "group": 2},
+    {"identifiant":"lk_chapiteau","cible":"#img_chapiteau,#mp_chapiteau","id": "Chapiteau Rajganawak", "group": 2},
+    {"identifiant":"lk_yaka","cible":"#int_olivier","id": "YAKA", "group": 2},
+    {"identifiant":"lk_pavillon","cible":"#img_pavillon,#mp_pavillon","id": "Le Pavillon", "group": 2},
+    {"identifiant":"lk_taxiphone","cible":"#img_taxiphone,#mp_taxiphone","id": "Taxiphone", "group": 2},
+    {"identifiant":"lk_chorale","cible":"#img_chorale,#mp_chorale","id": "Chorale du Jazz Club", "group": 2},
+    {"identifiant":"lk_maisondesseniors","cible":"#img_maisondesseniors,#mp_maisondesseniors","id": "La maison des seniors", "group": 2}
+
   ],
 
   "links": [
-    {"source": "Oceane", "target": "Dechets d'art", "value": 1},
-    {"source": "Oceane", "target": "Le 6B", "value": 1},
-    {"source": "Oceane", "target": "Laurent", "value": 1},
-    {"source": "Oceane", "target": "Collectif Mund Gawi", "value": 1},
-    {"source": "L'oasis", "target": "Collectif Mund Gawi", "value": 1},
-    {"source": "Oceane", "target": "L'oasis", "value": 1},
+    {"source": "Oceane", "target": "Dechets d'art", "value": 2},
+    {"source": "Marie.W", "target": "Taxiphone", "value": 2},
+    {"source": "Ecran 93", "target": "Victoria", "value": 1},
+    {"source": "Ecran 93", "target": "Marie.W", "value": 1},
+    {"source": "Oceane", "target": "Point Carre", "value": 1},
+    {"source": "Oceane", "target": "Théâtre Gérard Philipe", "value": 1},
+    {"source": "Olivier", "target": "Théâtre Gérard Philipe", "value": 1},
+    {"source": "Marie.W", "target": "Théâtre Gérard Philipe", "value": 1},
+    {"source": "Marie.W", "target": "60 Adada", "value": 1},
+    {"source": "Martine", "target": "60 Adada", "value": 1},
+    {"source": "Pascale", "target": "Crêperie la Bigoudène", "value": 1},
+    {"source": "Oceane", "target": "Le 6B", "value": 2},
+    {"source": "Oceane", "target": "Laurent", "value": 2},
+    {"source": "Oceane", "target": "Collectif Mund Gawi", "value": 2},
+    {"source": "L'oasis", "target": "Collectif Mund Gawi", "value": 2},
+    {"source": "Oceane", "target": "L'oasis", "value": 2},
     {"source": "Laurent", "target": "L'oasis", "value": 1},
     {"source": "Oceane", "target": "Cop'Billon", "value": 1},
-    {"source": "Oceane", "target": "Street mamies", "value": 1},
+    {"source": "Oceane", "target": "Street mamies", "value": 2},
     {"source": "Street mamies", "target": "Cop'Billon", "value": 1},
-    {"source": "Olivier", "target": "Chorale du Jazz Club", "value": 1},
-    {"source": "Landykadi", "target": "Dechets d'art", "value": 1},
-    {"source": "Landykadi", "target": "Collectif Mund Gawi", "value": 1},
-    {"source": "Laurent", "target": "Le 6B", "value": 1},
+    {"source": "Olivier", "target": "Chorale du Jazz Club", "value": 2},
+    {"source": "Landy Kadi", "target": "Dechets d'art", "value": 2},
+    {"source": "Landy Kadi", "target": "Collectif Mund Gawi", "value": 2},
+    {"source": "Laurent", "target": "Le 6B", "value": 2},
     {"source": "Laurent", "target": "Collectif Mund Gawi", "value": 1},
-    {"source": "Shakti 21", "target": "Collectif Mund Gawi", "value": 1},
-    {"source": "Shakti 21", "target": "Le 6B", "value": 1},
-    {"source": "Dechets d'art", "target": "Le 6B", "value": 1},
-    {"source": "Rien ne se perd", "target": "Collectif Mund Gawi", "value": 1},
-    {"source": "Artefact 93", "target": "Dechets d'art", "value":1},
-    {"source": "Artefact 93", "target": "Franciade", "value": 1},
-    {"source": "Artefact 93", "target": "Adada", "value": 1},
-    {"source": "Artefact 93", "target": "Point carre", "value": 1},
-    {"source": "Point carre", "target": "Franciade", "value": 1},
-    {"source": "Franciade", "target": "Adada", "value":1},
-    {"source": "Adada", "target": "Dechets d'art", "value": 1},
-    {"source": "Adada", "target": "Point carre", "value": 1},
-    {"source": "Franciade", "target": "Andreea", "value": 1},
-    {"source": "Point carre", "target": "Wiebke", "value": 1},
-    {"source": "Wiebke", "target": "Clinamen", "value": 1},
-    {"source": "Wiebke", "target": "Rajganawak", "value": 1},
-    {"source": "Wiebke", "target": "Briche", "value": 1},
-    {"source": "Briche", "target": "Academie Fratellini", "value":1},
-    {"source": "Academie Fratellini", "target": "Manon", "value": 1},
-    {"source": "Manon", "target": "Solen", "value": 1},
+    {"source": "Shakti 21", "target": "Collectif Mund Gawi", "value": 2},
+    {"source": "Shakti 21", "target": "Le 6B", "value": 2},
+    {"source": "Dechets d'art", "target": "Le 6B", "value": 2},
+    {"source": "Rien ne se perd", "target": "Collectif Mund Gawi", "value": 2},
+    {"source": "Artefact 93", "target": "Dechets d'art", "value":2},
+    {"source": "Artefact 93", "target": "Franciade", "value": 2},
+    {"source": "Artefact 93", "target": "60 Adada", "value": 2},
+    {"source": "Artefact 93", "target": "Point Carre", "value": 2},
+    {"source": "Point Carre", "target": "Franciade", "value": 2},
+    {"source": "Franciade", "target": "60 Adada", "value":2},
+    {"source": "Franciade", "target": "Dechets d'art", "value":2},
+    {"source": "60 Adada", "target": "Dechets d'art", "value": 2},
+    {"source": "60 Adada", "target": "Point Carre", "value": 2},
+    {"source": "Franciade", "target": "Andreea", "value": 2},
+    {"source": "Point Carre", "target": "Wiebke", "value": 2},
+    {"source": "Wiebke", "target": "Clinamen", "value": 2},
+    {"source": "Collectif Mund Gawi", "target": "Clinamen", "value": 2},
+    {"source": "Wiebke", "target": "Chapiteau Rajganawak", "value": 2},
+    {"source": "Olivier", "target": "Chapiteau Rajganawak", "value": 1},
+    {"source": "Oceane", "target": "Chapiteau Rajganawak", "value": 1},
+    {"source": "Manon", "target": "Chapiteau Rajganawak", "value": 2},
+    {"source": "La Briche", "target": "Chapiteau Rajganawak", "value": 1},
+    {"source": "Wiebke", "target": "La Briche", "value": 2},
+    {"source": "La Briche", "target": "Academie Fratellini", "value":2},
+    {"source": "Academie Fratellini", "target": "Manon", "value": 2},
+    {"source": "Manon", "target": "Solen", "value":2},
     {"source": "Solen", "target": "Cooperence", "value": 1},
-    {"source": "Cooperence", "target": "Tricot partage", "value": 1},
-    {"source": "Cooperence", "target": "Nadia", "value": 1},
-    {"source": "Nadia", "target": "Pascale", "value": 1},
-    {"source": "Tricot partage", "target": "Pascale", "value": 1},
-    {"source": "Pascale", "target": "Maison jaune", "value": 1},
-    {"source": "Jardin Haguette", "target": "Martine", "value": 1},
-    {"source": "Martine", "target": "Paris 8", "value": 1},
-    {"source": "Paris 8", "target": "Marie.W", "value": 1},
-    {"source": "Paris 8", "target": "Loyce", "value": 1},
-    {"source": "Paris 8", "target": "Marie.P", "value": 1},
-    {"source": "Paris 8", "target": "Victoria", "value":1},
-    {"source": "Victoria", "target": "Kabane", "value": 1},
-    {"source": "Kabane", "target": "Paris 8", "value": 1},
-    {"source": "Victoria", "target": "Attieke", "value": 1},
-    {"source": "Victoria", "target": "Marie.W", "value": 1},
-    {"source": "Marie.W", "target": "Amap Court-circuit", "value":1},
-    {"source": "Amap Court-circuit", "target": "Olivier", "value": 1},
+    {"source": "Cooperence", "target": "Tricot partage", "value": 2},
+    {"source": "Cooperence", "target": "Nadia", "value": 2},
+    {"source": "Nadia", "target": "Pascale", "value": 2},
+    {"source": "Nadia", "target": "Olivier", "value": 2},
+    {"source": "Nadia", "target": "Solen", "value": 1},
+    {"source": "Tricot partage", "target": "Pascale", "value": 2},
+    {"source": "Tricot partage", "target": "Maison jaune", "value": 2},
+    {"source": "Pascale", "target": "Maison jaune", "value": 2},
+    {"source": "Jardin Haguette", "target": "Martine", "value": 2},
+    {"source": "Martine", "target": "Paris 8", "value": 2},
+    {"source": "Paris 8", "target": "Marie.W", "value": 2},
+    {"source": "Paris 8", "target": "Loyce", "value": 2},
+    {"source": "Paris 8", "target": "Marie.P", "value": 2},
+    {"source": "Bachir", "target": "Marie.P", "value": 1},
+    {"source": "Bachir", "target": "Synesthesie", "value": 1},
+    {"source": "Paris 8", "target": "Victoria", "value":2},
+    {"source": "Jardin Haguette", "target": "Victoria", "value":1},
+    {"source": "Victoria", "target": "Kabane", "value": 2},
+    {"source": "Kabane", "target": "Paris 8", "value": 2},
+    {"source": "Victoria", "target": "Attieke", "value": 2},
+    {"source": "Marie.W", "target": "Attieke", "value": 1},
+    {"source": "Victoria", "target": "Marie.W", "value": 2},
+    {"source": "Marie.W", "target": "Amap Court-circuit", "value":2},
+    {"source": "Marie.P", "target": "Amap Court-circuit", "value":1},
+    {"source": "Amap Court-circuit", "target": "Olivier", "value": 2},
     {"source": "Amap Court-circuit", "target": "Elodie", "value": 1},
-    {"source": "Amap Court-circuit", "target": "Solen", "value": 1},
-    {"source": "Solen", "target": "Olivier", "value": 1},
-    {"source": "Manon", "target": "Wiebke", "value": 1},
-    {"source": "Olivier", "target": "Cooperence", "value": 1},
-    {"source": "Olivier", "target": "Elodie", "value": 1},
-    {"source": "Elodie", "target": "Synesthesie", "value": 1},
-    {"source": "Synesthesie", "target": "Loyce", "value": 1},
-    {"source": "Synesthesie", "target": "Line", "value": 1},
-    {"source": "Synesthesie", "target": "Julien", "value": 1},
+    {"source": "Amap Court-circuit", "target": "Solen", "value": 2},
+    {"source": "Solen", "target": "Olivier", "value": 2},
+    {"source": "Manon", "target": "Wiebke", "value": 2},
+    {"source": "Olivier", "target": "Cooperence", "value": 2},
+    {"source": "Olivier", "target": "Elodie", "value": 2},
+    {"source": "Elodie", "target": "Synesthesie", "value": 2},
+    {"source": "Synesthesie", "target": "Loyce", "value": 2},
+    {"source": "Synesthesie", "target": "Line", "value": 2},
     {"source": "Synesthesie", "target": "Marie.P", "value": 1},
-    {"source": "Synesthesie", "target": "Maison jaune", "value": 1},
-    {"source": "Elodie", "target": "Julien", "value": 1},
-    {"source": "Elodie", "target": "Loyce", "value": 1},
-    {"source": "Elodie", "target": "Line", "value": 1},
-    {"source": "Line", "target": "Julien", "value": 1},
-    {"source": "Line", "target": "Loyce", "value": 1},
+    {"source": "Synesthesie", "target": "Maison jaune", "value": 2},
+    {"source": "Elodie", "target": "Loyce", "value": 2},
+    {"source": "Elodie", "target": "Line", "value": 2},
+    {"source": "Line", "target": "Loyce", "value": 2},
     {"source": "Marie.P", "target": "Loyce", "value": 1},
-    {"source": "Julien", "target": "Loyce", "value": 1},
     {"source": "Victoria", "target": "Marie.P", "value": 1},
-    {"source": "Olivier", "target": "YAKA", "value": 1},
-    {"source": "Solen", "target": "YAKA", "value": 1},
-    {"source": "Cooperence", "target": "YAKA", "value": 1},
+    {"source": "Olivier", "target": "YAKA", "value": 2},
+    {"source": "Solen", "target": "YAKA", "value": 2},
+    {"source": "Cooperence", "target": "YAKA", "value": 2},
     {"source": "Le Pavillon", "target": "Marie.W", "value": 1},
     {"source": "Le Pavillon", "target": "Manon", "value": 1},
     {"source": "Le Pavillon", "target": "Solen", "value": 1},
+    {"source": "Le Pavillon", "target": "Oceane", "value": 1},
     {"source": "La maison des seniors", "target": "Dechets d'art", "value": 1},
-    {"source": "La fabrique des sociologies", "target": "Martine", "value": 1}
+    {"source": "La fabrique des sociologies", "target": "Martine", "value": 2}
   ]
 }

+ 17 - 10
user/themes/r2c/scss/template/_section.scss

@@ -98,10 +98,23 @@ body{
     #links{
       z-index: 997!important;
       display: flex;
-      svg{
-        position: fixed;
-        top: -33%;
-        left: -55%;
+      #mCSB_5{
+        width: 100%;
+        #mCSB_5_container{
+          width: 100%;
+          width: 100%;
+        }
+      }
+      .cadre{
+        position: absolute;
+        overflow: hidden;
+        width: 100%;
+        height: 100%;
+        svg{
+          position: fixed;
+          top: -33%;
+          left: -55%;
+        }
       }
     }
     #streetmap{
@@ -115,13 +128,7 @@ body{
       #mapid {
         width: 100%;
         height: 100%;
-
         filter: grayscale(100%) contrast(1);
-        .leaflet-marker-pane{
-          img{
-            transform: translate(-25px, -25px);
-          }
-        }
       }
     }
   }

+ 10 - 1
user/themes/r2c/scss/template/_typography.scss

@@ -26,7 +26,16 @@ p{
 .blocs{
   a.linkext{
     &:after{
-      content: "~";
+      display: inline-block;
+      content: " ";
+      background-image: url("../images/fleche-03.svg");
+      background-repeat: no-repeat;
+      background-position: center;
+      background-size: contain;
+      width: 25px;
+      height: 13px;
+      margin-left: 5px;
+      // transform: rotate(-20deg);
     }
   }
   &:nth-child(2){

+ 3 - 4
user/themes/r2c/templates/modular/links.html.twig

@@ -4,9 +4,8 @@
 
 {% block body %}
     {% for module in page.collection %}
-      <div id="{{ _self.pageLinkName(module.folder)|replace({"0":"", "1":"", "2":"", "3":"", "4":"", "5":"", "6":"", "7":"", "8":"", "9":"", ".":"","_":"" }) }}">
-         {{ module.content }} 
-      </div>
     {% endfor %}
-    <svg width="3960" height="2160" resize hidpi="on"></svg>
+    <div class="cadre">
+      <svg width="3960" height="2160" resize hidpi="on"></svg>
+    </div>
   {% endblock %}

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff