fix restart/interrupt kernel buttons

IPython/html/services/kernels/handlers.py

@@ -77,7 +77,7 class KernelActionHandler(IPythonHandler):
         if action == 'restart':
             km.restart_kernel(kernel_id)
             model = km.kernel_model(kernel_id,self.ws_url)
-            self.set_header('Location', '{0}kernels/{1}'.format(self.base_kernel_url, kernel_id))
+            self.set_header('Location', '{0}api/kernels/{1}'.format(self.base_kernel_url, kernel_id))
             self.write(jsonapi.dumps(model))
         self.finish()
 

IPython/html/static/notebook/js/maintoolbar.js

@@ -112,7 +112,7 var IPython = (function (IPython) {
                     label : 'Interrupt',
                     icon : 'icon-stop',
                     callback : function () {
-                        IPython.notebook.kernel.interrupt();
+                        IPython.notebook.session.interrupt_kernel();
                         }
                 }
             ],'run_int');

IPython/html/static/notebook/js/menubar.js

@@ -227,7 +227,7 var IPython = (function (IPython) {
         });
         // Kernel
         this.element.find('#int_kernel').click(function () {
-            IPython.notebook.kernel.interrupt();
+            IPython.notebook.session.interrupt_kernel();
         });
         this.element.find('#restart_kernel').click(function () {
             IPython.notebook.restart_kernel();

IPython/html/static/notebook/js/notebook.js

@@ -311,7 +311,7 var IPython = (function (IPython) {
                 return false;
             } else if (event.which === 73 && that.control_key_active) {
                 // Interrupt kernel = i
-                that.kernel.interrupt();
+                that.session.interrupt_kernel();
                 that.control_key_active = false;
                 return false;
             } else if (event.which === 190 && that.control_key_active) {
@@ -1395,7 +1395,30 var IPython = (function (IPython) {
         this.session.start();
     };
 
-
+    /**
+     * Prompt the user to restart the IPython kernel.
+     * 
+     * @method restart_kernel
+     */
+    Notebook.prototype.restart_kernel = function () {
+        var that = this;
+        IPython.dialog.modal({
+            title : "Restart kernel or continue running?",
+            body : $("<p/>").html(
+                'Do you want to restart the current kernel?  You will lose all variables defined in it.'
+            ),
+            buttons : {
+                "Continue running" : {},
+                "Restart" : {
+                    "class" : "btn-danger",
+                    "click" : function() {
+                        that.session.restart_kernel();
+                    }
+                }
+            }
+        });
+    };
+    
     /**
      * Run the selected cell.
      * 

IPython/html/static/services/sessions/js/session.js

@@ -59,27 +59,13 var IPython = (function (IPython) {
      * @method restart_kernel
      */
     Session.prototype.restart_kernel = function () {
-        var that = this;
-        var dialog = $('<div/>');
-        dialog.html('Do you want to restart the current kernel?  You will lose all variables defined in it.');
-        $(document).append(dialog);
-        dialog.dialog({
-            resizable: false,
-            modal: true,
-            title: "Restart kernel or continue running?",
-            closeText: '',
-            buttons : {
-                "Restart": function () {
-                    that.kernel.restart();
-                    $(this).dialog('close');
-                },
-                "Continue running": function () {
-                    $(this).dialog('close');
-                }
-            }
-        });
+        this.kernel.restart();
     };
     
+    Session.prototype.interrupt_kernel = function() {
+        this.kernel.interrupt();
+    }
+    
     IPython.Session = Session;