commit b9e2f370437e697b2c592dc6544edb59a2514912 Author: Iain R. Learmonth irl@fsfe.org Date: Tue Nov 14 12:06:06 2017 +0000
Finish off renaming to Relay Search --- Readme.rst | 9 +++--- js/views/about/main.js | 23 -------------- js/views/details/main.js | 2 +- js/views/search/do.js | 2 +- js/views/search/main.js | 2 +- templates/about.html | 76 ---------------------------------------------- templates/search/do.html | 8 ++--- templates/search/main.html | 2 +- 8 files changed, 13 insertions(+), 111 deletions(-)
diff --git a/Readme.rst b/Readme.rst index 5328acf..e72e0ca 100644 --- a/Readme.rst +++ b/Readme.rst @@ -1,8 +1,9 @@ -Atlas -===== +Relay Search +============
-Atlas is a web application to discover Tor relays. It provides useful -information on how relays are configured along with diagrams about their past. +Relay Search, formerly known as Atlas, is a web application to discover Tor +relays. It provides useful information on how relays are configured along with +diagrams about their past.
Running it diff --git a/js/views/about/main.js b/js/views/about/main.js deleted file mode 100644 index 522c45d..0000000 --- a/js/views/about/main.js +++ /dev/null @@ -1,23 +0,0 @@ -// This is the boilerplate file -// it should be used as a base for every module -define([ - 'jquery', - 'underscore', - 'backbone', - 'text!templates/about.html', - 'tooltip' -], function($, _, Backbone, aboutTemplate){ - var aboutView = Backbone.View.extend({ - el: $("#content"), - initialize: function() { - }, - render: function() { - document.title = "Atlas"; - var data = {}; - var compiledTemplate = _.template(aboutTemplate, data); - this.el.html(compiledTemplate); - } - }); - return new aboutView; -}); - diff --git a/js/views/details/main.js b/js/views/details/main.js index 3f8a8b6..b56f7a7 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -178,7 +178,7 @@ define([ compiledTemplate = _.template(bridgeDetailsTemplate, data); else compiledTemplate = _.template(routerDetailsTemplate, data); - document.title = "Atlas: " + this.model.get('nickname'); + document.title = "Relay Search: " + this.model.get('nickname'); this.el.html(compiledTemplate); var graph = this.graph; var plot = this.plot; diff --git a/js/views/search/do.js b/js/views/search/do.js index 76b17dd..258d345 100644 --- a/js/views/search/do.js +++ b/js/views/search/do.js @@ -112,7 +112,7 @@ define([
}, render: function(query){ - document.title = "Atlas"; + document.title = "Relay Search"; this.filtering(); var asInitVals = new Array(); var compiledTemplate = _.template(doSearchTemplate, {query: query, relays: this.relays, countries: CountryCodes, error: this.error}); diff --git a/js/views/search/main.js b/js/views/search/main.js index d56e6fa..bfb069b 100644 --- a/js/views/search/main.js +++ b/js/views/search/main.js @@ -9,7 +9,7 @@ define([ el: $("#content"),
render: function(query){ - document.title = "Atlas"; + document.title = "Relay Search"; var data = {}; var compiledTemplate = _.template(mainSearchTemplate, data); this.el.html(compiledTemplate); diff --git a/templates/about.html b/templates/about.html deleted file mode 100644 index 847597b..0000000 --- a/templates/about.html +++ /dev/null @@ -1,76 +0,0 @@ -<p class="lead"> -Atlas is a web application to discover Tor relays. It provides useful information on how relays are configured along with graphics about their past. -</p> - -<h2>Features</h1> -<div class="row"> -<div class="col-md-4"> -<h3>Search and Filter</h2> -<p> -You can search for Tor relays and bridges by using keywords. In particular, -Atlas enables you to search for (partial) nicknames (e.g., -“moria”), IP addresses (e.g., “128.31.”), and -fingerprints (e.g., “9695DFC3”). It is also possible to combine -searches, e.g., “moria 128.31.”. Finally, you can use qualifiers -to search for relays in specific countries (e.g., “moria -country:us”), with specific contact information (e.g., -“contact:arma”), or with specific flags (e.g., -“flag:Authority”). -</p> -</div> - -<div class="col-md-4"> -<h3>Discover</h2> -<p> -You are able to get a detailed view of how the relay is configured. What its exit policy is and all the data that you would normally find in the descriptor. -</p> -<h3>Bridges</h2> -If you are searching for a bridge, you will need to search by the hashed -fingerprint. This prevents leaking the fingerprint of the bridge when -searching. You can find this in the <code>hashed-fingerprint</code> file in the -Tor data directory. On Debian systems, this is in <code>/var/lib/tor</code> -but may be in another location on your system. The location is specified as -<code>DataDirectory</code> in your <code>torrc</code>. -</div> - -<div class="col-md-4"> -<h3>Graphs</h2> -<p> -The historical data of a relay's bandwidth usage is available in graph form. -</p> -</div> -</div> - -<h2>Technologies</h1> -<div class="row"> -<div class="col-md-4"> -<h3>Pure Client Side</h2> -<p> -This application is built in a way that all the logic is delegated to -the client. This means that the amount of requests made to the server -can be minimized and that this application can potentially run by -being loaded locally. The server is only interrogated for JSON objects -that do not manipulate the DOM of the page. The protocol used for -retrieving relay data is called <a href="https://onionoo.torproject.org/">Onionoo</a>. -</p> -</div> - -<div class="col-md-4"> -<h3>Libraries</h2> -<p> -Atlas uses <a href="http://backbonejs.org/">Backbone.js</a> as an MV* framework, with <a href="http://requirejs.org/">require.js</a> for AMD loading of -dependencies. <a href="https://jquery.com/">jQuery</a> and <a href="http://underscorejs.org/">Underscore.js</a> as JS utility libraries. -<a href="https://datatables.net/">Datatables</a> for visualizing data in tabular form with custom filtering. <a href="https://d3js.org">D3.js</a> for making pretty charts. -<a href="https://getbootstrap.com/">Bootstrap</a> as a CSS framework. -</p> -</div> - -<div class="col-md-4"> -<h3>Open Source</h2> -<p> -All the code for this website is Open Source and released under 2-Clause BSD. -The source code can be found at <a href="https://gitweb.torproject.org/atlas.git">https://gitweb.torproject.org/atlas.git</a>. -</p> -</div> -</div> - diff --git a/templates/search/do.html b/templates/search/do.html index 3de90d7..2ccbbba 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -12,11 +12,11 @@ <% } else if (error == 2) { %> <div class="alert alert-error"> <strong>Backend error!</strong> - <p>Atlas is unable to get a response from its backend server. This + <p>Relay Search is unable to get a response from its backend server. This probably means that the backend server is unavailable right now. This can also happen, however, if you did not format your query correctly. Please have a look at <a href="#about">the About page</a> that explains - what type of search queries are supported by Atlas.</p> + what type of search queries are supported by Relay Search.</p> </div> <% } else if (error == 3) { %> <div class="alert alert-error"> @@ -32,14 +32,14 @@ <p>The search query was found to be empty, which is not supported. You must enter a search query in order to generate results. Please have a look at <a href="#about">the About page</a> that explains what type of - search queries are supported by Atlas.</p> + search queries are supported by Relay Search.</p> </div> <% } %> <% } else { %> <% if (error == 4) { %> <div class="alert alert-warning"> <strong>Too many matches!</strong><p>The current version of - Atlas does not support a result set greater than 50 and only displays + Relay Search does not support a result set greater than 50 and only displays the first 50 hits. This is due to some performance issues in doing multiple parallel connections in JavaScript. Future versions will hopefully manage to overcome this issue.</p> diff --git a/templates/search/main.html b/templates/search/main.html index 51234ec..aa835f2 100644 --- a/templates/search/main.html +++ b/templates/search/main.html @@ -9,7 +9,7 @@ with graphs about their past.</p> </form> <div class="well"> <p>You can search for Tor relays and bridges by using keywords. In -particular, Atlas enables you to search for (partial) nicknames (e.g., +particular, this tool enables you to search for (partial) nicknames (e.g., “moria”), IP addresses (e.g., “<a href="#search/128.31.">128.31.</a>”), and fingerprints (e.g., “<a href="#search/9695DFC3">9695DFC3</a>”). It is also possible to combine searches, e.g., “<a href="#search/moria%20128.31.">moria