From 78c6ca7e218ec81d49ce2dd9e29227dcc53dd3bc Mon Sep 17 00:00:00 2001
From: Julien Rebetez <julien.rebetez@heig-vd.ch>
Date: Mon, 28 Sep 2015 14:06:10 +0200
Subject: [PATCH] Adds kernel name to running notebooks list

---
 notebook/static/tree/js/kernellist.js  | 9 ++++++++-
 notebook/static/tree/js/sessionlist.js | 5 ++++-
 notebook/static/tree/less/tree.less    | 6 ++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/notebook/static/tree/js/kernellist.js b/notebook/static/tree/js/kernellist.js
index 8b2e8f837..1ed379d6a 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_name: session.kernel_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_name)
+            .appendTo(running_indicator);
+
         var shutdown_button = $('<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 129d668ed..747419216 100644
--- a/notebook/static/tree/js/sessionlist.js
+++ b/notebook/static/tree/js/sessionlist.js
@@ -72,7 +72,10 @@ 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_name: data[i].kernel.name
+            };
         }
         this.events.trigger('sessions_loaded.Dashboard', this.sessions);
     };
diff --git a/notebook/static/tree/less/tree.less b/notebook/static/tree/less/tree.less
index 19798e3b4..30ffe5a7f 100644
--- a/notebook/static/tree/less/tree.less
+++ b/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 {