From: eol Date: Sun, 14 Jun 2026 18:54:49 +0000 (+0200) Subject: added div for scrollable legend for graphs bw and weight X-Git-Url: https://nos-oignons.org/gitweb/website.git/commitdiff_plain/03b6f648d0c4088f94b377f15ab8d60f93d76dd2 added div for scrollable legend for graphs bw and weight --- diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js index 827c0e0..ee0eb37 100644 --- 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 775afc2..8a30862 100644 --- 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() {