[tor-commits] [atlas/master] Remove broken changes

[art at torproject.org]

commit 7c3d7adb3b87adc6fe5a04a94348ee4c9bcb387b
Merge: 7c5e9ec 33dbb90
Author: Arturo Filastò <art at baculo.org>
Date:   Sun Jun 10 20:40:45 2012 +0200

    Remove broken changes

 index.html               |    9 ++++-----
 js/router.js             |    3 +--
 js/views/details/main.js |    5 +++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --cc index.html
index c30a662,6d583f1..ffd4be1
--- a/index.html
+++ b/index.html
@@@ -62,11 -62,10 +62,10 @@@
        </div>
        <hr/>
        <footer>
-         The Tor Project - 2012<br/>
-         <a href="https://gitweb.torproject.org/atlas.git">Source code</a>
- 
-         <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a>
-                 - <a href="mailto:art at torproject.org">Contact</a>
 -      The Tor Project - 2012<br/>
++              The Tor Project - 2012<br/>
+       <a href="https://gitweb.torproject.org/atlas.git">Source code</a> -
+           <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a>
+           - <a href="mailto:art at torproject.org">Contact</a>
        </footer>
  
      </div> <!-- /container -->
diff --cc js/router.js
index 3dd9ba8,ad58917..3fd4a8b
--- a/js/router.js
+++ b/js/router.js
@@@ -6,15 -6,17 +6,14 @@@ define(
    'views/details/main',
    'views/search/main',
    'views/search/do',
--  'views/about/main',
 -  'views/details/graph'
 -], function($, _, Backbone, mainDetailsView, mainSearchView,
 -            doSearchView, aboutView, showGraphView){
++  'views/about/main'
 +], function($, _, Backbone, mainDetailsView, mainSearchView, doSearchView, aboutView){
    var AppRouter = Backbone.Router.extend({
      routes: {
      	// Define the routes for the actions in Tor Status
      	'details/:fingerprint': 'mainDetails',
      	'search/:query': 'doSearch',
      	'about': 'showAbout',
- 
 -        'graph/:fingerprint': 'showGraph',
      	// Default
      	'*actions': 'defaultAction'
      },