màj composition membres du CA

[website.git] / assets / bw_graphs.js

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index dbeb1cfb155a95cac324fd66a25f171a806cc638..ee0eb377058765cd5d9925ba2f6fded1433b89e3 100644 (file)
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -35,7 +35,7 @@ BwDrawer.read_stack = d3.layout.stack()
 BwDrawer.write_stack = d3.layout.stack()
     .values(function(d) { return d.write_values; });
 
-BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net";
+BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=%20%20%20%200x9F29C15D42A8B6F3";
 
 BwDrawer.periods = [
     { id: "6_months", label: L10n.t_6_months },
@@ -62,14 +62,18 @@ BwDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color}));
 
 BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
   // Purge non running relays
-  raw_data.relays = raw_data.relays.filter(function(relay) {
-    return typeof r.read_history === 'undefined' || typeof r.write_history === 'undefined';
+  raw_data.relays = raw_data.relays.filter(function(r) {
+    return typeof r.read_history !== 'undefined' && typeof r.write_history !== 'undefined';
   });
 
 
   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() {