From b2d9b9beb83508fcb7e2b29206cac8b8ffccd647 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Tue, 11 Jun 2013 11:14:10 -0700
Subject: [PATCH] bootstrapify delete dialog

---
 .../html/notebook/static/style/style.min.css  |  4 +-
 .../notebook/static/tree/js/notebooklist.js   | 45 +++++++++----------
 .../html/notebook/static/tree/less/tree.less  |  7 +--
 .../html/notebook/templates/tree.html         |  1 +
 4 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css
index 40d564f8e..99cc792c7 100644
--- a/IPython/frontend/html/notebook/static/style/style.min.css
+++ b/IPython/frontend/html/notebook/static/style/style.min.css
@@ -1411,9 +1411,7 @@ ul.icons-ul{list-style-type:none;text-indent:-0.7142857142857143em;margin-left:2
 .list_container>div:last-child{border:none;}
 .list_item:hover .list_item{background-color:#ddd;}
 .list_container>div>span,.list_container>div>div{padding:8px;}
-.cluster_list_item>a{}
-.notebook_item a{text-decoration:none;}
-.action_col{}
+.list_item a{text-decoration:none;}
 input.nbname_input{height:15px;}
 .highlight_text{color:blue;}
 #project_name>.breadcrumb{padding:0px;margin-bottom:0px;background-color:transparent;font-weight:bold;}
diff --git a/IPython/frontend/html/notebook/static/tree/js/notebooklist.js b/IPython/frontend/html/notebook/static/tree/js/notebooklist.js
index 3c4de865d..3d4de3969 100644
--- a/IPython/frontend/html/notebook/static/tree/js/notebooklist.js
+++ b/IPython/frontend/html/notebook/static/tree/js/notebooklist.js
@@ -213,7 +213,7 @@ var IPython = (function (IPython) {
     NotebookList.prototype.add_delete_button = function (item) {
         var new_buttons = $('<span/>').addClass("btn-group pull-right");
         var notebooklist = this;
-        var delete_button = $("<button/>").text("Delete").addClass("btn btn-mini").
+        var delete_button = $("<button/>").text("Delete").addClass("btn btn-mini btn-danger").
             click(function (e) {
                 // $(this) is the button that was clicked.
                 var that = $(this);
@@ -222,31 +222,28 @@ var IPython = (function (IPython) {
                 var parent_item = that.parents('div.list_item');
                 var nbname = parent_item.data('nbname');
                 var notebook_id = parent_item.data('notebook_id');
-                var dialog = $('<div/>');
-                dialog.html('Are you sure you want to permanently delete the notebook: ' + nbname + '?');
-                parent_item.append(dialog);
-                dialog.dialog({
-                    resizable: false,
-                    modal: true,
-                    title: "Delete notebook",
+                var message = 'Are you sure you want to permanently delete the notebook: ' + nbname + '?';
+                IPython.dialog.modal({
+                    title : "Delete notebook",
+                    body : message,
                     buttons : {
-                        "Delete": function () {
-                            var settings = {
-                                processData : false,
-                                cache : false,
-                                type : "DELETE",
-                                dataType : "json",
-                                success : function (data, status, xhr) {
-                                    parent_item.remove();
-                                }
-                            };
-                            var url = notebooklist.baseProjectUrl() + 'notebooks/' + notebook_id;
-                            $.ajax(url, settings);
-                            $(this).dialog('close');
+                        Delete : {
+                            class: "btn-danger",
+                            click: function() {
+                                var settings = {
+                                    processData : false,
+                                    cache : false,
+                                    type : "DELETE",
+                                    dataType : "json",
+                                    success : function (data, status, xhr) {
+                                        parent_item.remove();
+                                    }
+                                };
+                                var url = notebooklist.baseProjectUrl() + 'notebooks/' + notebook_id;
+                                $.ajax(url, settings);
+                            }
                         },
-                        "Cancel": function () {
-                            $(this).dialog('close');
-                        }
+                        Cancel : {}
                     }
                 });
                 return false;
diff --git a/IPython/frontend/html/notebook/static/tree/less/tree.less b/IPython/frontend/html/notebook/static/tree/less/tree.less
index cc1754dcf..33eb755b3 100644
--- a/IPython/frontend/html/notebook/static/tree/less/tree.less
+++ b/IPython/frontend/html/notebook/static/tree/less/tree.less
@@ -60,11 +60,7 @@
 }
 
 
-.cluster_list_item > a {
-/*    color: @textColor !important;*/
-}
-
-.notebook_item a {
+.list_item a {
     text-decoration: none;
 }
 
@@ -78,7 +74,6 @@
 }
 
 .action_col {
-/*    text-align: right;*/
 }
 
 input.nbname_input {
diff --git a/IPython/frontend/html/notebook/templates/tree.html b/IPython/frontend/html/notebook/templates/tree.html
index 3bd67070c..dc5df6bfd 100644
--- a/IPython/frontend/html/notebook/templates/tree.html
+++ b/IPython/frontend/html/notebook/templates/tree.html
@@ -85,6 +85,7 @@ data-read-only={{read_only}}
 
 {% block script %}
     {{super()}}
+    <script src="{{static_url("base/js/dialog.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>