màj composition membres du CA

diff --git a/Association.mdwn b/Association.mdwn
index eb1445c19d868fec38aef24f4e5d5dabe0b6b841..2785db3bb01b70270d6ecdb78e8afb8269538b9d 100644 (file)
--- a/Association.mdwn
+++ b/Association.mdwn
@@ -35,7 +35,7 @@ Manach](https://fr.wikipedia.org/wiki/Jean-Marc_Manach) et [Esther Onfroy](https
 Conseil d'administration
 ========================
 
-Suite à la délibération du 19 avril 2025, il est composé depuis cette date de cinq membres : Chre, Corl3ss, jvoisin, ned, syl.
+Depuis janvier 2026, il est composé de quatre membres : Chre, jvoisin, ned, syl.
 
 Rapports moraux et financiers
 =============================

diff --git a/Partenaires.mdwn b/Partenaires.mdwn
index 5b5771404038b00b46451c4764a55e494d920086..12b78c079cb3ce9cce4b0c46d0c4eeafa593dbac 100644 (file)
--- a/Partenaires.mdwn
+++ b/Partenaires.mdwn
@@ -11,6 +11,7 @@ L'association travaille avec :
    - [OFTC](https://oftc.net/)
    - [Aquilenet](https://www.aquilenet.fr/)
    - [Data Expertise - Human's Connexion](https://www.data-expertise.com/)
+   - [Moji](https://moji.fr/)
  * Conseils juridiques :
    - [Maître Olivier Hugot](https://dune.fr/)
  * Aide à la collecte de dons :
@@ -33,7 +34,7 @@ L'association travaille avec :
    - [Framasoft](https://framasoft.org/) - 2017
    - [Code Lutin](https://www.codelutin.com/) - 2019, 2021
    - [FDN](https://www.fdn.fr/) - 2024
-   - [Human Rights Foundation (HRF)](https://hrf.org/) - 2024
+   - [Human Rights Foundation (HRF)](https://hrf.org/) - 2023
 
 Un grand merci à toutes celles et ceux qui participent à *faire* Internet, au
 développement de Tor ainsi qu'à toutes celles et ceux qui luttent pour

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index 827c0e05118a55ca32fdecd5cdb087c4b976c3a5..ee0eb377058765cd5d9925ba2f6fded1433b89e3 100644 (file)
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -69,7 +69,11 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
 
   var update_period;
 
-  var svg = d3.select(selector).append("svg")
+  var wrapper = d3.select(selector).append("div")
+      .style("display", "flex")
+      .style("align-items", "flex-start");
+
+  var svg = wrapper.append("svg")
       .attr("width", BwDrawer.width + BwDrawer.margin.left + BwDrawer.margin.right)
       .attr("height", BwDrawer.height + BwDrawer.margin.top + BwDrawer.margin.bottom)
     .append("g")
@@ -193,26 +197,32 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
       .attr("class", "y axis")
       .call(BwDrawer.yAxis);
 
-  var legend = svg.selectAll(".legend")
-      .data(BwDrawer.color.domain().slice().reverse())
-    .enter().append("g")
-      .attr("class", "legend")
-      .attr("transform", function(d, i) { return "translate(0," + ((i * 20) - BwDrawer.margin.top) + ")"; });
-
-  legend.append("rect")
-      .attr("x", BwDrawer.width - 18)
-      .attr("width", 18)
-      .attr("height", 18)
-      .style("fill", BwDrawer.color);
-
-  legend.append("text")
-      .attr("x", BwDrawer.width - 24)
-      .attr("y", 9)
-      .attr("dy", ".35em")
-      .style("text-anchor", "end")
-      .text(function(d) {
-        return nos_oignons_relays.filter(function(r) { return r.fingerprint == d; })[0].name;
-      });
+  var legendDiv = wrapper.append("div")
+      .style("overflow-y", "auto")
+      .style("max-height", (BwDrawer.height + BwDrawer.margin.top + BwDrawer.margin.bottom) + "px")
+      .style("min-width", "90px")
+      .style("padding-left", "10px")
+      .style("padding-top", BwDrawer.margin.top + "px")
+      .style("box-sizing", "border-box");
+
+  BwDrawer.color.domain().slice().reverse().forEach(function(d) {
+    var name = nos_oignons_relays.filter(function(r) { return r.fingerprint == d; })[0].name;
+    var item = legendDiv.append("div")
+        .style("display", "flex")
+        .style("align-items", "center")
+        .style("margin-bottom", "3px")
+        .style("white-space", "nowrap");
+    item.append("span")
+        .style("display", "inline-block")
+        .style("width", "14px")
+        .style("min-width", "14px")
+        .style("height", "14px")
+        .style("background-color", BwDrawer.color(d))
+        .style("margin-right", "5px");
+    item.append("span")
+        .style("font-size", "11px")
+        .text(name);
+  });
 };
 
 BwDrawer.prototype.draw = function() {

diff --git a/assets/weights_graphs.js b/assets/weights_graphs.js
index 775afc200ecd9c6d7a17a7ffa2150181df55d2ab..8a30862e3fbc0afc1f02eddc794d2f31cac4e356 100644 (file)
--- a/assets/weights_graphs.js
+++ b/assets/weights_graphs.js
@@ -100,7 +100,11 @@ WeightsDrawer.prototype.draw_weights_graph = function(raw_data) {
     }
   });
 
-  drawer.svg = d3.select(drawer.selector).append("svg")
+  var wrapper = d3.select(drawer.selector).append("div")
+      .style("display", "flex")
+      .style("align-items", "flex-start");
+
+  drawer.svg = wrapper.append("svg")
       .attr("width", WeightsDrawer.width + WeightsDrawer.margin.left + WeightsDrawer.margin.right)
       .attr("height", WeightsDrawer.height + WeightsDrawer.margin.top + WeightsDrawer.margin.bottom)
     .append("g")
@@ -188,26 +192,32 @@ WeightsDrawer.prototype.draw_weights_graph = function(raw_data) {
       .attr("class", "y axis")
       .call(WeightsDrawer.yAxis);
 
-  var legend = drawer.svg.selectAll(".legend")
-      .data(WeightsDrawer.color.domain().slice().reverse())
-    .enter().append("g")
-      .attr("class", "legend")
-      .attr("transform", function(d, i) { return "translate(0," + ((i * 20) - WeightsDrawer.margin.top) + ")"; });
-
-  legend.append("rect")
-      .attr("x", WeightsDrawer.width - 18)
-      .attr("width", 18)
-      .attr("height", 18)
-      .style("fill", WeightsDrawer.color);
-
-  legend.append("text")
-      .attr("x", WeightsDrawer.width - 24)
-      .attr("y", 9)
-      .attr("dy", ".35em")
-      .style("text-anchor", "end")
-      .text(function(d) {
-        return nos_oignons_relays.filter(function(r) { return r.fingerprint == d; })[0].name;
-      });
+  var legendDiv = wrapper.append("div")
+      .style("overflow-y", "auto")
+      .style("max-height", (WeightsDrawer.height + WeightsDrawer.margin.top + WeightsDrawer.margin.bottom) + "px")
+      .style("min-width", "90px")
+      .style("padding-left", "10px")
+      .style("padding-top", WeightsDrawer.margin.top + "px")
+      .style("box-sizing", "border-box");
+
+  WeightsDrawer.color.domain().slice().reverse().forEach(function(d) {
+    var name = nos_oignons_relays.filter(function(r) { return r.fingerprint == d; })[0].name;
+    var item = legendDiv.append("div")
+        .style("display", "flex")
+        .style("align-items", "center")
+        .style("margin-bottom", "3px")
+        .style("white-space", "nowrap");
+    item.append("span")
+        .style("display", "inline-block")
+        .style("width", "14px")
+        .style("min-width", "14px")
+        .style("height", "14px")
+        .style("background-color", WeightsDrawer.color(d))
+        .style("margin-right", "5px");
+    item.append("span")
+        .style("font-size", "11px")
+        .text(name);
+  });
 };
 
 WeightsDrawer.prototype.refresh_graph = function() {