Fix a few problems with cherry-picked commits

api/notebooks => api/contents
add type to JSON model
fix a few things in notebooklist.js

IPython/html/static/base/js/contentmanager.js

@@ -54,7 +54,7 @@ define([
         this.events.trigger('notebook_loading.Notebook');
         var url = utils.url_join_encode(
             this.base_url,
-            'api/notebooks',
+            'api/contents',
             path,
             name
         );
@@ -82,7 +82,7 @@ define([
                 window.open(
                     utils.url_join_encode(
                         base_url,
-                        'notebooks',
+                        'contents',
                         path,
                         notebook_name
                     ),
@@ -106,7 +106,7 @@ define([
         };
         var url = utils.url_join_encode(
             base_url,
-            'api/notebooks',
+            'api/contents',
             path
         );
         $.ajax(url,settings);
@@ -128,7 +128,7 @@ define([
         };
         var url = utils.url_join_encode(
             this.base_url,
-            'api/notebooks',
+            'api/contents',
             path,
             name
         );
@@ -156,7 +156,7 @@ define([
         };
         var url = utils.url_join_encode(
             this.base_url,
-            'api/notebooks',
+            'api/contents',
             path,
             name
         );
@@ -165,11 +165,12 @@ define([
 
     ContentManager.prototype.save_notebook = function(path, name, content,
         extra_settings) {
-        var that = notebook;
+        var that = content;
         // Create a JSON model to be sent to the server.
         var model = {
             name : name,
             path : path,
+            type : "notebook",
             content : content
         };
         // time the ajax call for autosave tuning purposes.
@@ -196,7 +197,7 @@ define([
         }
         var url = utils.url_join_encode(
             this.base_url,
-            'api/notebooks',
+            'api/contents',
             path,
             name
         );
@@ -216,7 +217,7 @@ define([
         this.events.trigger('notebook_restoring.Notebook', checkpoint);
         var url = utils.url_join_encode(
             this.base_url,
-            'api/notebooks',
+            'api/contents',
             this.notebook_path,
             this.notebook_name,
             'checkpoints',
@@ -233,7 +234,7 @@ define([
         that = notebook;
         var url = utils.url_join_encode(
             that.base_url,
-            'api/notebooks',
+            'api/contents',
             that.notebook_path,
             that.notebook_name,
             'checkpoints'
@@ -277,7 +278,7 @@ define([
             error : error_callback
         };
 
-        var url = utils.url_join_encode(this.base_url, 'api', 'notebooks',
+        var url = utils.url_join_encode(this.base_url, 'api', 'contents',
             path);
         $.ajax(url, settings);
     }

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

@@ -156,13 +156,14 @@ define([
     };
 
     NotebookList.prototype.load_list = function () {
+        var that = this
         this.content_manager.list_contents(
-            this.notebook_path,
-            $.proxy(this.draw_notebook_list, this),
+            that.notebook_path,
+            $.proxy(that.draw_notebook_list, that),
             $.proxy( function(xhr, status, error) { 
                 utils.log_ajax_error(xhr, status, error);
                 that.draw_notebook_list([], "Error connecting to server.");
-            }, this)
+            }, that)
         );
     };
 
@@ -176,7 +177,8 @@ define([
     NotebookList.prototype.draw_notebook_list = function (list, error_msg) {
         var message = error_msg || 'Notebook list empty.';
         var item = null;
-        var len = list.length;
+        var model = null;
+        var len = list.content.length;
         this.clear_list();
         var n_uploads = this.element.children('.list_item').length;
         if (len === 0) {
@@ -198,21 +200,9 @@ define([
             offset += 1;
         }
         for (var i=0; i<len; i++) {
-            if (list[i].type === 'directory') {
-                var name = list[i].name;
-                item = this.new_notebook_item(i+offset);
-                this.add_dir(path, name, item);
-            } else {
-                var name = list[i].name;
-                item = this.new_notebook_item(i+offset);
-                this.add_link(path, name, item);
-                name = utils.url_path_join(path, name);
-                if(this.sessions[name] === undefined){
-                    this.add_delete_button(item);
-                } else {
-                    this.add_shutdown_button(item,this.sessions[name]);
-                }
-            }
+            model = list.content[i];
+            item = this.new_item(i+offset);
+            this.add_link(model, item);
         }
     };