From 4bbd255f16679b189bed1dc5dfc1c5f7e6758727 Mon Sep 17 00:00:00 2001
From: David Neto <davidnt@google.com>
Date: Thu, 17 Apr 2014 16:15:26 -0400
Subject: [PATCH 1/5] Change the order of Cancel and OK button in the renaming
 function so it matches the user experience for the same dialog boxes used in
 the main dashboard

---
 IPython/html/static/notebook/js/savewidget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/html/static/notebook/js/savewidget.js b/IPython/html/static/notebook/js/savewidget.js
index f2cfb5c56..8c7f3338a 100644
--- a/IPython/html/static/notebook/js/savewidget.js
+++ b/IPython/html/static/notebook/js/savewidget.js
@@ -77,7 +77,6 @@ define([
             notebook: options.notebook,
             keyboard_manager: this.keyboard_manager,
             buttons : {
-                "Cancel": {},
                 "OK": {
                     class: "btn-primary",
                     click: function () {
@@ -92,7 +91,8 @@ define([
                     } else {
                         that.notebook.rename(new_name);
                     }
-                }}
+                }},
+                "Cancel": {}
                 },
             open : function (event, ui) {
                 var that = $(this);

From 6aae1e219f477ee4c4abf766affc3b2282c576e2 Mon Sep 17 00:00:00 2001
From: David Neto <davidnt@google.com>
Date: Thu, 17 Apr 2014 16:16:42 -0400
Subject: [PATCH 2/5] Add the "Duplicate" button in the main dashboard

so we can copy an existing notebook without having to start it's instance
---
 IPython/html/static/tree/js/notebooklist.js | 51 ++++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index 8e727f50e..7ef34bec0 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -254,6 +254,7 @@ define([
         } else if (model.type == 'notebook') {
             if(this.sessions[path_name] === undefined){
                 this.add_delete_button(item);
+                this.add_duplicate_button(item);
             } else {
                 this.add_shutdown_button(item, this.sessions[path_name]);
             }
@@ -306,7 +307,53 @@ define([
                 return false;
             });
         // var new_buttons = item.find('a'); // shutdown_button;
-        item.find(".item_buttons").text("").append(shutdown_button);
+        item.find(".item_buttons").append(shutdown_button);
+    };
+
+    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) {
+                // $(this) is the button that was clicked.
+                var that = $(this);
+                // 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}
+                IPython.dialog.modal({
+                    title : "Duplicate notebook",
+                    body : message,
+                    buttons : {
+                        Duplicate : {
+                            class: "btn-primary",
+                            click: function() {
+                                var settings = {
+                                    processData : false,
+                                    cache : false,
+                                    type : "POST",
+                                    dataType : "json",
+                                    data : JSON.stringify(copy_from),
+                                    success : function (data, status, xhr) {
+                                        notebooklist.load_list();
+                                    }
+                                };
+                                var url = utils.url_join_encode(
+                                    notebooklist.base_url,
+                                    'api/notebooks',
+                                    notebooklist.notebook_path
+                                );
+                                $.ajax(url, settings);
+                            }
+                        },
+                        Cancel : {}
+                    }
+                });
+                return false;
+            });
+        item.find(".item_buttons").append(duplicate_button);
     };
 
     NotebookList.prototype.add_delete_button = function (item) {
@@ -340,7 +387,7 @@ define([
                 });
                 return false;
             });
-        item.find(".item_buttons").text("").append(delete_button);
+        item.find(".item_buttons").append(delete_button);
     };
 
     NotebookList.prototype.notebook_deleted = function(path) {

From 8bad784ce576d2713ca849c27e0d6331974cb121 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 12 Nov 2014 16:58:04 -0800
Subject: [PATCH 3/5] 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   | 15 ++++++++-----
 IPython/html/static/tree/js/notebooklist.js | 25 +++++++++++----------
 IPython/html/static/tree/js/sessionlist.js  |  5 +----
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/IPython/html/static/tree/js/kernellist.js b/IPython/html/static/tree/js/kernellist.js
index a4c318f58..f522a8b79 100644
--- a/IPython/html/static/tree/js/kernellist.js
+++ b/IPython/html/static/tree/js/kernellist.js
@@ -25,22 +25,25 @@ 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));
     };
diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index 7ef34bec0..a592aeb7c 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -248,15 +248,16 @@ 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,20 +312,20 @@ 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").
+        var duplicate_button = $("<button/>").text("Duplicate").addClass("btn btn-default btn-xs").
             click(function (e) {
                 // $(this) is the button that was clicked.
                 var that = $(this);
                 // 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 @@ 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);
diff --git a/IPython/html/static/tree/js/sessionlist.js b/IPython/html/static/tree/js/sessionlist.js
index 2f3e62302..34ef78c8d 100644
--- a/IPython/html/static/tree/js/sessionlist.js
+++ b/IPython/html/static/tree/js/sessionlist.js
@@ -40,10 +40,7 @@ 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);

From 036c47d03208e688a1a36483ba53394eb7fefb80 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 12 Nov 2014 17:15:52 -0800
Subject: [PATCH 4/5] set min-width on tree-list buttons

avoids misaligned buttons when the content changes
---
 IPython/html/static/style/style.min.css | 3 +++
 IPython/html/static/tree/less/tree.less | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 2430e1f85..8a9a28bcf 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -8070,6 +8070,9 @@ ul.breadcrumb span {
 .item_buttons {
   line-height: 1em;
 }
+.item_buttons .btn {
+  min-width: 13ex;
+}
 .toolbar_info {
   height: 24px;
   line-height: 24px;
diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less
index fe1374885..b1d22cf85 100644
--- a/IPython/html/static/tree/less/tree.less
+++ b/IPython/html/static/tree/less/tree.less
@@ -103,6 +103,9 @@ ul.breadcrumb {
 
 .item_buttons {
     line-height: 1em;
+    .btn {
+        min-width: 13ex;
+    }
 }
 
 .toolbar_info {

From 5eff21f3c655ea4cb7833f97c3e7805f08fd510e Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 17 Nov 2014 10:14:21 -0800
Subject: [PATCH 5/5] simplify NotebookList.duplicate with recent changes

- contents service + futures
- remove no-longer-necessary parent_item
---
 IPython/html/static/tree/js/notebooklist.js | 27 ++++-----------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
index a592aeb7c..0447e615f 100644
--- a/IPython/html/static/tree/js/notebooklist.js
+++ b/IPython/html/static/tree/js/notebooklist.js
@@ -307,7 +307,6 @@ define([
                 $.ajax(url, settings);
                 return false;
             });
-        // var new_buttons = item.find('a'); // shutdown_button;
         item.find(".item_buttons").append(shutdown_button);
     };
 
@@ -317,11 +316,8 @@ define([
             click(function (e) {
                 // $(this) is the button that was clicked.
                 var that = $(this);
-                // 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 name = parent_item.data('name');
-                var path = parent_item.data('path');
+                var name = item.data('name');
+                var path = item.data('path');
                 var message = 'Are you sure you want to duplicate ' + name + '?';
                 var copy_from = {copy_from : path};
                 IPython.dialog.modal({
@@ -331,22 +327,9 @@ define([
                         Duplicate : {
                             class: "btn-primary",
                             click: function() {
-                                var settings = {
-                                    processData : false,
-                                    cache : false,
-                                    type : "POST",
-                                    dataType : "json",
-                                    data : JSON.stringify(copy_from),
-                                    success : function () {
-                                        notebooklist.load_list();
-                                    }
-                                };
-                                var url = utils.url_join_encode(
-                                    notebooklist.base_url,
-                                    'api/contents',
-                                    notebooklist.notebook_path
-                                );
-                                $.ajax(url, settings);
+                                notebooklist.contents.copy(path, notebooklist.notebook_path).then(function () {
+                                    notebooklist.load_list();
+                                });
                             }
                         },
                         Cancel : {}