resolution conflit

[website.git] / assets / weights_graphs.js

diff --git a/assets/weights_graphs.js b/assets/weights_graphs.js
index 915a8b80607729dd32441f8cbe873418834a4415..1b949c59da95d2db9e2c83d429419c5e6fb17ff2 100644 (file)
--- a/assets/weights_graphs.js
+++ b/assets/weights_graphs.js
@@ -41,7 +41,7 @@ WeightsDrawer.onionoo_url = "https://onionoo.torproject.org/weights?type=relay&c
 
 WeightsDrawer.periods = [
     { id: "1_month", label: L10n.t_1_month },
 
 WeightsDrawer.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 },
   ];
     { id: "1_year", label: L10n.t_1_year },
     { id: "5_years", label: L10n.t_5_years },
   ];


@@ -83,6 +83,7 @@ WeightsDrawer.prototype.draw_weights_graph = function(raw_data) {
   });
 
   var form_source = d3.select(drawer.selector).append("form")
   });
 
   var form_source = d3.select(drawer.selector).append("form")

+      .attr("id", "weight-sources")

       .attr("action", "#");
   WeightsDrawer.sources.forEach(function(s) {
     var div = form_source.append("div");
       .attr("action", "#");
   WeightsDrawer.sources.forEach(function(s) {
     var div = form_source.append("div");


@@ -106,16 +107,17 @@ WeightsDrawer.prototype.draw_weights_graph = function(raw_data) {
       .attr("transform", "translate(" + WeightsDrawer.margin.left + "," + WeightsDrawer.margin.top + ")");
 
   var form_period = d3.select(drawer.selector).append("form")
       .attr("transform", "translate(" + WeightsDrawer.margin.left + "," + WeightsDrawer.margin.top + ")");
 
   var form_period = d3.select(drawer.selector).append("form")

+      .attr("class", "graph-period")

       .attr("action", "#");
   WeightsDrawer.periods.forEach(function(p) {
     var div = form_period.append("div");
     var radio = div.append("input")
       .attr("type", "radio")
       .attr("name", "period")
       .attr("action", "#");
   WeightsDrawer.periods.forEach(function(p) {
     var div = form_period.append("div");
     var radio = div.append("input")
       .attr("type", "radio")
       .attr("name", "period")

-      .attr("id", "period_" + p.id)
+      .attr("id", "weights_period_" + p.id)

       .on("click", function() { drawer.update_period(p.id); });
     div.append("label")
       .on("click", function() { drawer.update_period(p.id); });
     div.append("label")

-      .attr("for", "period_" + p.id)
+      .attr("for", "weights_period_" + p.id)

       .text(p.label);
     if (p.id == WeightsDrawer.periods[0].id) {
       radio.attr("checked", true);
       .text(p.label);
     if (p.id == WeightsDrawer.periods[0].id) {
       radio.attr("checked", true);