Adding proper breadcrumb support.

IPython/html/templates/tree.html

@@ -1,91 +1,92 b''
 {% extends "page.html" %}
 
 {% block title %}IPython Dashboard{% endblock %}
 
 
 {% block stylesheet %}
 {{super()}}
 <link rel="stylesheet" href="{{ static_url("tree/css/override.css") }}" type="text/css" />
 {% endblock %}
 
 {% block params %}
 
 data-project="{{project}}"
 data-base-project-url="{{base_project_url}}"
 data-notebook-path="{{notebook_path}}"
 data-base-kernel-url="{{base_kernel_url}}"
 
 {% endblock %}
 
 
 {% block site %}
 
 <div id="ipython-main-app" class="container">
 
 <div id="tabs" class="tabbable">
     <ul class="nav nav-tabs" id="tabs">
         <li class="active"><a href="#notebooks" data-toggle="tab">Notebooks</a></li>
         <li><a href="#clusters" data-toggle="tab">Clusters</a></li>
     </ul>
 
     <div class="tab-content">
     <div id="notebooks" class="tab-pane active">
         <div id="notebook_toolbar">
             <form id='alternate_upload'  class='alternate_upload' >
                 <span id="drag_info" style="position:absolute" >
                     To import a notebook, drag the file onto the listing below or <strong>click here</strong>.
                     </span>
                 <input type="file" name="datafile" class="fileinput" multiple='multiple'>
             </form>
             <span id="notebook_buttons">
                 <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-small">Refresh</button>
                 <button id="new_notebook" title="Create new notebook" class="btn btn-small">New Notebook</button>
             </span>
         </div>
 
         <div id="notebook_list">
           <div id="notebook_list_header" class="row-fluid list_header">
               <div id="project_name">
                 <ul class="breadcrumb">
-                    {% for component in tree_url_path.strip('/').split('/') %}
-                        <li>{{component}} <span>/</span></li>
+                    <li><span><a href="{{breadcrumbs[0][0]}}">/</a></span></li>
+                    {% for crumb in breadcrumbs[1:] %}
+                        <li><a href="{{crumb[0]}}">{{crumb[1]}}</a> <span>/</span></li>
                     {% endfor %}
                 </ul>
               </div>
           </div>
         </div>
     </div>
     
     <div id="clusters" class="tab-pane">
 
         <div id="cluster_toolbar">
             <span id="cluster_list_info">IPython parallel computing clusters</span>
 
             <span id="cluster_buttons">
                 <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-small">Refresh</button>
             </span>
         </div>
 
         <div id="cluster_list">
             <div id="cluster_list_header" class="row-fluid list_header">
                 <span class="profile_col span4">profile</span>
                 <span class="status_col span3">status</span>
                 <span class="engines_col span3" title="Enter the number of engines to start or empty for default"># of engines</span>
                 <span class="action_col span2">action</span>
             </div>
         </div>
     </div>
 </div>
 
 </div>
 
 {% endblock %}
 
 {% block script %}
     {{super()}}
     <script src="{{ static_url("base/js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("base/js/dialog.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}

IPython/html/tree/handlers.py

@@ -1,76 +1,88 b''
 """Tornado handlers for the tree view.
 
 Authors:
 
 * Brian Granger
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 import os
 
 from tornado import web
 from ..base.handlers import IPythonHandler, notebook_path_regex, path_regex
 from ..utils import url_path_join, path2url, url2path, url_escape
 
 #-----------------------------------------------------------------------------
 # Handlers
 #-----------------------------------------------------------------------------
 
 
 class TreeHandler(IPythonHandler):
     """Render the tree view, listing notebooks, clusters, etc."""
 
+    def generate_breadcrumbs(self, path):
+        breadcrumbs = [(url_escape(url_path_join(self.base_project_url, 'tree')), '')]
+        comps = path.split('/')
+        ncomps = len(comps)
+        for i in range(ncomps):
+            if comps[i]:
+                link = url_escape(url_path_join(self.base_project_url, 'tree', *comps[0:i+1]))
+                breadcrumbs.append((link, comps[i]))
+        return breadcrumbs
+
     @web.authenticated
     def get(self, path='', name=None):
         path = path.strip('/')
         nbm = self.notebook_manager
         if name is not None:
             # is a notebook, redirect to notebook handler
             url = url_escape(url_path_join(
                 self.base_project_url, 'notebooks', path, name
             ))
             self.log.debug("Redirecting %s to %s", self.request.path, url)
             self.redirect(url)
         else:
             if not nbm.path_exists(path=path):
                 # no such directory, 404
                 raise web.HTTPError(404)
+            breadcrumbs = self.generate_breadcrumbs(path)
             self.write(self.render_template('tree.html',
                 project=self.project_dir,
                 tree_url_path=path,
                 notebook_path=path,
+                breadcrumbs=breadcrumbs
             ))
 
 
 class TreeRedirectHandler(IPythonHandler):
     """Redirect a request to the corresponding tree URL"""
 
     @web.authenticated
     def get(self, path=''):
         url = url_escape(url_path_join(
             self.base_project_url, 'tree', path.strip('/')
         ))
         self.log.debug("Redirecting %s to %s", self.request.path, url)
         self.redirect(url)
 
 
 #-----------------------------------------------------------------------------
 # URL to handler mappings
 #-----------------------------------------------------------------------------
 
 
 default_handlers = [
     (r"/tree%s" % notebook_path_regex, TreeHandler),
     (r"/tree%s" % path_regex, TreeHandler),
     (r"/tree", TreeHandler),
     (r"/", TreeRedirectHandler),
     ]