Merge pull request #4662 from ellisonbg/menu-cleanup

Menu cleanup

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

@@ -418,26 +418,30 b' var IPython = (function (IPython) {'
     };
 
 
-    CodeCell.prototype.collapse = function () {
+    CodeCell.prototype.collapse_output = function () {
         this.collapsed = true;
         this.output_area.collapse();
     };
 
 
-    CodeCell.prototype.expand = function () {
+    CodeCell.prototype.expand_output = function () {
         this.collapsed = false;
         this.output_area.expand();
+        this.output_area.unscroll_area();
     };
 
+    CodeCell.prototype.scroll_output = function () {
+        this.output_area.expand();
+        this.output_area.scroll_if_long();
+    };
 
     CodeCell.prototype.toggle_output = function () {
         this.collapsed = Boolean(1 - this.collapsed);
         this.output_area.toggle_output();
     };
 
-
     CodeCell.prototype.toggle_output_scroll = function () {
-    this.output_area.toggle_scroll();
+        this.output_area.toggle_scroll();
     };
 
 
@@ -510,6 +514,7 b' var IPython = (function (IPython) {'
 
     CodeCell.prototype.clear_output = function (wait) {
         this.output_area.clear_output(wait);
+        this.set_input_prompt();
     };
 
 
@@ -534,9 +539,9 b' var IPython = (function (IPython) {'
             this.output_area.fromJSON(data.outputs);
             if (data.collapsed !== undefined) {
                 if (data.collapsed) {
-                    this.collapse();
+                    this.collapse_output();
                 } else {
-                    this.expand();
+                    this.expand_output();
                 }
             }
         }

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

@@ -451,7 +451,7 b' var IPython = (function (IPython) {'
             }
         },
         'shift+o' : {
-            help    : 'toggle output scroll',
+            help    : 'toggle output scrolling',
             help_index : 'gc',
             handler : function (event) {
                 IPython.notebook.toggle_output_scroll();

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

@@ -110,6 +110,14 b' var IPython = (function (IPython) {'
                     callback : function () {
                         IPython.notebook.session.interrupt_kernel();
                         }
+                },
+                {
+                    id : 'repeat_b',
+                    label : 'Restart Kernel',
+                    icon : 'icon-repeat',
+                    callback : function () {
+                        IPython.notebook.restart_kernel();
+                        }
                 }
             ],'run_int');
     };

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

@@ -178,12 +178,6 b' var IPython = (function (IPython) {'
         this.element.find('#move_cell_down').click(function () {
             IPython.notebook.move_cell_down();
         });
-        this.element.find('#select_previous').click(function () {
-            IPython.notebook.select_prev();
-        });
-        this.element.find('#select_next').click(function () {
-            IPython.notebook.select_next();
-        });
         this.element.find('#edit_nb_metadata').click(function () {
             IPython.notebook.edit_metadata();
         });
@@ -252,21 +246,27 b' var IPython = (function (IPython) {'
         this.element.find('#to_heading6').click(function () {
             IPython.notebook.to_heading(undefined, 6);
         });
-        this.element.find('#toggle_output').click(function () {
+        
+        this.element.find('#toggle_current_output').click(function () {
             IPython.notebook.toggle_output();
         });
-        this.element.find('#collapse_all_output').click(function () {
-            IPython.notebook.collapse_all_output();
+        this.element.find('#toggle_current_output_scroll').click(function () {
+            IPython.notebook.toggle_output_scroll();
+        });
+        this.element.find('#clear_current_output').click(function () {
+            IPython.notebook.clear_output();
         });
-        this.element.find('#scroll_all_output').click(function () {
-            IPython.notebook.scroll_all_output();
+        
+        this.element.find('#toggle_all_output').click(function () {
+            IPython.notebook.toggle_all_output();
         });
-        this.element.find('#expand_all_output').click(function () {
-            IPython.notebook.expand_all_output();
+        this.element.find('#toggle_all_output_scroll').click(function () {
+            IPython.notebook.toggle_all_output_scroll();
         });
         this.element.find('#clear_all_output').click(function () {
             IPython.notebook.clear_all_output();
         });
+        
         // Kernel
         this.element.find('#int_kernel').click(function () {
             IPython.notebook.session.interrupt_kernel();

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

@@ -1165,122 +1165,181 b' var IPython = (function (IPython) {'
     /**
      * Hide a cell's output.
      * 
-     * @method collapse
+     * @method collapse_output
      * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.collapse = function (index) {
+    Notebook.prototype.collapse_output = function (index) {
         var i = this.index_or_selected(index);
-        this.get_cell(i).collapse();
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.collapse_output();
+            this.set_dirty(true);
+        }
+    };
+
+    /**
+     * Hide each code cell's output area.
+     * 
+     * @method collapse_all_output
+     */
+    Notebook.prototype.collapse_all_output = function () {
+        $.map(this.get_cells(), function (cell, i) {
+            if (cell instanceof IPython.CodeCell) {
+                cell.collapse_output();
+            }
+        });
+        // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
     /**
      * Show a cell's output.
      * 
-     * @method expand
+     * @method expand_output
      * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.expand = function (index) {
+    Notebook.prototype.expand_output = function (index) {
         var i = this.index_or_selected(index);
-        this.get_cell(i).expand();
-        this.set_dirty(true);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.expand_output();
+            this.set_dirty(true);
+        }
     };
 
-    /** Toggle whether a cell's output is collapsed or expanded.
+    /**
+     * Expand each code cell's output area, and remove scrollbars.
      * 
-     * @method toggle_output
-     * @param {Number} index A cell's numeric index
+     * @method expand_all_output
      */
-    Notebook.prototype.toggle_output = function (index) {
-        var i = this.index_or_selected(index);
-        this.get_cell(i).toggle_output();
+    Notebook.prototype.expand_all_output = function () {
+        $.map(this.get_cells(), function (cell, i) {
+            if (cell instanceof IPython.CodeCell) {
+                cell.expand_output();
+            }
+        });
+        // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
     /**
-     * Toggle a scrollbar for long cell outputs.
+     * Clear the selected CodeCell's output area.
      * 
-     * @method toggle_output_scroll
+     * @method clear_output
      * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.toggle_output_scroll = function (index) {
+    Notebook.prototype.clear_output = function (index) {
         var i = this.index_or_selected(index);
-        this.get_cell(i).toggle_output_scroll();
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.clear_output();
+            this.set_dirty(true);
+        }
     };
 
     /**
-     * Hide each code cell's output area.
+     * Clear each code cell's output area.
      * 
-     * @method collapse_all_output
+     * @method clear_all_output
      */
-    Notebook.prototype.collapse_all_output = function () {
-        var ncells = this.ncells();
-        var cells = this.get_cells();
-        for (var i=0; i<ncells; i++) {
-            if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].output_area.collapse();
+    Notebook.prototype.clear_all_output = function () {
+        $.map(this.get_cells(), function (cell, i) {
+            if (cell instanceof IPython.CodeCell) {
+                cell.clear_output();
             }
-        };
-        // this should not be set if the `collapse` key is removed from nbformat
+        });
         this.set_dirty(true);
     };
 
     /**
+     * Scroll the selected CodeCell's output area.
+     * 
+     * @method scroll_output
+     * @param {Number} index A cell's numeric index
+     */
+    Notebook.prototype.scroll_output = function (index) {
+        var i = this.index_or_selected(index);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.scroll_output();
+            this.set_dirty(true);
+        }
+    };
+
+    /**
      * Expand each code cell's output area, and add a scrollbar for long output.
      * 
      * @method scroll_all_output
      */
     Notebook.prototype.scroll_all_output = function () {
-        var ncells = this.ncells();
-        var cells = this.get_cells();
-        for (var i=0; i<ncells; i++) {
-            if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].output_area.expand();
-                cells[i].output_area.scroll_if_long();
+        $.map(this.get_cells(), function (cell, i) {
+            if (cell instanceof IPython.CodeCell) {
+                cell.scroll_output();
             }
-        };
+        });
         // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
+    /** Toggle whether a cell's output is collapsed or expanded.
+     * 
+     * @method toggle_output
+     * @param {Number} index A cell's numeric index
+     */
+    Notebook.prototype.toggle_output = function (index) {
+        var i = this.index_or_selected(index);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.toggle_output();
+            this.set_dirty(true);
+        }
+    };
+
     /**
-     * Expand each code cell's output area, and remove scrollbars.
+     * Hide/show the output of all cells.
      * 
-     * @method expand_all_output
+     * @method toggle_all_output
      */
-    Notebook.prototype.expand_all_output = function () {
-        var ncells = this.ncells();
-        var cells = this.get_cells();
-        for (var i=0; i<ncells; i++) {
-            if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].output_area.expand();
-                cells[i].output_area.unscroll_area();
+    Notebook.prototype.toggle_all_output = function () {
+        $.map(this.get_cells(), function (cell, i) {
+            if (cell instanceof IPython.CodeCell) {
+                cell.toggle_output();
             }
-        };
+        });
         // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
     /**
-     * Clear each code cell's output area.
+     * Toggle a scrollbar for long cell outputs.
      * 
-     * @method clear_all_output
+     * @method toggle_output_scroll
+     * @param {Number} index A cell's numeric index
      */
-    Notebook.prototype.clear_all_output = function () {
-        var ncells = this.ncells();
-        var cells = this.get_cells();
-        for (var i=0; i<ncells; i++) {
-            if (cells[i] instanceof IPython.CodeCell) {
-                cells[i].clear_output();
-                // Make all In[] prompts blank, as well
-                // TODO: make this configurable (via checkbox?)
-                cells[i].set_input_prompt();
+    Notebook.prototype.toggle_output_scroll = function (index) {
+        var i = this.index_or_selected(index);
+        var cell = this.get_cell(i);
+        if (cell !== null && (cell instanceof IPython.CodeCell)) {
+            cell.toggle_output_scroll();
+            this.set_dirty(true);
+        }
+    };
+
+    /**
+     * Toggle the scrolling of long output on all cells.
+     * 
+     * @method toggle_all_output_scrolling
+     */
+    Notebook.prototype.toggle_all_output_scroll = function () {
+        $.map(this.get_cells(), function (cell, i) {
+            if (cell instanceof IPython.CodeCell) {
+                cell.toggle_output_scroll();
             }
-        };
+        });
+        // this should not be set if the `collapse` key is removed from nbformat
         this.set_dirty(true);
     };
 
-
     // Other cell functions: line numbers, ...
 
     /**

IPython/html/templates/notebook.html

@@ -51,7 +51,7 b' class="notebook_app"'
     <div class="container">
     <ul id="menus" class="nav">
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">File</a>
-            <ul class="dropdown-menu">
+            <ul id="file_menu" class="dropdown-menu">
                 <li id="new_notebook"
                     title="Make a new notebook (Opens a new window)">
                     <a href="#">New</a></li>
@@ -94,7 +94,7 b' class="notebook_app"'
             </ul>
         </li>
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Edit</a>
-            <ul class="dropdown-menu">
+            <ul id="edit_menu" class="dropdown-menu">
                 <li id="cut_cell"><a href="#">Cut Cell</a></li>
                 <li id="copy_cell"><a href="#">Copy Cell</a></li>
                 <li id="paste_cell_above" class="disabled"><a href="#">Paste Cell Above</a></li>
@@ -110,14 +110,11 b' class="notebook_app"'
                 <li id="move_cell_up"><a href="#">Move Cell Up</a></li>
                 <li id="move_cell_down"><a href="#">Move Cell Down</a></li>
                 <li class="divider"></li>
-                <li id="select_previous"><a href="#">Select Previous Cell</a></li>
-                <li id="select_next"><a href="#">Select Next Cell</a></li>
-                <li class="divider"></li>
                 <li id="edit_nb_metadata"><a href="#">Edit Notebook Metadata</a></li>
             </ul>
         </li>
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">View</a>
-            <ul class="dropdown-menu">
+            <ul id="view_menu" class="dropdown-menu">
                 <li id="toggle_header"
                     title="Show/Hide the IPython Notebook logo and notebook title (above menu bar)">
                     <a href="#">Toggle Header</a></li>
@@ -127,7 +124,7 b' class="notebook_app"'
             </ul>
         </li>
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Insert</a>
-            <ul class="dropdown-menu">
+            <ul id="insert_menu" class="dropdown-menu">
                 <li id="insert_cell_above"
                     title="Insert an empty Code cell above the currently active cell">
                     <a href="#">Insert Cell Above</a></li>
@@ -137,7 +134,7 b' class="notebook_app"'
             </ul>
         </li>
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Cell</a>
-            <ul class="dropdown-menu">
+            <ul id="cell_menu" class="dropdown-menu">
                 <li id="run_cell" title="Run this cell, and move cursor to the next one">
                     <a href="#">Run</a></li>
                 <li id="run_cell_select_below" title="Run this cell, select below">
@@ -173,23 +170,42 b' class="notebook_app"'
                     </ul>
                 </li>
                 <li class="divider"></li>
-                <li id="toggle_output"
-                    title="Show/Hide the output portion of a Code cell">
-                    <a href="#">Toggle Current Output</a></li>
+                <li id="current_outputs" class="dropdown-submenu"><a href="#">Current Output</a>
+                    <ul class="dropdown-menu">
+                        <li id="toggle_current_output"
+                            title="Hide/Show the output of the current cell">
+                            <a href="#">Toggle</a>
+                        </li>
+                        <li id="toggle_current_output_scroll"
+                            title="Scroll the output of the current cell">
+                            <a href="#">Toggle Scrolling</a>
+                        </li>
+                        <li id="clear_current_output"
+                            title="Clear the output of the current cell">
+                            <a href="#">Clear</a>
+                        </li>
+                    </ul>
+                </li>
                 <li id="all_outputs" class="dropdown-submenu"><a href="#">All Output</a>
                     <ul class="dropdown-menu">
-                        <li id="expand_all_output"><a href="#">Expand</a></li>
-                        <li id="scroll_all_output"><a href="#">Scroll Long</a></li>
-                        <li id="collapse_all_output"><a href="#">Collapse</a></li>
+                        <li id="toggle_all_output"
+                            title="Hide/Show the output of all cells">
+                            <a href="#">Toggle</a>
+                        </li>
+                        <li id="toggle_all_output_scroll"
+                            title="Scroll the output of all cells">
+                            <a href="#">Toggle Scrolling</a>
+                        </li>
                         <li id="clear_all_output"
-                            title="Remove the output portion of all Code cells">
-                            <a href="#">Clear</a></li>
+                            title="Clear the output of all cells">
+                            <a href="#">Clear</a>
+                        </li>
                     </ul>
                 </li>
             </ul>
         </li>
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Kernel</a>
-            <ul class="dropdown-menu">
+            <ul id="kernel_menu" class="dropdown-menu">
                 <li id="int_kernel"
                     title="Send KeyboardInterrupt (CTRL-C) to the Kernel">
                     <a href="#">Interrupt</a></li>
@@ -199,7 +215,7 b' class="notebook_app"'
             </ul>
         </li>
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Help</a>
-            <ul class="dropdown-menu" title="Opens in a new window">
+            <ul id="help_menu" class="dropdown-menu">
                 <li><a href="http://ipython.org/documentation.html" target="_blank">IPython Help</a></li>
                 <li><a href="http://ipython.org/ipython-doc/stable/interactive/notebook.html" target="_blank">Notebook Help</a></li>
                 <li id="keyboard_shortcuts" title="Opens a tooltip with all keyboard shortcuts"><a href="#">Keyboard Shortcuts</a></li>