From f123b0d2adb190298daa952fdb2eaf496cdc63ab Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Wed, 24 Sep 2014 11:57:38 -0700
Subject: [PATCH 1/4] Initial support for supplying kernel logos in kernel spec

---
 IPython/html/static/notebook/js/kernelselector.js | 1 +
 IPython/html/templates/notebook.html              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js
index 46d488289..bf78b7ca7 100644
--- a/IPython/html/static/notebook/js/kernelselector.js
+++ b/IPython/html/static/notebook/js/kernelselector.js
@@ -85,6 +85,7 @@ define([
         this.events.on('spec_changed.Kernel', function(event, data) {
             that.current_selection = data.name;
             that.element.find("#current_kernel_spec").find('.kernel_name').text(data.display_name);
+            that.element.find("#current_kernel_logo").attr("src", "/kernelspecs/"+data.name+"/logo-32.png");
         });
         
         this.events.on('kernel_created.Session', function(event, data) {
diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 3cf4b0ea1..45787a6e1 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -42,6 +42,7 @@ class="notebook_app"
 </span>
 
 <span id="kernel_selector_widget" class="pull-right dropdown">
+  <img id="current_kernel_logo" src="/kernelspecs/python/logo-32.png"/>
   <button class="dropdown-toggle btn btn-sm navbar-btn" data-toggle="dropdown" type='button' id="current_kernel_spec">
     <span class='kernel_name'>Kernel</span>
     <span class="caret"></span> 

From cad0c321377c9e8a4b7f2180d094a1e8b5355ba7 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Wed, 24 Sep 2014 12:28:29 -0700
Subject: [PATCH 2/4] Hide kernel logo if it's missing

---
 IPython/html/static/notebook/js/kernelselector.js | 8 ++++++++
 IPython/html/templates/notebook.html              | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js
index bf78b7ca7..ee2727985 100644
--- a/IPython/html/static/notebook/js/kernelselector.js
+++ b/IPython/html/static/notebook/js/kernelselector.js
@@ -97,6 +97,14 @@ define([
                 that.events.trigger('spec_changed.Kernel', ks);
             }
         });
+        
+        var logo_img = this.element.find("#current_kernel_logo")
+        logo_img.on("load", function() {
+            logo_img.show();
+        });
+        logo_img.on("error", function() {
+            logo_img.hide();
+        });
     };
 
     return {'KernelSelector': KernelSelector};
diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 45787a6e1..319cd7142 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -42,7 +42,7 @@ class="notebook_app"
 </span>
 
 <span id="kernel_selector_widget" class="pull-right dropdown">
-  <img id="current_kernel_logo" src="/kernelspecs/python/logo-32.png"/>
+  <img id="current_kernel_logo"/>
   <button class="dropdown-toggle btn btn-sm navbar-btn" data-toggle="dropdown" type='button' id="current_kernel_spec">
     <span class='kernel_name'>Kernel</span>
     <span class="caret"></span> 

From 7cc07251e4ba038abfb6d874c879f70d53fe4b0a Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Tue, 9 Dec 2014 12:11:02 -0800
Subject: [PATCH 3/4] Use double resolution logo to support hires displays

---
 IPython/html/static/notebook/js/kernelselector.js     | 2 +-
 IPython/html/static/notebook/less/kernelselector.less | 5 +++++
 IPython/html/static/style/style.min.css               | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js
index ee2727985..b024919dc 100644
--- a/IPython/html/static/notebook/js/kernelselector.js
+++ b/IPython/html/static/notebook/js/kernelselector.js
@@ -85,7 +85,7 @@ define([
         this.events.on('spec_changed.Kernel', function(event, data) {
             that.current_selection = data.name;
             that.element.find("#current_kernel_spec").find('.kernel_name').text(data.display_name);
-            that.element.find("#current_kernel_logo").attr("src", "/kernelspecs/"+data.name+"/logo-32.png");
+            that.element.find("#current_kernel_logo").attr("src", "/kernelspecs/"+data.name+"/logo-64.png");
         });
         
         this.events.on('kernel_created.Session', function(event, data) {
diff --git a/IPython/html/static/notebook/less/kernelselector.less b/IPython/html/static/notebook/less/kernelselector.less
index e3be7d321..44159c64c 100644
--- a/IPython/html/static/notebook/less/kernelselector.less
+++ b/IPython/html/static/notebook/less/kernelselector.less
@@ -9,4 +9,9 @@
             margin-top:0px;
         }
     }
+    
+    & > img#current_kernel_logo {
+        width: 32px;
+        height: 32px;
+    }
 }
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 4a59dd8ba..dd548d7af 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -9680,6 +9680,10 @@ fieldset[disabled] #kernel_selector_widget > button.active {
 #kernel_selector_widget > button > span.caret {
   margin-top: 0px;
 }
+#kernel_selector_widget > img#current_kernel_logo {
+  width: 32px;
+  height: 32px;
+}
 #menubar {
   margin-top: 0px;
   box-sizing: border-box;

From 3e2f6dba9847f7419b35eeec07457f8e00637bf6 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Tue, 9 Dec 2014 14:05:55 -0800
Subject: [PATCH 4/4] logo-64 -> logo-64x64

---
 IPython/html/static/notebook/js/kernelselector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/kernelselector.js b/IPython/html/static/notebook/js/kernelselector.js
index b024919dc..01f6d2ab7 100644
--- a/IPython/html/static/notebook/js/kernelselector.js
+++ b/IPython/html/static/notebook/js/kernelselector.js
@@ -85,7 +85,7 @@ define([
         this.events.on('spec_changed.Kernel', function(event, data) {
             that.current_selection = data.name;
             that.element.find("#current_kernel_spec").find('.kernel_name').text(data.display_name);
-            that.element.find("#current_kernel_logo").attr("src", "/kernelspecs/"+data.name+"/logo-64.png");
+            that.element.find("#current_kernel_logo").attr("src", "/kernelspecs/"+data.name+"/logo-64x64.png");
         });
         
         this.events.on('kernel_created.Session', function(event, data) {