X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/33a8590296933501348374a8797c81c0e9679664..8553007b0d3d1450269984533dbdd337576a6e45:/assets/bw_graphs.js

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index 6c0f05f..80e8cd0 100644
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -38,8 +38,7 @@ BwDrawer.write_stack = d3.layout.stack()
 BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net";
 
 BwDrawer.periods = [
-    { id: "1_month", label: L10n.t_1_month },
-    { id: "3_months", label: L10n.t_3_months },
+    { id: "6_months", label: L10n.t_6_months },
     { id: "1_year", label: L10n.t_1_year },
     { id: "5_years", label: L10n.t_5_years },
   ];
@@ -63,12 +62,11 @@ 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.forEach(function(r, i) {
-    if (typeof r.read_history === 'undefined' || typeof r.write_history === 'undefined') {
-      raw_data.relays.splice(i, 1);
-    }
+  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")
@@ -78,16 +76,17 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
       .attr("transform", "translate(" + BwDrawer.margin.left + "," + BwDrawer.margin.top + ")");
 
   var form = d3.select(selector).append("form")
+      .attr("class", "graph-period")
       .attr("action", "#");
   BwDrawer.periods.forEach(function(p) {
     var div = form.append("div");
     var radio = div.append("input")
       .attr("type", "radio")
       .attr("name", "period")
-      .attr("id", "period_" + p.id)
+      .attr("id", "bw_period_" + p.id)
       .on("click", function() { update_period(p.id); });
     div.append("label")
-      .attr("for", "period_" + p.id)
+      .attr("for", "bw_period_" + p.id)
       .text(p.label);
     if (p.id == BwDrawer.periods[0].id) {
       radio.attr("checked", true);