include current kernel name in new notebook dropdown

IPython/html/static/tree/js/newnotebook.js

@@ -1,112 +1,113 b''
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 define([
     'jquery',
     'base/js/namespace',
     'base/js/utils',
     'base/js/dialog',
 ], function ($, IPython, utils, dialog) {
     "use strict";
     
     var NewNotebookWidget = function (selector, options) {
         this.selector = selector;
         this.base_url = options.base_url;
         this.notebook_path = options.notebook_path;
         this.contents = options.contents;
         this.current_selection = null;
         this.kernelspecs = {};
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.request_kernelspecs();
         }
         this.bind_events();
     };
     
     NewNotebookWidget.prototype.bind_events = function () {
         var that = this;
         this.element.find('#new_notebook').click(function () {
             that.new_notebook();
         });
     };
     
     NewNotebookWidget.prototype.request_kernelspecs = function () {
         /** request and then load kernel specs */
         var url = utils.url_join_encode(this.base_url, 'api/kernelspecs');
         utils.promising_ajax(url).then($.proxy(this._load_kernelspecs, this));
     };
     
     NewNotebookWidget.prototype._load_kernelspecs = function (data) {
         /** load kernelspec list */
         this.kernelspecs = {};
         var menu = this.element.find("#new-notebook-menu");
         for (var i = 0; i < data.length; i++) {
             var ks = data[i];
             this.kernelspecs[ks.name] = ks;
             var ksentry = $("<li>").attr("id", "kernel-" +ks.name).append($('<a>')
                 .attr('href', '#')
                 .click($.proxy(this.new_with_kernel, this, ks.name))
                 .text(ks.display_name)
                 .attr('title', 'Create a new notebook with ' + ks.display_name)
             );
             menu.append(ksentry);
         }
         this._load_default_kernelspec();
     };
     
     NewNotebookWidget.prototype._load_default_kernelspec = function () {
         /** load default kernelspec name from localStorage, if defined */
         this.select_kernel(localStorage.default_kernel_name);
     };
 
     NewNotebookWidget.prototype.select_kernel = function (kernel_name) {
         /** select the current default kernel */
         this.current_selection = kernel_name;
         var spec = this.kernelspecs[kernel_name];
         var display_name;
         if (spec) {
             display_name = spec.display_name;
             localStorage.default_kernel_name = kernel_name;
+            this.element.find("#current-kernel").text(display_name);
         } else {
             display_name = 'default kernel';
             delete localStorage.default_kernel_name;
         }
         this.element.find("#new_notebook").attr('title',
             'Create a new notebook with ' + display_name
         );
     };
     
     NewNotebookWidget.prototype.new_with_kernel = function (kernel_name) {
         /** record current selection and open a new notebook */
         this.select_kernel(kernel_name);
         this.new_notebook(kernel_name);
     };
     
     NewNotebookWidget.prototype.new_notebook = function (kernel_name) {
         /** create and open a new notebook */
         var that = this;
         kernel_name = kernel_name || this.current_selection;
         var w = window.open();
         this.contents.new_untitled(that.notebook_path, {type: "notebook"}).then(
             function (data) {
                 var url = utils.url_join_encode(
                     that.base_url, 'notebooks', data.path
                 );
                 if (kernel_name) {
                     url += "?kernel_name=" + kernel_name;
                 }
                 w.location = url;
             },
             function (error) {
                 w.close();
                 dialog.modal({
                     title : 'Creating Notebook Failed',
                     body : "The error was: " + error.message,
                     buttons : {'OK' : {'class' : 'btn-primary'}}
                 });
             }
         );
     };
     
     return {'NewNotebookWidget': NewNotebookWidget};
 });

IPython/html/templates/tree.html

@@ -1,152 +1,153 b''
 {% extends "page.html" %}
 
 {% block title %}{{page_title}}{% endblock %}
 
 
 {% block stylesheet %}
 {{super()}}
 <link rel="stylesheet" href="{{ static_url("tree/css/override.css") }}" type="text/css" />
 {% endblock %}
 
 {% block params %}
 
 data-base-url="{{base_url}}"
 data-notebook-path="{{notebook_path}}"
 data-terminals-available="{{terminals_available}}"
 
 {% endblock %}
 
 
 {% block site %}
 
 <div id="ipython-main-app" class="container">
 
 <div id="tab_content" class="tabbable">
     <ul id="tabs" class="nav nav-tabs">
         <li class="active"><a href="#notebooks" data-toggle="tab">Notebooks</a></li>
         <li><a href="#running" data-toggle="tab">Running</a></li>
       {% if terminals_available %}
         <li><a href="#terminals" data-toggle="tab">Terminals</a></li>
       {% endif %}
         <li><a href="#clusters" data-toggle="tab">Clusters</a></li>
     </ul>
 
     <div class="tab-content">
     <div id="notebooks" class="tab-pane active">
         <div id="notebook_toolbar" class="row">
             <div class="col-sm-8 no-padding">
                 <form id='alternate_upload'  class='alternate_upload' >
                     <span id="notebook_list_info" style="position:absolute" >
                         To import a notebook, drag the file onto the listing below or <strong>click here</strong>.
                     </span>
                     <input type="file" name="datafile" class="fileinput" multiple='multiple'>
                 </form>
             </div>
             <div class="col-sm-4 no-padding tree-buttons">
               <span id="notebook_buttons" class="pull-right">
                 <div id="new-notebook-buttons" class="btn-group">
                   <button id="new_notebook" class="btn btn-default btn-xs">
                     New Notebook
                   </button>
                   <button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
+                    <span id="current-kernel"></span>
                     <span class="caret"></span>
                   </button>
                   <ul id="new-notebook-menu" class="dropdown-menu"></ul>
                 </div>
 
                   
                 <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
               </span>
             </div>
         </div>
 
         <div id="notebook_list">
           <div id="notebook_list_header" class="row list_header">
               <div id="project_name">
                 <ul class="breadcrumb">
                     <li><a href="{{breadcrumbs[0][0]}}"><i class="fa fa-home"></i></a></li>
                     {% for crumb in breadcrumbs[1:] %}
                         <li><a href="{{crumb[0]}}">{{crumb[1]}}</a></li>
                     {% endfor %}
                 </ul>
               </div>
           </div>
         </div>
     </div>
     
     <div id="running" class="tab-pane">
 
         <div id="running_toolbar" class="row">
             <div class="col-sm-8 no-padding">
                 <span id="running_list_info">Currently running IPython notebooks</span>
             </div>
             <div class="col-sm-4 no-padding tree-buttons">
                 <span id="running_buttons" class="pull-right">
                     <button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                 </span>
             </div>
         </div>
 
         <div id="running_list">
             <div id="running_list_header" class="row list_header"> 
                 <div> There are no notebooks running. </div>
             </div> 
         </div>
     </div>
 
   {% if terminals_available %}
     <div id="terminals" class="tab-pane">
 
         <div id="terminal_toolbar" class="row">
             <div class="col-xs-8 no-padding">
                 <span id="terminal_list_info">Currently running terminals</span>
             </div>
             <div class="col-xs-4 no-padding tree-buttons">
                 <span id="terminal_buttons" class="pull-right">
                     <button id="new_terminal" title="New terminal" class="btn btn-default btn-xs">New Terminal</button>
                     <button id="refresh_terminal_list" title="Refresh terminal list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                 </span>
             </div>
         </div>
 
         <div id="terminal_list">
             <div id="terminal_list_header" class="row list_header">
                 <div> There are no terminals running. </div>
             </div>
         </div>
     </div>
   {% endif %}
     
     <div id="clusters" class="tab-pane">
 
         <div id="cluster_toolbar" class="row">
             <div class="col-xs-8 no-padding">
                 <span id="cluster_list_info">IPython parallel computing clusters</span>
             </div>
             <div class="col-xs-4 no-padding tree-buttons">
                 <span id="cluster_buttons" class="pull-right">
                     <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>
                 </span>
             </div>
         </div>
 
         <div id="cluster_list">
             <div id="cluster_list_header" class="row list_header">
                 <div class="profile_col col-xs-4">profile</div>
                 <div class="status_col col-xs-3">status</div>
                 <div class="engines_col col-xs-3" title="Enter the number of engines to start or empty for default"># of engines</div>
                 <div class="action_col col-xs-2">action</div>
             </div>
         </div>
     </div>
 </div>
 
 </div>
 
 {% endblock %}
 
 {% block script %}
     {{super()}}
 
 <script src="{{ static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}