tor-commits December 2017

tor-commits@lists.torproject.org

14 participants
2422 discussions

[atlas/master] Adds map options panel
by irl＠torproject.org 02 Dec '17

02 Dec '17

commit 966321690a124e50e55ae83bab27e53b78529a94 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sat Dec 2 18:12:03 2017 +0000 Adds map options panel --- css/atlas.css | 8 ++++++- js/router.js | 1 - js/views/aggregate/map.js | 53 +++++++++++++++++++++++++++----------------- templates/aggregate/map.html | 13 ++++++++++- 4 files changed, 52 insertions(+), 23 deletions(-) diff --git a/css/atlas.css b/css/atlas.css index 3fd9cdb..89a1def 100644 … [View More]--- a/css/atlas.css +++ b/css/atlas.css @@ -52,7 +52,7 @@ span.flags { background: #ff1515; } -#home-search, #home-aggregate-search, #home-advanced-search { +#home-search, #home-aggregate-search, #home-advanced-search, #map-radio-buttons { padding: 0; margin: 0 0 10px 0; width: 100%; @@ -92,3 +92,9 @@ td a { width: 120px; display: inline; } + +label.radio-inline { + display: inline !important; + width: auto; +} + diff --git a/js/router.js b/js/router.js index 8a73620..6428622 100644 --- a/js/router.js +++ b/js/router.js @@ -124,7 +124,6 @@ define([ $(".progress").show(); aggregateMapView.collection.aType = "cc"; - aggregateMapView.aggregateType = "consensus_weight_fraction"; if (query) { query = query.trim(); diff --git a/js/views/aggregate/map.js b/js/views/aggregate/map.js index d8d7ec0..f585e33 100644 --- a/js/views/aggregate/map.js +++ b/js/views/aggregate/map.js @@ -17,17 +17,8 @@ define([ initialize: function() { this.collection = new aggregatesCollection; }, - render: function(query){ - document.title = "Relay Search"; - var compiledTemplate = _.template(aggregateMapTemplate) - this.$el.html(compiledTemplate({query: query, - aggregates: this.collection.models, - countries: CountryCodes, - error: this.error, - relaysPublished: this.relaysPublished, - bridgesPublished: this.bridgesPublished})); - - var aggregate_type = this.aggregateType; + plot: function() { + var aggregate_property = $('input[name="aggregate-property"]:checked').val(); var aggregates = this.collection.models; var m_width = $("#container").width(); @@ -41,11 +32,11 @@ define([ var path = d3.geo.path() .projection(projection); + $("#aggregate-map").html(""); + var svg = d3.select("#aggregate-map").append("svg") .attr("preserveAspectRatio", "xMidYMid") .attr("viewBox", "0 0 " + width + " " + height) - .attr("width", m_width) - .attr("height", m_width * height / width); svg.append("rect") .attr("class", "background") @@ -58,13 +49,13 @@ define([ var maximum_value = 0; _.each(aggregates, function(aggregate) { - if (aggregate[aggregate_type] > maximum_value) maximum_value = aggregate[aggregate_type]; + if (aggregate[aggregate_property] > maximum_value) maximum_value = aggregate[aggregate_property]; }); - var getCountryAggregate = function(code, aggregate_type) { + var getCountryAggregate = function(code, aggregate_property) { var found = 0; _.each(aggregates, function(aggregate) { - if (aggregate.country.toUpperCase() == code) found = aggregate[aggregate_type]; + if (aggregate.country.toUpperCase() == code) found = aggregate[aggregate_property]; }); return (found == 0) ? found : Math.sqrt(found/maximum_value); @@ -94,7 +85,7 @@ define([ .enter() .append("path") .attr("id", function(d) { return d.id; }) - .style("fill-opacity", function(d) { return getCountryAggregate(d.id, aggregate_type); }) + .style("fill-opacity", function(d) { return getCountryAggregate(d.id, aggregate_property); }) .attr("d", path) .append("svg:title") .text( function(d) { return d.id; }); @@ -125,13 +116,35 @@ define([ .text("" + (Math.pow(i,2)* maximum_value*100).toFixed(3) + "%"); } + }); + }, + save: function() { /* Encode SVG image for download link. */ html = d3.select("#aggregate-map") .node() .innerHTML; - d3.select("#save_svg") - .attr("href", "data:image/svg+xml;base64," + btoa(html)); - }); + window.open("data:image/svg+xml;base64," + btoa(html), "SaveSVG"); + }, + render: function(query){ + document.title = "Relay Search"; + var compiledTemplate = _.template(aggregateMapTemplate) + this.$el.html(compiledTemplate({query: query, + aggregates: this.collection.models, + countries: CountryCodes, + error: this.error, + relaysPublished: this.relaysPublished, + bridgesPublished: this.bridgesPublished})); + + this.plot(); + + var thisView = this; + + $('input[name="aggregate-property"]').bind('change', function(){ + thisView.plot(); + }); + $('#save_svg').bind('click', function(){ + thisView.save(); + }); }, renderError: function(){ var compiledTemplate = _.template(aggregateSearchTemplate); diff --git a/templates/aggregate/map.html b/templates/aggregate/map.html index 19efd66..1beac01 100644 --- a/templates/aggregate/map.html +++ b/templates/aggregate/map.html @@ -36,5 +36,16 @@ <% } %> <% } else { %> <div id="aggregate-map"></div> - <a id="save_svg">Save Graph</a> + <div class="panel panel-default"> + <div class="panel-body"> + <form id="map-radio-buttons"> + <label class="radio-inline"><input type="radio" name="aggregate-property" value="consensus_weight_fraction" checked="checked"> Consensus Weight</label> + <label class="radio-inline"><input type="radio" name="aggregate-property" value="guard_probability"> Guard Probability</label> + <label class="radio-inline"><input type="radio" name="aggregate-property" value="middle_probability"> Middle Probability</label> + <label class="radio-inline"><input type="radio" name="aggregate-property" value="exit_probability"> Exit Probability</label> + </form> + <a class="btn btn-primary" href="#aggregate/cc<%= (query) ? "/" + query : "" %>">View Table</a> + <a class="btn btn-secondary" id="save_svg">Save Map</a> + </div> + </div> <% } %> [View Less]

1 0

[atlas/master] Adds links to map view
by irl＠torproject.org 02 Dec '17

02 Dec '17

commit 150f7d885695bd52b4ce20b200c37bcde41c446f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sat Dec 2 18:39:25 2017 +0000 Adds links to map view --- templates/aggregate/search.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/aggregate/search.html b/templates/aggregate/search.html index d76ed16..6505529 100644 --- a/templates/aggregate/search.html +++ b/templates/aggregate/search.html @@ -108,6 +108,11 @@ <% }); %> </tbody> </table> +… [View More]

1 0

[tor-browser-build/master] Preparing build2 for 7.5a9
by gk＠torproject.org 02 Dec '17

02 Dec '17

commit a718f53f4667e679cabf5d9bc42a0f6a75c3127d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:24:41 2017 +0000 Preparing build2 for 7.5a9 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++---- projects/tor/config | 2 +- rbm.conf | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/firefox/… [View More]

1 0

[tor-browser-build/master] Getting 7.5a9 built earlier using the 52.5.1esr lang packs
by gk＠torproject.org 02 Dec '17

02 Dec '17

commit 1ea5f33989925e3cc0217b45623f7044461a7972 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:23:30 2017 +0000 Getting 7.5a9 built earlier using the 52.5.1esr lang packs --- projects/firefox-langpacks/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..c5384e3 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -3,7 +3,7 @… [View More]

1 0

[atlas/master] Completes advanced search form (Fixes: #23782, #24461)
by irl＠torproject.org 02 Dec '17

02 Dec '17

commit c71dd3714edd33f82e7bfc5e747fadfabe0fd5b6 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sat Dec 2 16:37:44 2017 +0000 Completes advanced search form (Fixes: #23782, #24461) --- css/atlas.css | 5 +++++ js/views/search/main.js | 13 +++++++++++++ templates/search/main.html | 22 ++++++++++++++++++++-- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/css/atlas.css b/css/atlas.css index ac1c410..3fd9cdb 100644 --- a/css/atlas.css +++ b/css/… [View More]atlas.css @@ -87,3 +87,8 @@ dd { td a { padding-right: 0 !important; } + +.day-spinner { + width: 120px; + display: inline; +} diff --git a/js/views/search/main.js b/js/views/search/main.js index 92ae96f..5ad2a1d 100644 --- a/js/views/search/main.js +++ b/js/views/search/main.js @@ -60,27 +60,40 @@ define([ if($('#advanced-search-hostname').val().trim() != "") query += "host_name:" + $('#advanced-search-hostname').val().trim().split(" ")[0] + " "; if($('#advanced-search-type').val() !== "") query += "type:" + $('#advanced-search-type').val() + " "; if($('#advanced-search-running').val() !== "") query += "running:" + $('#advanced-search-running').val() + " "; + if($('#advanced-search-first-seen-from').val() !== "0" || $('#advanced-search-first-seen-to').val() !== "0") query += "first_seen_days:" + $('#advanced-search-first-seen-from').val() + "-" + $('#advanced-search-first-seen-to').val() + " "; + if($('#advanced-search-last-seen-from').val() !== "0" || $('#advanced-search-last-seen-to').val() !== "0") query += "last_seen_days:" + $('#advanced-search-last-seen-from').val() + "-" + $('#advanced-search-last-seen-to').val() + " "; + if($('#advanced-search-version').val().trim() != "") query += "version:" + $('#advanced-search-version').val().trim().split(" ")[0] + " "; return query; } $("#do-advanced").bind('click', function(){ var query = buildAdvancedQuery(); document.location = "#search/"+encodeURI(query); + return false; }); $("#do-advanced-aggregation").bind('click', function(){ var query = buildAdvancedQuery(); document.location = "#aggregate/all/"+encodeURI(query); + return false; }); $("#do-advanced-aggregation-cc").bind('click', function(){ var query = buildAdvancedQuery(); document.location = "#aggregate/cc/"+encodeURI(query); + return false; }); $("#do-advanced-aggregation-as").bind('click', function(){ var query = buildAdvancedQuery(); document.location = "#aggregate/as/"+encodeURI(query); + return false; + }); + + $("#home-advanced-search").bind('submit', function(){ + var query = buildAdvancedQuery(); + document.location = "#search/"+encodeURI(query); + return false; }); $(".tip").tooltip(); diff --git a/templates/search/main.html b/templates/search/main.html index 6dc522b..9af49ae 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -44,6 +44,8 @@ probabilities of using relays in a particular country or AS as a guard, middle or exit relay filtered by the search parameters.</p> <div class="panel panel-default"><div class="panel-body"> <form id="home-advanced-search"> + <div class="row"> + <div class="col-md-6"> <div class="form-group"> <label for="advanced-search-nickname">Nickname:</label> <input type="text" class="form-control search-query" autocorrect="off" autocapitalize="off" id="advanced-search-nickname"> @@ -89,11 +91,25 @@ or exit relay filtered by the search parameters.</p> <input type="text" id="advanced-search-as" class="search-query form-control"> </div> </div> + </div> + <div class="col-md-6"> <div class="form-group"> - <label for="advanced-search-nickname">Hostname:</label> + <label for="advanced-search-hostname">Hostname:</label> <input type="text" class="form-control search-query" autocorrect="off" autocapitalize="off" id="advanced-search-hostname"> </div> <div class="form-group"> + <label>First Seen:</label><br> + From <input type="number" id="advanced-search-first-seen-from" class="form-control day-spinner" value="0"> to <input type="number" id="advanced-search-first-seen-to" class="form-control day-spinner" value="0"> days ago + </div> + <div class="form-group"> + <label>Last Seen:</label><br> + From <input type="number" id="advanced-search-last-seen-from" class="form-control day-spinner" value="0"> to <input type="number" id="advanced-search-last-seen-to" class="form-control day-spinner" value="0"> days ago + </div> + <div class="form-group"> + <label for="advanced-search-version">Version:</label> + <input type="text" class="form-control search-query" autocorrect="off" autocapitalize="off" id="advanced-search-version"> + </div> + <div class="form-group"> <label for="advanced-search-flag">Type<sup>&dagger;</sup>:</label> <select class="form-control" id="advanced-search-type"> <option value="">Any</option> @@ -109,7 +125,9 @@ or exit relay filtered by the search parameters.</p> <option value="false">Only Offline Relays</option> </select> </div> - <p><button id="do-advanced" class="btn btn-primary" type="button">Advanced Search</button></p> + </div> + </div> + <p><button id="do-advanced" class="btn btn-primary" type="submit">Advanced Search</button></p> <p> <button id="do-advanced-aggregation" class="btn btn-primary" type="button">Advanced Aggregation</button> <button id="do-advanced-aggregation-cc" class="btn btn-secondary tip" type="button" title="Aggregate by Country">by CC</button> [View Less]

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 02 Dec '17

02 Dec '17

commit 7434c071657a03b70bfaa25addb42afc2e474f6b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 2 10:19:13 2017 +0000 Update translations for tails-onioncircuits_completed --- id/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/onioncircuits.pot b/id/onioncircuits.pot index 516c2456b..b9441b574 100644 --- a/id/onioncircuits.pot +++ b/id/onioncircuits.pot @@ -6,13 +6,13 @@ # Nur Ad-Duja <nurudduja(a)gmail.… [View More]

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 02 Dec '17

02 Dec '17

commit cf64cc18685f7f2ea393f1b7fba2f51f05aae66b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 2 10:19:07 2017 +0000 Update translations for tails-onioncircuits --- id/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/onioncircuits.pot b/id/onioncircuits.pot index 516c2456b..b9441b574 100644 --- a/id/onioncircuits.pot +++ b/id/onioncircuits.pot @@ -6,13 +6,13 @@ # Nur Ad-Duja <nurudduja(a)gmail.com>, … [View More]

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 02 Dec '17

02 Dec '17

commit d357a275346b57f3c69c7e5981b9a3f9c1ed1ac0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 2 10:18:53 2017 +0000 Update translations for tails-openpgp-applet_completed --- id/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/openpgp-applet.pot b/id/openpgp-applet.pot index b561e2254..98c16f56e 100644 --- a/id/openpgp-applet.pot +++ b/id/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The … [View More]

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 02 Dec '17

02 Dec '17

commit a16c6c24d880ca5940b31366df04abfebadfa2a7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 2 10:18:48 2017 +0000 Update translations for tails-openpgp-applet --- id/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/openpgp-applet.pot b/id/openpgp-applet.pot index b561e2254..98c16f56e 100644 --- a/id/openpgp-applet.pot +++ b/id/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\… [View More]

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 02 Dec '17

02 Dec '17

commit 7ce672083937e00f2beff80bd8bd467d54bb013b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 2 10:16:35 2017 +0000 Update translations for mat-gui_completed --- id.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id.po b/id.po index de78f7cb1..b215387c0 100644 --- a/id.po +++ b/id.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2017