Merge pull request #503 from julienr/kernel_name

Adds kernel name to running notebooks list

notebook/services/kernels/kernelmanager.py

@@ -103,8 +103,10 @@ class MappingKernelManager(MultiKernelManager):
         """Return a dictionary of kernel information described in the
         JSON standard model."""
         self._check_kernel_id(kernel_id)
+        kernel_spec = self._kernels[kernel_id].kernel_spec
         model = {"id":kernel_id,
-                 "name": self._kernels[kernel_id].kernel_name}
+                 "name": self._kernels[kernel_id].kernel_name,
+                 "display_name": kernel_spec.display_name}
         return model
 
     def list_kernels(self):

notebook/static/tree/js/kernellist.js

@@ -36,17 +36,19 @@ define([
     KernelList.prototype.sessions_loaded = function (d) {
         this.sessions = d;
         this.clear_list();
-        var item, path;
+        var item, path, session;
         for (path in d) {
             if (!d.hasOwnProperty(path)) {
                 // nothing is safe in javascript
                 continue;
             }
+            session = d[path];
             item = this.new_item(-1);
             this.add_link({
                 name: path,
                 path: path,
                 type: 'notebook',
+                kernel_display_name: session.kernel.display_name
             }, item);
         }
         $('#running_list_placeholder').toggle($.isEmptyObject(d));
@@ -59,6 +61,11 @@ define([
             .text('');
 
         var that = this;
+        var kernel_name = $('<div/>')
+            .addClass('kernel-name')
+            .text(model.kernel_display_name)
+            .appendTo(running_indicator);
+
         var shutdown_button = $('<button/>')
             .addClass('btn btn-warning btn-xs')
             .text('Shutdown')

notebook/static/tree/js/sessionlist.js

@@ -72,7 +72,12 @@ define([
         var nb_path;
         for (var i=0; i<len; i++) {
             nb_path = data[i].notebook.path;
-            this.sessions[nb_path] = data[i].id;
+            this.sessions[nb_path] = {
+                id: data[i].id,
+                kernel: {
+                  display_name: data[i].kernel.display_name
+                }
+            };
         }
         this.events.trigger('sessions_loaded.Dashboard', this.sessions);
     };

notebook/static/tree/less/tree.less

@@ -149,6 +149,12 @@ ul.breadcrumb {
         padding-top: @dashboard_tb_pad;
         color: @brand-success;
     }
+    .kernel-name {
+        padding-top: @dashboard_tb_pad;
+        color: @brand-info;
+        margin-right: @dashboard_lr_pad;
+        float: left;
+    }
 }
 
 .toolbar_info {