update add_duplicate_button with API changes

- allow duplicating regular files
- update with contents service API changes
- fix some path/name bugs found in session and kernel list

IPython/html/static/tree/js/kernellist.js

@@ -25,22 +25,25 b' define(['
 
     KernelList.prototype = Object.create(notebooklist.NotebookList.prototype);
 
+    KernelList.prototype.add_duplicate_button = function () {
+        // do nothing
+    };
+    
     KernelList.prototype.sessions_loaded = function (d) {
         this.sessions = d;
         this.clear_list();
-        var item, path_name;
-        for (path_name in d) {
-            if (!d.hasOwnProperty(path_name)) {
+        var item, path;
+        for (path in d) {
+            if (!d.hasOwnProperty(path)) {
                 // nothing is safe in javascript
                 continue;
             }
             item = this.new_item(-1);
             this.add_link({
-                name: path_name,
-                path: '',
+                name: path,
+                path: path,
                 type: 'notebook',
             }, item);
-            this.add_shutdown_button(item, this.sessions[path_name]);
         }
         $('#running_list_header').toggle($.isEmptyObject(d));
     };

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

@@ -248,15 +248,16 b' define(['
         if (model.type !== "directory") {
             link.attr('target','_blank');
         }
-        var path_name = utils.url_path_join(path, name);
+        if (model.type !== 'directory') {
+            this.add_duplicate_button(item);
+        }
         if (model.type == 'file') {
             this.add_delete_button(item);
         } else if (model.type == 'notebook') {
-            if(this.sessions[path_name] === undefined){
+            if (this.sessions[path] === undefined){
                 this.add_delete_button(item);
-                this.add_duplicate_button(item);
             } else {
-                this.add_shutdown_button(item, this.sessions[path_name]);
+                this.add_shutdown_button(item, this.sessions[path]);
             }
         }
     };
@@ -311,7 +312,6 b' define(['
     };
 
     NotebookList.prototype.add_duplicate_button = function (item) {
-        var new_buttons = $('<span/>').addClass("btn-group pull-right");
         var notebooklist = this;
         var duplicate_button = $("<button/>").text("Duplicate").addClass("btn btn-defaultbtn-xs").
             click(function (e) {
@@ -320,11 +320,12 b' define(['
                 // We use the nbname and notebook_id from the parent notebook_item element's
                 // data because the outer scopes values change as we iterate through the loop.
                 var parent_item = that.parents('div.list_item');
-                var nbname = parent_item.data('nbname');
-                var message = 'Are you sure you want to duplicate the notebook: ' + nbname + '?';
-                var copy_from = {'copy_from' : nbname}
+                var name = parent_item.data('name');
+                var path = parent_item.data('path');
+                var message = 'Are you sure you want to duplicate ' + name + '?';
+                var copy_from = {copy_from : path};
                 IPython.dialog.modal({
-                    title : "Duplicate notebook",
+                    title : "Duplicate " + name,
                     body : message,
                     buttons : {
                         Duplicate : {
@@ -336,13 +337,13 b' define(['
                                     type : "POST",
                                     dataType : "json",
                                     data : JSON.stringify(copy_from),
-                                    success : function (data, status, xhr) {
+                                    success : function () {
                                         notebooklist.load_list();
                                     }
                                 };
                                 var url = utils.url_join_encode(
                                     notebooklist.base_url,
-                                    'api/notebooks',
+                                    'api/contents',
                                     notebooklist.notebook_path
                                 );
                                 $.ajax(url, settings);

IPython/html/static/tree/js/sessionlist.js

@@ -40,10 +40,7 b' define(['
         var len = data.length;
         var nb_path;
         for (var i=0; i<len; i++) {
-            nb_path = utils.url_path_join(
-                data[i].notebook.path,
-                data[i].notebook.name
-            );
+            nb_path = data[i].notebook.path;
             this.sessions[nb_path] = data[i].id;
         }
         this.events.trigger('sessions_loaded.Dashboard', this.sessions);