connect close_and_halt via id_actions_dict

notebook/static/notebook/js/menubar.js

@@ -231,10 +231,6 @@ define([
             }
         });
 
-        this.element.find('#kill_and_exit').click(function () {
-            that.notebook.close_and_halt();
-        });
-
         // View
         this._add_celltoolbar_list();
 
@@ -254,6 +250,7 @@ define([
             '#restart_kernel': 'confirm-restart-kernel',
             '#restart_clear_output': 'confirm-restart-kernel-and-clear-output',
             '#restart_run_all': 'confirm-restart-kernel-and-run-all-cells',
+            '#close_and_halt': 'close-and-halt',
             '#int_kernel': 'interrupt-kernel',
             '#cut_cell': 'cut-cell',
             '#copy_cell': 'copy-cell',

notebook/templates/notebook.html

@@ -124,7 +124,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                             title="{% trans %}Trust the output of this notebook{% endtrans %}">
                             <a href="#" >{% trans %}Trust Notebook{% endtrans %}</a></li>
                         <li class="divider"></li>
-                        <li id="kill_and_exit"
+                        <li id="close_and_halt"
                             title="{% trans %}Shutdown this notebook's kernel, and close this window{% endtrans %}">
                             <a href="#" >{% trans %}Close and Halt{% endtrans %}</a></li>
                     </ul>