March 2017 - tor-commits - lists.torproject.org

[atlas/master] Add time interval AFTER drawing a data point (Fixes: #20802)
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit f8bccdc9d126507b7aa4f882899354b0d72673ed Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Wed Feb 1 12:09:42 2017 +0100 Add time interval AFTER drawing a data point (Fixes: #20802) --- js/models/graph.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/models/graph.js b/js/models/graph.js index ca36d48..1f356db 100644 --- a/js/models/graph.js +++ b/js/models/graph.js @@ -19,7 +19,6 @@ define([ var y = first.getTime(); _.each(history[period].values, function(value, i) { - y += history[period].interval*1000; var x = null if (value != null) { x = value*history[period].factor; @@ -32,6 +31,7 @@ define([ var mperiod = "bw_" + period.split("_")[1] var newar = model.get(mperiod)[name]; newar.push([y,x]); + y += history[period].interval*1000; }); }); return newar; @@ -47,7 +47,6 @@ define([ time[0], time[1], time[2]); var y = first.getTime(); _.each(history[period].values, function(value, i) { - y += history[period].interval*1000; var x = null if (value != null) { x = value*history[period].factor; @@ -55,6 +54,7 @@ define([ var mperiod = "weights_" + period.split("_")[1] newar = model.get(mperiod)[name]; newar.push([y,x]); + y += history[period].interval*1000; }); }); return newar; @@ -70,7 +70,6 @@ define([ time[0], time[1], time[2]); var y = first.getTime(); _.each(history[period].values, function(value, i) { - y += history[period].interval*1000; var x = null if (value != null) { x = value*history[period].factor; @@ -78,6 +77,7 @@ define([ var mperiod = "clients_" + period.split("_")[1] newar = model.get(mperiod)[name]; newar.push([y,x]); + y += history[period].interval*1000; }); }); return newar;

1 0

[atlas/master] Remove the newline from the data URIs
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit 0d0264e3c054f73c8012e57428cb5c30aba6d11e Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Feb 10 09:43:55 2017 +0000 Remove the newline from the data URIs According to the W3C validator service line breaks are illegal characters in data URIs. Removing them does not change functionality. Closes #21429. --- js/views/details/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/views/details/main.js b/js/views/details/main.js index 24c0064..9006c94 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -171,7 +171,7 @@ define([ .node() .innerHTML; d3.select("#save_" + g) - .attr("href", "data:image/svg+xml;base64,\n" + btoa(html)); + .attr("href", "data:image/svg+xml;base64," + btoa(html)); }, render: function() { var data = {relay: this.model};

1 0

[atlas/master] Corrected right border running through the graphs on small screens (Fixes: #21434)
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit f2df3b739c10f4e9bb6e369ad9cd2656dcdfcf6a Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Wed Mar 1 17:37:29 2017 +0100 Corrected right border running through the graphs on small screens (Fixes: #21434) --- templates/details/bridge.html | 18 +++++++++--------- templates/details/router.html | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/templates/details/bridge.html b/templates/details/bridge.html index f393ab6..f905247 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -88,7 +88,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_month" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -103,7 +103,7 @@ </div><div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_months" class="graph"> @@ -120,7 +120,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_year" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -135,7 +135,7 @@ </ul> </div><div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_years" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -150,7 +150,7 @@ </ul> </div><div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="clients_week" class="graph"> @@ -167,7 +167,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="clients_month" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -182,7 +182,7 @@ </div><div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="clients_months" class="graph"> @@ -199,7 +199,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="clients_year" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -214,7 +214,7 @@ </ul> </div><div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="clients_years" class="graph"> <img src="img/no-data-available.png" alt=""> diff --git a/templates/details/router.html b/templates/details/router.html index 2ded09a..73bf5a8 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -143,7 +143,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_month" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -158,7 +158,7 @@ </div><div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_months" class="graph"> @@ -175,7 +175,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_year" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -190,7 +190,7 @@ </ul> </div><div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="bw_years" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -207,7 +207,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="weights_week" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -224,7 +224,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="weights_month" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -241,7 +241,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="weights_months" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -258,7 +258,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="weights_year" class="graph"> <img src="img/no-data-available.png" alt=""> @@ -275,7 +275,7 @@ <div class="row"> <ul class="thumbnails"> - <li class="span8"> + <li> <div class="thumbnail"> <div id="weights_years" class="graph"> <img src="img/no-data-available.png" alt="">

1 0

[atlas/master] Merge branch 'task/21364'
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit a5585095ba81548300447bed1b2d6f9c3545aedc Merge: 7ce8006 f81916a Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 1 17:11:49 2017 +0000 Merge branch 'task/21364' templates/details/bridge.html | 2 +- templates/details/router.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --cc templates/details/bridge.html index abfb497,c436522..f393ab6 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@@ -44,7 -44,7 +44,7 @@@ <dt><span class="tip" title="Flags that the directory authorities assigned to this bridge." data-original-title="Bridge flags">Flags</span></dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <span class="tip flags" title="<%= flag[0] %><br /><%= flag[2] %>"> - <span class="flags" title="<%= flag[2] %>"> ++ <span class="tip flags" title="<%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span> diff --cc templates/details/router.html index 0b20237,208f31a..2ded09a --- a/templates/details/router.html +++ b/templates/details/router.html @@@ -76,7 -76,7 +76,7 @@@ <dt><span class="tip" title="Flags that the directory authorities assigned to this relay." data-original-title="Relay flags">Flags</span></dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <span class="tip flags" title="<%= flag[0] %><br /><%= flag[2] %>"> - <span class="flags" title="<%= flag[2] %>"> ++ <span class="tip flags" title="<%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span>

1 0

[atlas/master] Do not show flag labels in tooltips on relay pages
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit f81916a9816461d76a547b0c572b0cceb10c90c9 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Feb 1 12:23:00 2017 +0000 Do not show flag labels in tooltips on relay pages The same labels are already next the flag icons. Closes #21364. --- templates/details/bridge.html | 2 +- templates/details/router.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details/bridge.html b/templates/details/bridge.html index d06cd21..c436522 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -44,7 +44,7 @@ <dt><span class="tip" title="Flags that the directory authorities assigned to this bridge." data-original-title="Bridge flags">Flags</span></dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <span class="flags" title="<%= flag[0] %><br /><%= flag[2] %>"> + <span class="flags" title="<%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span> diff --git a/templates/details/router.html b/templates/details/router.html index d3f80ed..208f31a 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -76,7 +76,7 @@ <dt><span class="tip" title="Flags that the directory authorities assigned to this relay." data-original-title="Relay flags">Flags</span></dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <span class="flags" title="<%= flag[0] %><br /><%= flag[2] %>"> + <span class="flags" title="<%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span>

1 0

[atlas/master] Show a warning message if Onionoo serves outdated data
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit daf6bea6453901e47f3d9d98241ceb79af165f22 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Wed Feb 1 14:04:34 2017 +0100 Show a warning message if Onionoo serves outdated data --- css/style.css | 5 +++++ js/collections/results.js | 1 + js/helpers.js | 10 ++++++++++ js/models/graph.js | 9 ++++++--- js/models/relay.js | 3 ++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/css/style.css b/css/style.css index 3c67c24..c458f86 100644 --- a/css/style.css +++ b/css/style.css @@ -66,3 +66,8 @@ span.flags img { .tooltip * { text-align:left; } + +#outdatedData > div { + position:relative; + top:60px; +} diff --git a/js/collections/results.js b/js/collections/results.js index 4473e1a..13cf7ac 100644 --- a/js/collections/results.js +++ b/js/collections/results.js @@ -15,6 +15,7 @@ define([ var err = 0; var collection = this; options.success = $.getJSON(this.url, function(response) { + checkIfDataIsUpToDate(options.success.getResponseHeader("Last-Modified")); this.fresh_until = response.fresh_until; this.valid_after = response.valid_after; var relays = []; diff --git a/js/helpers.js b/js/helpers.js index 48e1102..8838db8 100644 --- a/js/helpers.js +++ b/js/helpers.js @@ -262,3 +262,13 @@ function hrBandwidth(bw) { } return bw; } + +function checkIfDataIsUpToDate(lastModifiedHeader) { + // check if onionoo document is up to date: + var lastModified = new Date(Date.parse(lastModifiedHeader)); + var currentTime = new Date(); + var hoursSinceLastUpdate = (currentTime.getTime() - lastModified.getTime()) / (1000 * 60 * 60); + if (hoursSinceLastUpdate > 24 && $("#outdatedData").length==0) { + $('<div class="container" id="outdatedData"><div class="alert"><strong>Outdated data!</strong><p>Onionoo seems to serve outdated data :( Last update was: '+lastModified+'</p></div></div>').insertAfter("body > .navbar"); + } +} diff --git a/js/models/graph.js b/js/models/graph.js index d4368a4..ca36d48 100644 --- a/js/models/graph.js +++ b/js/models/graph.js @@ -114,7 +114,8 @@ define([ bw_years: {write: [], read: []} }); - $.getJSON(this.baseurl+'/bandwidth?lookup='+fingerprint, function(data) { + var xhr = $.getJSON(this.baseurl+'/bandwidth?lookup='+fingerprint, function(data) { + checkIfDataIsUpToDate(xhr.getResponseHeader("Last-Modified")); model.data = data; success(model, data); }); @@ -143,7 +144,8 @@ define([ weights_years: {cw: [], guard: [], middle: [], exit: []} }); - $.getJSON(this.baseurl+'/weights?lookup='+fingerprint, function(data) { + var xhr = $.getJSON(this.baseurl+'/weights?lookup='+fingerprint, function(data) { + checkIfDataIsUpToDate(xhr.getResponseHeader("Last-Modified")); model.data = data; success(model, data); }); @@ -187,7 +189,8 @@ define([ clients_years: {average: []} }); - $.getJSON(this.baseurl+'/clients?lookup='+fingerprint, function(data) { + var xhr = $.getJSON(this.baseurl+'/clients?lookup='+fingerprint, function(data) { + checkIfDataIsUpToDate(xhr.getResponseHeader("Last-Modified")); model.data = data; success(model, data); }); diff --git a/js/models/relay.js b/js/models/relay.js index e374ae4..c0c1a84 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -136,7 +136,8 @@ define([ var error = options.error; var model = this; console.log("doing query.."); - $.getJSON(this.baseurl+'/details?lookup='+this.fingerprint, function(data) { + var xhr = $.getJSON(this.baseurl+'/details?lookup='+this.fingerprint, function(data) { + checkIfDataIsUpToDate(xhr.getResponseHeader("Last-Modified")); var relay = null; if (data.relays.length >= 1) { relay = data.relays[0];

1 0

[atlas/master] Merge branch 'task/20374'
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit 7ce8006b000f260cb7078e9429190814408a1634 Merge: b656957 daf6bea Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 1 17:05:41 2017 +0000 Merge branch 'task/20374' css/style.css | 5 +++++ js/collections/results.js | 1 + js/helpers.js | 10 ++++++++++ js/models/graph.js | 9 ++++++--- js/models/relay.js | 3 ++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --cc css/style.css index 397f20e,c458f86..efc5cd5 --- a/css/style.css +++ b/css/style.css @@@ -63,6 -63,11 +63,11 @@@ span.flags img top:2px; } -.tooltip * { +.tooltip-inner { text-align:left; } + + #outdatedData > div { + position:relative; + top:60px; + }

1 0

[atlas/master] Simplify the code enabling the tooltips
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit 68b35f406a887c2783519b7ccc012c2233961699 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Feb 7 18:01:22 2017 +0000 Simplify the code enabling the tooltips The simplification enables tooltips only on elements within the "tip" class and sample points in the graphs. --- js/views/about/main.js | 10 ---------- js/views/details/main.js | 10 ---------- js/views/search/do.js | 4 +--- templates/details/router.html | 2 +- templates/search/do.html | 6 +++--- 5 files changed, 5 insertions(+), 27 deletions(-) diff --git a/js/views/about/main.js b/js/views/about/main.js index 2aae5da..4d6aad1 100644 --- a/js/views/about/main.js +++ b/js/views/about/main.js @@ -18,16 +18,6 @@ define([ var compiledTemplate = _.template(aboutTemplate, data); this.el.html(compiledTemplate); //$("#loading").hide(); - //$(".flag .tooltip").hide(); - //$(".tip").tooltip(); - $(".flag").hover(function(){ - $(this).children(".tooltip").show(); - - }, function(e){ - - $(this).children(".tooltip").hide(); - - }); } }); return new aboutView; diff --git a/js/views/details/main.js b/js/views/details/main.js index 4becdf9..ce4f87b 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -240,17 +240,7 @@ define([ } $("#loading").hide(); - $(".flags").tooltip(); - $(".flag .tooltip").hide(); $(".tip").tooltip(); - $(".flag").hover(function(){ - $(this).children(".tooltip").show(); - - }, function(e){ - - $(this).children(".tooltip").hide(); - - }); }, error: function() { var compiledTemplate = _.template(errorDetailsTemplate, {relay: null}); diff --git a/js/views/search/do.js b/js/views/search/do.js index 4226dd8..1899e85 100644 --- a/js/views/search/do.js +++ b/js/views/search/do.js @@ -160,9 +160,7 @@ define([ "aaSorting": [], "fnDrawCallback": function( oSettings ) { // Make the tooltips - $(".flags").tooltip(); - $(".country").tooltip(); - $(".uptime").tooltip(); + $(".tip").tooltip(); } }); // Type ahead for country codes diff --git a/templates/details/router.html b/templates/details/router.html index d3f80ed..0b20237 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -76,7 +76,7 @@ <dt><span class="tip" title="Flags that the directory authorities assigned to this relay." data-original-title="Relay flags">Flags</span></dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <span class="flags" title="<%= flag[0] %><br /><%= flag[2] %>"> + <span class="tip flags" title="<%= flag[0] %><br /><%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span> diff --git a/templates/search/do.html b/templates/search/do.html index c534f7a..cd07a61 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -81,19 +81,19 @@ </td> <td><span data-filter="<%= relay.get('bandwidth') %>"><%= relay.get('bandwidth_hr') %></td> <td> - <span data-hidden="<%= relay.get('last_restarted') %>" title="<%= relay.get('uptime_hrfull') %>" data-filter="<%= relay.get('uptime') %>" class="uptime"> + <span data-hidden="<%= relay.get('last_restarted') %>" title="<%= relay.get('uptime_hrfull') %>" data-filter="<%= relay.get('uptime') %>" class="tip uptime"> <% if (relay.get('running') === false) { %><s><% } %><%= relay.get('uptime_hr') %><% if (relay.get('running') === false) { %></s><% } %> </span> </td> <td> <% if ( relay.get('country')) { %> - <img class="inline country" title="<%= relay.get('countryname') %>" alt="<%= relay.get('countryname') %>" src="img/cc/<%= relay.get('country') %>.png"/> + <img class="tip inline country" title="<%= relay.get('countryname') %>" alt="<%= relay.get('countryname') %>" src="img/cc/<%= relay.get('country') %>.png"/> <% } %> </td> <td><%= relay.get('or_address') %></td> <td> <% _.each(relay.get('flags'), function(flag) { %> - <img class="inline flags" rel="tooltip" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %><br /><%= flag[2] %>"/> + <img class="tip inline flags" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %><br /><%= flag[2] %>"/> <% }); %> </td> <td><%= relay.get('or_port') %></td>

1 0

[atlas/master] Use a specific selector for styling the tooltips
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit 9f6b4ab99656bfe09edd69aa5af91c1fe6e4d36f Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Feb 7 17:40:40 2017 +0000 Use a specific selector for styling the tooltips --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index 3c67c24..397f20e 100644 --- a/css/style.css +++ b/css/style.css @@ -63,6 +63,6 @@ span.flags img { top:2px; } -.tooltip * { +.tooltip-inner { text-align:left; }

1 0

[atlas/master] Place tooltips on the right of the elements
by irl＠torproject.org 02 Mar '17

02 Mar '17

commit b6569579d2a504a65850260384dc2d9bf1f4d680 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Feb 7 18:05:16 2017 +0000 Place tooltips on the right of the elements The tooltips for the left column on the details page were cut off with certain window dimensions. Placing the tooltips on the right of the elements is the easiest way to solve this issue. Closes #21398. --- js/views/details/main.js | 2 +- templates/details/bridge.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/views/details/main.js b/js/views/details/main.js index ce4f87b..24c0064 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -240,7 +240,7 @@ define([ } $("#loading").hide(); - $(".tip").tooltip(); + $(".tip").tooltip({ placement: 'right' }); }, error: function() { var compiledTemplate = _.template(errorDetailsTemplate, {relay: null}); diff --git a/templates/details/bridge.html b/templates/details/bridge.html index d06cd21..abfb497 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -44,7 +44,7 @@ <dt><span class="tip" title="Flags that the directory authorities assigned to this bridge." data-original-title="Bridge flags">Flags</span></dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <span class="flags" title="<%= flag[0] %><br /><%= flag[2] %>"> + <span class="tip flags" title="<%= flag[0] %><br /><%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <span class="inline"><%= flag[0] %></span> </span>

1 0