diff --git a/notebook/services/kernels/kernelmanager.py b/notebook/services/kernels/kernelmanager.py index 589888c07..e549a63c2 100644 --- a/notebook/services/kernels/kernelmanager.py +++ b/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): diff --git a/notebook/static/tree/js/kernellist.js b/notebook/static/tree/js/kernellist.js index 8b2e8f837..ea3a51a20 100644 --- a/notebook/static/tree/js/kernellist.js +++ b/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 = $('
') + .addClass('kernel-name') + .text(model.kernel_display_name) + .appendTo(running_indicator); + var shutdown_button = $('') .addClass('btn btn-warning btn-xs') .text('Shutdown') diff --git a/notebook/static/tree/js/sessionlist.js b/notebook/static/tree/js/sessionlist.js index ce8a69dd0..c6d0390bc 100644 --- a/notebook/static/tree/js/sessionlist.js +++ b/notebook/static/tree/js/sessionlist.js @@ -72,7 +72,12 @@ define([ var nb_path; for (var i=0; i