Merge pull request #6537 from takluyver/kernelspec-logos

Initial support for supplying kernel logos in kernel spec

IPython/html/static/notebook/js/kernelselector.js

@@ -85,6 +85,7 b' 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-64x64.png");
         });
         
         this.events.on('kernel_created.Session', function(event, data) {
@@ -96,6 +97,14 b' 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};

IPython/html/static/notebook/less/kernelselector.less

@@ -9,4 +9,9 b''
             margin-top:0px;
         }
     }
+    
+    & > img#current_kernel_logo {
+        width: 32px;
+        height: 32px;
+    }
 }

IPython/html/static/style/style.min.css

@@ -9685,6 +9685,10 b' 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 {
   box-sizing: border-box;
   -moz-box-sizing: border-box;

IPython/html/templates/notebook.html

@@ -42,6 +42,7 b' class="notebook_app"'
 </span>
 
 <span id="kernel_selector_widget" class="pull-right dropdown">
+  <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> 

IPython/kernel/kernelspec.py

@@ -109,8 +109,7 b' class KernelSpecManager(HasTraits):'
 
     @property
     def _native_kernel_resource_dir(self):
-        # TODO: This may be different when we actually have any resources
-        return os.path.dirname(__file__)
+        return pjoin(os.path.dirname(__file__), 'resources')
 
     def find_kernel_specs(self):
         """Returns a dict mapping kernel names to resource directories."""
@@ -128,7 +127,8 b' class KernelSpecManager(HasTraits):'
         Raises :exc:`NoSuchKernel` if the given kernel name is not found.
         """
         if kernel_name in {'python', NATIVE_KERNEL_NAME}:
-            return KernelSpec(self._native_kernel_resource_dir, **self._native_kernel_dict)
+            return KernelSpec(resource_dir=self._native_kernel_resource_dir,
+                              **self._native_kernel_dict)
 
         d = self.find_kernel_specs()
         try:
@@ -187,7 +187,9 b' class KernelSpecManager(HasTraits):'
         os.makedirs(path, mode=0o755)
         with open(pjoin(path, 'kernel.json'), 'w') as f:
             json.dump(self._native_kernel_dict, f, indent=1)
-        # TODO: Copy icons into directory
+        copy_from = self._native_kernel_resource_dir
+        for file in os.listdir(copy_from):
+            shutil.copy(pjoin(copy_from, file), path)
         return path
 
 def find_kernel_specs():