From ddcc3dd9837dfe1c16826d668ad380cb89e3e98c Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Fri, 26 Oct 2018 13:45:29 +0100
Subject: [PATCH] Display kernel type ID alongside display name

---
 notebook/static/notebook/js/kernelselector.js | 12 ++++++++----
 notebook/static/tree/js/newnotebook.js        |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/notebook/static/notebook/js/kernelselector.js b/notebook/static/notebook/js/kernelselector.js
index 990b8e1f8b..41c4ee4bcc 100644
--- a/notebook/static/notebook/js/kernelselector.js
+++ b/notebook/static/notebook/js/kernelselector.js
@@ -74,7 +74,7 @@ define([
                         .click( function () {
                             that.set_kernel(ks.name);
                         })
-                        .text(ks.spec.display_name)
+                        .text(ks.spec.display_name + " (" + ks.name + ")")
                 )
             );
             // Create the File > New Notebook submenu
@@ -86,7 +86,7 @@ define([
                         .click( function () {
                             that.new_notebook(ks.name);
                         })
-                        .text(ks.spec.display_name)
+                        .text(ks.spec.display_name + " (" + ks.name + ")")
                 )
             );
 
@@ -262,13 +262,17 @@ define([
         }
         names.map(function (name) {
             var ks = that.kernelspecs[name];
+            var display_txt = ks.name;
+            if (ks.spec.display_name) {
+                display_txt = ks.spec.display_name + " (" + ks.name + ")"
+            }
             select.append(
-                $('<option/>').attr('value', ks.name).text(ks.spec.display_name || ks.name)
+                $('<option/>').attr('value', ks.name).text(display_txt)
             );
         });
         
         var no_kernel_msg = i18n.msg.sprintf(i18n.msg._("Could not find a kernel matching %s. Please select a kernel:"),
-                (data.selected.display_name || data.selected.name))
+                (data.selected.display_name || data.selected.name));
         var body = $("<form>").addClass("form-inline").append(
             $("<span>").text(no_kernel_msg)
         ).append(select);
diff --git a/notebook/static/tree/js/newnotebook.js b/notebook/static/tree/js/newnotebook.js
index d0ea5d5c29..19291c358b 100644
--- a/notebook/static/tree/js/newnotebook.js
+++ b/notebook/static/tree/js/newnotebook.js
@@ -65,7 +65,7 @@ define([
                     $('<a>')
                         .attr('href', '#')
                         .click($.proxy(this.new_notebook, this, ks.name))
-                        .text(ks.spec.display_name)
+                        .text(ks.spec.display_name + " (" + ks.name + ")")
                         .attr('title', i18n.sprintf(i18n._('Create a new notebook with %s'), ks.spec.display_name))
                 );
             menu.after(li);