Merge pull request #7279 from jdfreder/newbutton

New new button

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

@@ -8119,7 +8119,7 @@ input.engine_num_input {
 .file_icon:before.pull-right {
   margin-left: .3em;
 }
-ul#new-notebook-menu {
+ul#new-menu {
   left: auto;
   right: 0;
 }

IPython/html/static/tree/js/main.js

@@ -71,7 +71,7 @@ require([
 
     var login_widget = new loginwidget.LoginWidget('#login_widget', common_options);
 
-    var nnw = new newnotebook.NewNotebookWidget("#new-notebook-buttons",
+    var new_buttons = new newnotebook.NewNotebookWidget("#new-buttons",
         $.extend(
             {contents: contents},
             common_options
@@ -130,7 +130,7 @@ require([
     IPython.session_list = session_list;
     IPython.kernel_list = kernel_list;
     IPython.login_widget = login_widget;
-    IPython.new_notebook_widget = nnw;
+    IPython.new_notebook_widget = new_buttons;
 
     events.trigger('app_initialized.DashboardApp');
     

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

@@ -15,7 +15,6 @@ define([
         this.notebook_path = options.notebook_path;
         this.contents = options.contents;
         this.default_kernel = null;
-        this.config = options.config;
         this.kernelspecs = {};
         if (this.selector !== undefined) {
             this.element = $(selector);
@@ -41,7 +40,7 @@ define([
         /** load kernelspec list */
         var that = this;
         this.kernelspecs = data.kernelspecs;
-        var menu = this.element.find("#new-notebook-menu");
+        var menu = this.element.find("#notebook-kernels");
         var keys = Object.keys(data.kernelspecs).sort(function (a, b) {
             var da = data.kernelspecs[a].display_name;
             var db = data.kernelspecs[b].display_name;
@@ -64,45 +63,8 @@ define([
                         .text(ks.display_name)
                         .attr('title', 'Create a new notebook with ' + ks.display_name)
                 );
-            menu.append(li);
+            menu.after(li);
         }
-        this.config.loaded.then(function () {
-            that._load_default_kernelspec(data['default']);
-        });
-    };
-    
-    NewNotebookWidget.prototype._load_default_kernelspec = function (default_name) {
-        /** load default kernelspec name from config, if defined */
-        if (this.config.data.NewNotebookWidget &&
-            this.config.data.NewNotebookWidget.default_kernel &&
-            this.kernelspecs[this.config.data.NewNotebookWidget.default_kernel] !== undefined
-        ) {
-            default_name = this.config.data.NewNotebookWidget.default_kernel;
-        }
-        this.set_default_kernel(default_name);
-    };
-
-    NewNotebookWidget.prototype.set_default_kernel = function (kernel_name) {
-        /** select the current default kernel */
-        this.default_kernel = kernel_name;
-        this.config.update({
-            NewNotebookWidget: {
-                default_kernel: kernel_name
-            }
-        });
-        var spec = this.kernelspecs[kernel_name];
-        var display_name;
-        if (spec) {
-            display_name = spec.display_name;
-            this.element.find("#current-kernel")
-                .text(display_name)
-                .attr('title', display_name + " is the default kernel for new notebooks");
-        } else {
-            display_name = 'default kernel';
-        }
-        this.element.find("#new_notebook").attr('title',
-            'Create a new notebook with ' + display_name
-        );
     };
     
     NewNotebookWidget.prototype.new_notebook = function (kernel_name) {

IPython/html/static/tree/js/notebooklist.js

@@ -7,7 +7,8 @@ define([
     'base/js/utils',
     'base/js/dialog',
     'base/js/events',
-], function(IPython, $, utils, dialog, events) {
+    'base/js/keyboard',
+], function(IPython, $, utils, dialog, events, keyboard) {
     "use strict";
     
     var NotebookList = function (selector, options) {
@@ -54,7 +55,6 @@ define([
         this.element.addClass("list_container");
     };
 
-
     NotebookList.prototype.bind_events = function () {
         var that = this;
         $('#refresh_' + this.element_name + '_list').click(function () {
@@ -67,6 +67,25 @@ define([
             that.handleFilesUpload(event,'drop');
             return false;
         });
+
+        // Bind events for singleton controls.
+        if (!NotebookList._bound_singletons) {
+            NotebookList._bound_singletons = true;
+            $('#new-file').click(function(e) {
+                var w = window.open();
+                that.contents.new_untitled(that.notebook_path || '', {type: 'file', ext: '.txt'}).then(function(data) {
+                    var url = utils.url_join_encode(
+                        that.base_url, 'edit', data.path
+                    );
+                    w.location = url;
+                });
+                that.load_sessions();
+            });
+            $('#new-folder').click(function(e) {
+                that.contents.new_untitled(that.notebook_path || '', {type: 'directory'});
+                that.load_sessions();
+            });
+        }
     };
 
     NotebookList.prototype.handleFilesUpload =  function(event, dropOrForm) {

IPython/html/static/tree/less/tree.less

@@ -156,7 +156,7 @@ input.engine_num_input {
     .icon(@fa-var-file-o)
 }
 
-ul#new-notebook-menu {
+ul#new-menu {
     // align right instead of left
     left: auto;
     right: 0;

IPython/html/templates/tree.html

@@ -42,16 +42,22 @@ data-terminals-available="{{terminals_available}}"
                 </span>
                 </span>
               </form>
-              <div id="notebook_buttons" class="pull-right btn-toolbar">
+              <div class="pull-right">
-                <div id="new-notebook-buttons" class="btn-group">
+                <div id="new-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">Loading...</span>
+                  <span>New</span>
                   <span class="caret"></span>
                   </button>
-                  <ul id="new-notebook-menu" class="dropdown-menu"></ul>
+                  <ul id="new-menu" class="dropdown-menu">
+                    <li role="presentation" id="new-file">
+                      <a role="menuitem" tabindex="-1" href="#">File</a>
+                    </li>
+                    <li role="presentation" id="new-folder">
+                      <a role="menuitem" tabindex="-1" href="#">Folder</a>
+                    </li>
+                    <li role="presentation" class="divider"></li>
+                    <li role="presentation" class="dropdown-header" id="notebook-kernels">Notebooks</li>
+                  </ul>
                 </div>
                 <div class="btn-group">
                     <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i></button>

IPython/html/tests/util.js

@@ -13,7 +13,8 @@ casper.open_new_notebook = function () {
     var baseUrl = this.get_notebook_server();
     this.start(baseUrl);
     this.waitFor(this.page_loaded);
-    this.thenClick('button#new_notebook');
+    this.thenClick('#kernel-python2 a, #kernel-python3 a');
+    
     this.waitForPopup('');
 
     this.withPopup('', function () {this.waitForSelector('.CodeMirror-code');});