[tor-commits] [atlas/master] Merge branch 'task/5430' of https://git.torproject.org/user/irl/atlas into task/5430

[phw at torproject.org]

commit cc862970277f6537765b971844f9b7c7f12991d5
Merge: e520e51 223aec3
Author: Philipp Winter <phw at torproject.org>
Date:   Mon Jun 27 18:47:35 2016 -0400

    Merge branch 'task/5430' of https://git.torproject.org/user/irl/atlas into task/5430
    
    Conflicts:
    	templates/search/do.html

 index.html               |  7 ++++++-
 js/router.js             | 26 ++++++++++++++++++++++++++
 js/views/search/do.js    |  3 ++-
 templates/search/do.html |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --cc js/router.js
index 6513e19,c5ce942..50bcd4e
--- a/js/router.js
+++ b/js/router.js
@@@ -69,11 -67,11 +70,12 @@@ define(
              doSearchView.collection.url =
                  doSearchView.collection.baseurl + this.hashFingerprints(query);
              doSearchView.collection.lookup({
 -                success: function(relays){
 +                success: function(err){
                      $("#content").show();
                      doSearchView.relays = doSearchView.collection.models;
 +		    doSearchView.error = err;
                      doSearchView.render(query);
+ 		    $("#search-title").text(query);
                      $("#loading").hide();
                  },
  
diff --cc templates/search/do.html
index 95fea6c,2f3b0b2..ebce483
--- a/templates/search/do.html
+++ b/templates/search/do.html
@@@ -40,16 -28,8 +40,17 @@@
      </div>
      <% } %>
  <% } else { %>
 +    <% if (error == 4) { %>
 +    <div class="alert alert-error">
 +        <strong>Too many matches!</strong><p>The current version of
 +        Atlas 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>
 +    </div>
 +    <% } %>
  
+ <h1 id="search-title"></h1>
  <table cellpadding="0" cellspacing="0" border="0" class="table table-bordered table-striped" id="torstatus_results">
  	<thead>
  		<tr>