Pager is working again.

IPython/frontend/html/notebook/static/css/notebook.css

@@ -1,253 +1,253 b''
 /**
  * HTML5 ✰ Boilerplate
  *
  * style.css contains a reset, font normalization and some base styles.
  *
  * Credit is left where credit is due.
  * Much inspiration was taken from these projects:
  * - yui.yahooapis.com/2.8.1/build/base/base.css
  * - camendesign.com/design/
  * - praegnanz.de/weblog/htmlcssjs-kickstart
  */
 
 
 /**
  * html5doctor.com Reset Stylesheet (Eric Meyer's Reset Reloaded + HTML5 baseline)
  * v1.6.1 2010-09-17 | Authors: Eric Meyer & Richard Clark
  * html5doctor.com/html-5-reset-stylesheet/
  */
 
 html, body, div, span, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
 small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
 /*  font-size: 100%;*/
   font: inherit;
   vertical-align: baseline;
 }
 
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block;
 }
 
 blockquote, q { quotes: none; }
 
 blockquote:before, blockquote:after,
 q:before, q:after { content: ""; content: none; }
 
 ins { background-color: #ff9; color: #000; text-decoration: none; }
 
 mark { background-color: #ff9; color: #000; font-style: italic; font-weight: bold; }
 
 del { text-decoration: line-through; }
 
 abbr[title], dfn[title] { border-bottom: 1px dotted; cursor: help; }
 
 table { border-collapse: collapse; border-spacing: 0; }
 
 hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
 
 input, select { vertical-align: middle; }
 
 body {
     background-color: white;
     /* This won't propagate to all children so we also set it below */
     font-size: 12pt;
     /* This makes sure that the body covers the entire window and needs to
        be in a different element than the display: box in wrapper below */
     position: absolute;
     left: 0px;
     right: 0px;
     top: 0px;
     bottom: 0px;
     overflow: hidden;
 }
 
 
 span#ipython_notebook h1 {
     font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
     font-size: 22pt;
     height: 35px;
     padding: 5px;
     margin: 0px;
 
 }
 
 div#tools {
     font-size: 11pt;
 }
 
 span#kernel_status {
     position: absolute;
     top: 12%;
     right: 10px;
 	font-weight: bold;
 }
 
 .status_idle {
     color: gray;
 }
 
 .status_busy {
     color: red;
 }
 
 .status_restarting {
     color: black;
 }
 
 div#notebook_app {
     width: 100%;
     position: relative;
 }
 
 div#left_panel {
     width: 200px;
     min-height: 300px;
     overflow-y: auto;
     top: 0px;
     left: 0px;
     margin: 0px;
     padding: 0px;
     position: absolute;
 }
 
 div#left_panel_splitter {
-    width: 7px;
+    width: 8px;
     top: 0px;
     left: 202px;
     margin: 0px;
     padding: 0px;
     position: absolute;
 }
 
 div#notebook_panel {
-    margin: 0px 0px 0px 211px;
+    margin: 0px 0px 0px 209px;
     padding: 0px;
 }
 
 div#notebook {
     overflow-y: scroll;
     overflow-x: auto;
     width: 100%;
-    padding: 0px 0px;
+    padding: 0px 15px 15px 15px;
     margin: 0px
     background-color: white;
     font-size: 12pt;
 }
 
 div#pager_splitter {
-    height: 7px;
+    height: 8px;
 }
 
 div#pager {
     height: 200px;
     overflow: auto;
 }
 
 .monospace-font {
     font-family: monospace;
     font-size: 12pt;
 }
 
 div.cell {
     width: 100%;
-    padding: 0px;
+    padding: 5px;
     /* This acts as a spacer between cells, that is outside the border */
     margin: 15px 0px 15px 0px;
 }
 
 div.code_cell {
     background-color: white;
 }
 
 div.prompt {
     width: 90px;
     padding: 0px;
     margin: 0px;
 }
 
 div.input_prompt {
     color: navy;
 }
 
 div.output {
     /* This is a spacer between the input and output of each cell */
     margin-top: 15px;
 }
 
 div.output_prompt {
     color: darkred;
 }
 
 div.output_area {
     text-align: left;
     color: black;
 }
 
 div.output_latex {
     /* Slightly bigger than the rest of the notebook */
     font-size: 13pt;
 }
 
 div.output_png {
 }
 
 div.text_cell {
     background-color: white;
 }
 
 textarea.text_cell_input {
     /* Slightly bigger than the rest of the notebook */
     font-size: 13pt;
     outline: none;
     resize: none;
     width:  inherit;
     border-style: none;
     padding: 0px;
     margin: 0px;
     color: black;
 }
 
 div.text_cell_render {
     font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
     /* Slightly bigger than the rest of the notebook */
     font-size: 13pt;
     outline: none;
     resize: none;
     width:  inherit;
     border-style: none;
     padding: 5px;
     color: black;
 }
 
 div.text_cell_render em {font-style: italic;}
 div.text_cell_render strong {font-weight: bold;}
 div.text_cell_render u {text-decoration: underline;}
 div.text_cell_render :link { text-decoration: underline }
 div.text_cell_render :visited { text-decoration: underline }
 div.text_cell_render h1 {font-size: 2.0em; margin: .67em 0; font-weight: bold;}
 div.text_cell_render h2 {font-size: 1.5em; margin: .75em 0; font-weight: bold;}
 div.text_cell_render h3 {font-size: 1.17em; margin: .83em 0; font-weight: bold;}
 div.text_cell_render h4 {margin: 1.12em 0; font-weight: bold;}
 div.text_cell_render h5 {font-size: .83em; margin: 1.5em 0; font-weight: bold;}
 div.text_cell_render h6 {font-size: .75em; margin: 1.67em 0; font-weight: bold;}
 div.text_cell_render ul {list-style:disc; margin-left: 40px;}
 div.text_cell_render ul ul {list-style:square; margin-left: 40px;}
 div.text_cell_render ul ul ul {list-style:circle; margin-left: 40px;}
 div.text_cell_render ol {list-style:upper-roman; margin-left: 40px;}
 div.text_cell_render ol ol {list-style:upper-alpha;}
 div.text_cell_render ol ol ol {list-style:decimal;}
 div.text_cell_render ol ol ol ol {list-style:lower-alpha;}
 div.text_cell_render ol ol ol ol ol {list-style:lower-roman;}
 
 

IPython/frontend/html/notebook/static/js/cell.js

@@ -1,80 +1,63 b''
 
 //============================================================================
 // Cell
 //============================================================================
 
 var IPython = (function (IPython) {
 
     var utils = IPython.utils;
 
     var Cell = function (notebook) {
         this.notebook = notebook;
         this.selected = false;
         this.element;
         this.create_element();
         if (this.element !== undefined) {
             this.element.data("cell", this);
             this.bind_events();
         }
         this.cell_id = utils.uuid();
     };
 
 
-    Cell.prototype.grow = function(element) {
-        // Grow the cell by hand. This is used upon reloading from JSON, when the
-        // autogrow handler is not called.
-        var dom = element.get(0);
-        var lines_count = 0;
-        // modified split rule from
-        // http://stackoverflow.com/questions/2035910/how-to-get-the-number-of-lines-in-a-textarea/2036424#2036424
-        var lines = dom.value.split(/\r|\r\n|\n/);
-        lines_count = lines.length;
-        if (lines_count >= 1) {
-            dom.rows = lines_count;
-        } else {
-            dom.rows = 1;
-        }
-    };
-
-
     Cell.prototype.select = function () {
         this.element.addClass('ui-widget-content ui-corner-all');
         this.selected = true;
         // TODO: we need t test across browsers to see if both of these are needed.
         // In the meantime, there should not be any harm in having them both.
         this.element.find('textarea').trigger('focusin');
         this.element.find('textarea').trigger('focus');
     };
 
 
     Cell.prototype.unselect = function () {
         this.element.removeClass('ui-widget-content ui-corner-all');
         this.selected = false;
     };
 
 
     Cell.prototype.bind_events = function () {
         var that = this;
         var nb = that.notebook
         that.element.click(function (event) {
             if (that.selected === false) {
                 nb.select(nb.find_cell_index(that));
             };
         });
         that.element.focusin(function (event) {
             if (that.selected === false) {
                 nb.select(nb.find_cell_index(that));
             };
         });
     };
 
 
     // Subclasses must implement create_element.
     Cell.prototype.create_element = function () {};
 
     IPython.Cell = Cell;
 
     return IPython;
 
 }(IPython));
 

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

@@ -1,201 +1,201 b''
 
 //============================================================================
 // CodeCell
 //============================================================================
 
 var IPython = (function (IPython) {
 
     var utils = IPython.utils;
 
     var CodeCell = function (notebook) {
         this.code_mirror = null;
         this.input_prompt_number = ' ';
         IPython.Cell.apply(this, arguments);
     };
 
 
     CodeCell.prototype = new IPython.Cell();
 
 
     CodeCell.prototype.create_element = function () {
-        var cell =  $('<div></div>').addClass('cell code_cell vbox');
+        var cell =  $('<div></div>').addClass('cell border-box-sizing code_cell vbox');
         var input = $('<div></div>').addClass('input hbox');
         input.append($('<div/>').addClass('prompt input_prompt monospace-font'));
         var input_area = $('<div/>').addClass('input_area box-flex1');
         this.code_mirror = CodeMirror(input_area.get(0), {
             indentUnit : 4,
             enterMode : 'flat',
             tabMode: 'shift'
         });
         input.append(input_area);
         var output = $('<div></div>').addClass('output vbox');
         cell.append(input).append(output);
         this.element = cell;
         this.collapse()
     };
 
 
     CodeCell.prototype.select = function () {
         IPython.Cell.prototype.select.apply(this);
         this.code_mirror.focus();
     };
 
 
     CodeCell.prototype.append_pyout = function (data, n) {
         var toinsert = $("<div/>").addClass("output_area output_pyout hbox monospace-font");
         toinsert.append($('<div/>').
             addClass('prompt output_prompt').
             html('Out[' + n + ']:')
         );
         this.append_display_data(data, toinsert);
         toinsert.children().last().addClass("box_flex1");
         this.element.find("div.output").append(toinsert);
         // If we just output latex, typeset it.
         if (data["text/latex"] !== undefined) {
             MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
         };
     };
 
 
     CodeCell.prototype.append_pyerr = function (ename, evalue, tb) {
         var s = '';
         var len = tb.length;
         for (var i=0; i<len; i++) {
             s = s + tb[i] + '\n';
         }
         s = s + '\n';
         this.append_stream(s);
     };
 
 
     CodeCell.prototype.append_display_data = function (data, element) {
         if (data["text/latex"] !== undefined) {
             this.append_latex(data["text/latex"], element);
             // If it is undefined, then we just appended to div.output, which
             // makes the latex visible and we can typeset it. The typesetting
             // has to be done after the latex is on the page.
             if (element === undefined) {
                 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
             };
         } else if (data["image/svg+xml"] !== undefined) {
             this.append_svg(data["image/svg+xml"], element);
         } else if (data["image/png"] !== undefined) {
             this.append_png(data["image/png"], element);
         } else if (data["text/plain"] !== undefined) {
             this.append_stream(data["text/plain"], element);
         };
         return element;
     };
 
 
     CodeCell.prototype.append_stream = function (data, element) {
         element = element || this.element.find("div.output");
         var toinsert = $("<div/>").addClass("output_area output_stream monospace-font");
         toinsert.append($("<pre/>").addClass("monospace-font").html(utils.fixConsole(data)));
         element.append(toinsert);
         return element;
     };
 
 
     CodeCell.prototype.append_svg = function (svg, element) {
         element = element || this.element.find("div.output");
         var toinsert = $("<div/>").addClass("output_area output_svg");
         toinsert.append(svg);
         element.append(toinsert);
         return element;
     };
 
 
     CodeCell.prototype.append_png = function (png, element) {
         element = element || this.element.find("div.output");
         var toinsert = $("<div/>").addClass("output_area output_png");
         toinsert.append($("<img/>").attr('src','data:image/png;base64,'+png));
         element.append(toinsert);
         return element;
     };
 
 
     CodeCell.prototype.append_latex = function (latex, element) {
         // This method cannot do the typesetting because the latex first has to
         // be on the page.
         element = element || this.element.find("div.output");
         var toinsert = $("<div/>").addClass("output_area output_latex monospace-font");
         toinsert.append(latex);
         element.append(toinsert);
         return element;
     }
 
 
     CodeCell.prototype.clear_output = function () {
         this.element.find("div.output").html("");
     };
 
 
     CodeCell.prototype.collapse = function () {
         this.element.find('div.output').hide();
     };
 
 
     CodeCell.prototype.expand = function () {
         this.element.find('div.output').show();
     };
 
 
     CodeCell.prototype.set_input_prompt = function (number) {
         var n = number || ' ';
         this.input_prompt_number = n
         this.element.find('div.input_prompt').html('In&nbsp;[' + n + ']:');
     };
 
 
     CodeCell.prototype.get_code = function () {
         return this.code_mirror.getValue();
     };
 
 
     CodeCell.prototype.set_code = function (code) {
         return this.code_mirror.setValue(code);
     };
 
 
     CodeCell.prototype.at_top = function () {
         var cursor = this.code_mirror.getCursor();
         if (cursor.line === 0) {
             return true;
         } else {
             return false;
         }
     };
 
 
     CodeCell.prototype.at_bottom = function () {
         var cursor = this.code_mirror.getCursor();
         if (cursor.line === (this.code_mirror.lineCount()-1)) {
             return true;
         } else {
             return false;
         }
     };
 
 
     CodeCell.prototype.fromJSON = function (data) {
         if (data.cell_type === 'code') {
             this.set_code(data.code);
             this.set_input_prompt(data.prompt_number);
         };
     };
 
 
     CodeCell.prototype.toJSON = function () {
         return {
             code : this.get_code(),
             cell_type : 'code',
             prompt_number : this.input_prompt_number
         };
     };
 
     IPython.CodeCell = CodeCell;
 
     return IPython;
 }(IPython));
 

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

@@ -1,541 +1,557 b''
 
 //============================================================================
 // Notebook
 //============================================================================
 
 var IPython = (function (IPython) {
 
     var utils = IPython.utils;
 
     var Notebook = function (selector) {
         this.element = $(selector);
         this.element.scroll();
         this.element.data("notebook", this);
         this.next_prompt_number = 1;
         this.kernel = null;
         this.msg_cell_map = {};
         this.filename = null;
         this.notebook_load_re = /%notebook load/
         this.notebook_save_re = /%notebook save/
         this.notebook_filename_re = /(\w)+.ipynb/
         this.style();
         this.bind_events();
         this.start_kernel();
     };
 
 
     Notebook.prototype.style = function () {
     };
 
 
     Notebook.prototype.bind_events = function () {
         var that = this;
         $(document).keydown(function (event) {
             // console.log(event);
             if (event.which === 38) {
                 var cell = that.selected_cell();
                 if (cell.at_top()) {
                     event.preventDefault();
                     that.select_prev();
                 };
             } else if (event.which === 40) {
                 var cell = that.selected_cell();
                 if (cell.at_bottom()) {
                     event.preventDefault();
                     that.select_next();
                 };
             } else if (event.which === 13 && event.shiftKey) {
                 // The focus is not quite working here.
                 var cell = that.selected_cell();
                 var cell_index = that.find_cell_index(cell);
                 // TODO: the logic here needs to be moved into appropriate
                 // methods of Notebook.
                 if (cell instanceof IPython.CodeCell) {
                     event.preventDefault();
                     cell.clear_output();
                     var code = cell.get_code();
                     if (that.notebook_load_re.test(code)) {
                         var code_parts = code.split(' ');
                         if (code_parts.length === 3) {
                             that.load_notebook(code_parts[2]);
                         };
                     } else if (that.notebook_save_re.test(code)) {
                         var code_parts = code.split(' ');
                         if (code_parts.length === 3) {
                             that.save_notebook(code_parts[2]);
                         } else {
                             that.save_notebook()
                         };
                     } else {
                         var msg_id = that.kernel.execute(cell.get_code());
                         that.msg_cell_map[msg_id] = cell.cell_id;
                     };
                 } else if (cell instanceof IPython.TextCell) {
                     event.preventDefault();
                     cell.render();
                 }
                 if (cell_index === (that.ncells()-1)) {
                     that.insert_code_cell_after();
                 } else {
                     that.select(cell_index+1);
                 };
             };
         });
+
+        this.element.bind('collapse_pager', function () {
+            var that_height = that.element.outerHeight(true);
+            var pager_height = $('div#pager').outerHeight(true);
+            var new_height = that_height + pager_height; 
+            console.log('collapse', that_height, pager_height, new_height);
+            that.element.animate({height : new_height + 'px'}, 'fast');
+        });
+
+        this.element.bind('expand_pager', function () {
+            var that_height = that.element.outerHeight(true);
+            var pager_height = $('div#pager').outerHeight(true);
+            var new_height = that_height - pager_height; 
+            console.log('expand', that_height, pager_height, new_height);
+            that.element.animate({height : new_height + 'px'}, 'fast');
+        });
     };
 
 
     // Cell indexing, retrieval, etc.
 
 
     Notebook.prototype.cell_elements = function () {
         return this.element.children("div.cell");
     }
 
 
     Notebook.prototype.ncells = function (cell) {
         return this.cell_elements().length;
     }
 
 
     // TODO: we are often calling cells as cells()[i], which we should optimize
     // to cells(i) or a new method.
     Notebook.prototype.cells = function () {
         return this.cell_elements().toArray().map(function (e) {
             return $(e).data("cell");
         });
     }
 
 
     Notebook.prototype.find_cell_index = function (cell) {
         var result = null;
         this.cell_elements().filter(function (index) {
             if ($(this).data("cell") === cell) {
                 result = index;
             };
         });
         return result;
     };
 
 
     Notebook.prototype.index_or_selected = function (index) {
         return index || this.selected_index() || 0;
     }
 
 
     Notebook.prototype.select = function (index) {
         if (index !== undefined && index >= 0 && index < this.ncells()) {
             if (this.selected_index() !== null) {
                 this.selected_cell().unselect();
             };
             this.cells()[index].select();
         };
         return this;
     };
 
 
     Notebook.prototype.select_next = function () {
         var index = this.selected_index();
         if (index !== null && index >= 0 && (index+1) < this.ncells()) {
             this.select(index+1);
         };
         return this;
     };
 
 
     Notebook.prototype.select_prev = function () {
         var index = this.selected_index();
         if (index !== null && index >= 0 && (index-1) < this.ncells()) {
             this.select(index-1);
         };
         return this;
     };
 
 
     Notebook.prototype.selected_index = function () {
         var result = null;
         this.cell_elements().filter(function (index) {
             if ($(this).data("cell").selected === true) {
                 result = index;
             };
         });
         return result;
     };
 
 
     Notebook.prototype.cell_for_msg = function (msg_id) {
         var cell_id = this.msg_cell_map[msg_id];
         var result = null;
         this.cell_elements().filter(function (index) {
             cell = $(this).data("cell");
             if (cell.cell_id === cell_id) {
                 result = cell;
             };
         });
         return result;
     };
 
 
     Notebook.prototype.selected_cell = function () {
         return this.cell_elements().eq(this.selected_index()).data("cell");
     }
 
 
     // Cell insertion, deletion and moving.
 
 
     Notebook.prototype.delete_cell = function (index) {
         var i = index || this.selected_index();
         if (i !== null && i >= 0 && i < this.ncells()) {
             this.cell_elements().eq(i).remove();
             if (i === (this.ncells())) {
                 this.select(i-1);
             } else {
                 this.select(i);
             };
         };
         return this;
     };
 
 
     Notebook.prototype.append_cell = function (cell) {
         this.element.append(cell.element);
         return this;
     };
 
 
     Notebook.prototype.insert_cell_after = function (cell, index) {
         var ncells = this.ncells();
         if (ncells === 0) {
             this.append_cell(cell);
             return this;
         };
         if (index >= 0 && index < ncells) {
             this.cell_elements().eq(index).after(cell.element);
         };
         return this
     };
 
 
     Notebook.prototype.insert_cell_before = function (cell, index) {
         var ncells = this.ncells();
         if (ncells === 0) {
             this.append_cell(cell);
             return this;
         };
         if (index >= 0 && index < ncells) {
             this.cell_elements().eq(index).before(cell.element);
         };
         return this;
     };
 
 
     Notebook.prototype.move_cell_up = function (index) {
         var i = index || this.selected_index();
         if (i !== null && i < this.ncells() && i > 0) {
             var pivot = this.cell_elements().eq(i-1);
             var tomove = this.cell_elements().eq(i);
             if (pivot !== null && tomove !== null) {
                 tomove.detach();
                 pivot.before(tomove);
                 this.select(i-1);
             };
         };
         return this;
     }
 
 
     Notebook.prototype.move_cell_down = function (index) {
         var i = index || this.selected_index();
         if (i !== null && i < (this.ncells()-1) && i >= 0) {
             var pivot = this.cell_elements().eq(i+1)
             var tomove = this.cell_elements().eq(i)
             if (pivot !== null && tomove !== null) {
                 tomove.detach();
                 pivot.after(tomove);
                 this.select(i+1);
             };
         };
         return this;
     }
 
 
     Notebook.prototype.sort_cells = function () {
         var ncells = this.ncells();
         var sindex = this.selected_index();
         var swapped;
         do {
             swapped = false
             for (var i=1; i<ncells; i++) {
                 current = this.cell_elements().eq(i).data("cell");
                 previous = this.cell_elements().eq(i-1).data("cell");
                 if (previous.input_prompt_number > current.input_prompt_number) {
                     this.move_cell_up(i);
                     swapped = true;
                 };
             };
         } while (swapped);
         this.select(sindex);
         return this;
     };
 
 
     Notebook.prototype.insert_code_cell_before = function (index) {
         // TODO: Bounds check for i
         var i = this.index_or_selected(index);
         var cell = new IPython.CodeCell(this);
         cell.set_input_prompt(this.next_prompt_number);
         this.next_prompt_number = this.next_prompt_number + 1;
         this.insert_cell_before(cell, i);
         this.select(this.find_cell_index(cell));
         return this;
     }
 
 
     Notebook.prototype.insert_code_cell_after = function (index) {
         // TODO: Bounds check for i
         var i = this.index_or_selected(index);
         var cell = new IPython.CodeCell(this);
         cell.set_input_prompt(this.next_prompt_number);
         this.next_prompt_number = this.next_prompt_number + 1;
         this.insert_cell_after(cell, i);
         this.select(this.find_cell_index(cell));
         return this;
     }
 
 
     Notebook.prototype.insert_text_cell_before = function (index) {
         // TODO: Bounds check for i
         var i = this.index_or_selected(index);
         var cell = new IPython.TextCell(this);
         cell.config_mathjax();
         this.insert_cell_before(cell, i);
         this.select(this.find_cell_index(cell));
         return this;
     }
 
 
     Notebook.prototype.insert_text_cell_after = function (index) {
         // TODO: Bounds check for i
         var i = this.index_or_selected(index);
         var cell = new IPython.TextCell(this);
         cell.config_mathjax();
         this.insert_cell_after(cell, i);
         this.select(this.find_cell_index(cell));
         return this;
     }
 
 
     Notebook.prototype.text_to_code = function (index) {
         // TODO: Bounds check for i
         var i = this.index_or_selected(index);
         var source_element = this.cell_elements().eq(i);
         var source_cell = source_element.data("cell");
         if (source_cell instanceof IPython.TextCell) {
             this.insert_code_cell_after(i);
             var target_cell = this.cells()[i+1];
             target_cell.set_code(source_cell.get_text());
             source_element.remove();
         };
     };
 
 
     Notebook.prototype.code_to_text = function (index) {
         // TODO: Bounds check for i
         var i = this.index_or_selected(index);
         var source_element = this.cell_elements().eq(i);
         var source_cell = source_element.data("cell");
         if (source_cell instanceof IPython.CodeCell) {
             this.insert_text_cell_after(i);
             var target_cell = this.cells()[i+1];
             var text = source_cell.get_code();
             if (text === "") {text = target_cell.placeholder;};
             target_cell.set_text(text);
             source_element.remove();
             target_cell.edit();
         };
     };
 
 
     // Cell collapsing
 
     Notebook.prototype.collapse = function (index) {
         var i = this.index_or_selected(index);
         this.cells()[i].collapse();
     };
 
 
     Notebook.prototype.expand = function (index) {
         var i = this.index_or_selected(index);
         this.cells()[i].expand();
     };
 
 
     // Kernel related things
 
     Notebook.prototype.start_kernel = function () {
         this.kernel = new IPython.Kernel();
         this.kernel.start_kernel($.proxy(this.kernel_started, this));
     };
 
 
     Notebook.prototype.handle_shell_reply = function (e) {
         reply = $.parseJSON(e.data);
         var header = reply.header;
         var content = reply.content;
         var msg_type = header.msg_type;
         console.log(reply);
         var cell = this.cell_for_msg(reply.parent_header.msg_id);
         if (msg_type === "execute_reply") {
             cell.set_input_prompt(content.execution_count);
         };
         var payload = content.payload || [];
         this.handle_payload(content.payload);
     };
 
 
     Notebook.prototype.handle_payload = function (payload) {
         var l = payload.length;
         if (l > 0) {
             IPython.pager.clear();
             IPython.pager.expand();
         };
         for (var i=0; i<l; i++) {
             IPython.pager.append_text(payload[i].text);
         };
     };
 
 
     Notebook.prototype.handle_iopub_reply = function (e) {
         reply = $.parseJSON(e.data);
         var content = reply.content;
         // console.log(reply);
         var msg_type = reply.header.msg_type;
         var cell = this.cell_for_msg(reply.parent_header.msg_id);
         if (msg_type === "stream") {
             cell.expand();
             cell.append_stream(content.data + "\n");
         } else if (msg_type === "display_data") {
             cell.expand();
             cell.append_display_data(content.data);
         } else if (msg_type === "pyout") {
             cell.expand();
             cell.append_pyout(content.data, content.execution_count)
         } else if (msg_type === "pyerr") {
             cell.expand();
             cell.append_pyerr(content.ename, content.evalue, content.traceback);
         } else if (msg_type === "status") {
             if (content.execution_state === "busy") {
                 this.kernel.status_busy();
             } else if (content.execution_state === "idle") {
                 this.kernel.status_idle();
             };
         }
     };
 
 
     Notebook.prototype.kernel_started = function () {
         console.log("Kernel started: ", this.kernel.kernel_id);
         this.kernel.shell_channel.onmessage = $.proxy(this.handle_shell_reply,this);
         this.kernel.iopub_channel.onmessage = $.proxy(this.handle_iopub_reply,this);
     };
 
 
     // Persistance and loading
 
 
     Notebook.prototype.fromJSON = function (data) {
         var ncells = this.ncells();
         for (var i=0; i<ncells; i++) {
             // Always delete cell 0 as they get renumbered as they are deleted.
             this.delete_cell(0);
         };
         var new_cells = data.cells;
         ncells = new_cells.length;
         var cell_data = null;
         for (var i=0; i<ncells; i++) {
             cell_data = new_cells[i];
             if (cell_data.cell_type == 'code') {
                 this.insert_code_cell_after();
                 this.selected_cell().fromJSON(cell_data);
             } else if (cell_data.cell_type === 'text') {
                 this.insert_text_cell_after();
                 this.selected_cell().fromJSON(cell_data);
             };
         };
     };
 
 
     Notebook.prototype.toJSON = function () {
         var cells = this.cells();
         var ncells = cells.length;
         cell_array = new Array(ncells);
         for (var i=0; i<ncells; i++) {
             cell_array[i] = cells[i].toJSON();
         };
         json = {
             cells : cell_array
         };
         return json
     };
 
 
     Notebook.prototype.test_filename = function (filename) {
         if (this.notebook_filename_re.test(filename)) {
             return true;
         } else {
             var bad_filename = $('<div/>');
             bad_filename.html(
                 "The filename you entered (" + filename + ") is not valid. Notebook filenames must have the following form: foo.ipynb"
             );
             bad_filename.dialog({title: 'Invalid filename', modal: true});
             return false;
         };
     };
 
     Notebook.prototype.save_notebook = function (filename) {
         this.filename = filename || this.filename || '';
         if (this.filename === '') {
             var no_filename = $('<div/>');
             no_filename.html(
                 "This notebook has no filename, please specify a filename of the form: foo.ipynb"
             );
             no_filename.dialog({title: 'Missing filename', modal: true});
             return;
         }
         if (!this.test_filename(this.filename)) {return;}
         var thedata = this.toJSON();
         var settings = {
           processData : false,
           cache : false,
           type : "PUT",
           data : JSON.stringify(thedata),
           success : function (data, status, xhr) {console.log(data);}
         };
         $.ajax("/notebooks/" + this.filename, settings);
     };
 
 
     Notebook.prototype.load_notebook = function (filename) {
         if (!this.test_filename(filename)) {return;}
         var that = this;
         // We do the call with settings so we can set cache to false.
         var settings = {
           processData : false,
           cache : false,
           type : "GET",
           dataType : "json",
           success : function (data, status, xhr) {
               that.fromJSON(data);
               that.filename = filename;
               that.kernel.restart();
           }
         };
         $.ajax("/notebooks/" + filename, settings);
     }
 
     IPython.Notebook = Notebook;
 
     return IPython;
 
 }(IPython));
 

IPython/frontend/html/notebook/static/js/notebook_main.js

@@ -1,96 +1,101 b''
 
 //============================================================================
 // On document ready
 //============================================================================
 
 
 $(document).ready(function () {
 
 
-    $('div#notebook_app').addClass('ui-widget ui-widget-content')
-    $('div#left_panel').addClass('ui-widget')
-    $('div#left_panel_splitter').addClass('ui-widget ui-widget-content')
-    $('div#notebook_panel').addClass('ui-widget')
+    $('div#notebook_app').addClass('border-box-sizing ui-widget ui-widget-content');
+    $('div#left_panel').addClass('border-box-sizing ui-widget');
+    $('div#left_panel_splitter').addClass('border-box-sizing ui-widget ui-state-default');
+    $('div#notebook_panel').addClass('border-box-sizing ui-widget');
+    $('div#notebook').addClass('border-box-sizing');
 
     $('div#left_panel_splitter').click(function () {
         $('div#left_panel').toggle('fast');
     });
 
     $('div#left_panel_splitter').hover(
         function () {
             $('div#left_panel_splitter').addClass('ui-state-hover');
         },
         function () {
             $('div#left_panel_splitter').removeClass('ui-state-hover');
         }
     );
 
     MathJax.Hub.Config({
         tex2jax: {
             inlineMath: [ ['$','$'], ["\\(","\\)"] ],
             displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
         },
         displayAlign: 'left', // Change this to 'center' to center equations.
         "HTML-CSS": {
             styles: {'.MathJax_Display': {"margin": 0}}
         }
     });
 
     var do_resize = function () {
         var win = $(window);
         var w = win.width();
         var h = win.height();
-        var app_height = h - 50;
-        $('div#notebook_app').height(app_height);
+        var header_height = $('div#header').outerHeight(true);
+        var app_height = h - header_height - 2;
+        var pager_height = $('div#pager').outerHeight(true);
+        var pager_splitter_height = $('div#pager_splitter').outerHeight(true);
+        $('div#notebook_app').height(app_height + 2);
         $('div#left_panel').height(app_height);
         $('div#left_panel_splitter').height(app_height);
         $('div#notebook_panel').height(app_height);
-        $('div#notebook').height(app_height-211);
+        $('div#notebook').height(app_height-pager_height-pager_splitter_height);
+        console.log('resize: ', app_height);
     };
 
     $(window).resize(do_resize);
 
     IPython.notebook = new IPython.Notebook('div#notebook');
     IPython.notebook.insert_code_cell_after();
 
     IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
 
     do_resize();
 
 //    $("#menu_tabs").tabs();
 
 //    $("#help_toolbar").buttonset();
 
 //    $("#kernel_toolbar").buttonset();
 //    $("#interrupt_kernel").click(function () {IPython.notebook.kernel.interrupt();});
 //    $("#restart_kernel").click(function () {IPython.notebook.kernel.restart();});
 //    $("#kernel_status").addClass("status_idle");
 
 //    $("#move_cell").buttonset();
 //    $("#move_up").button("option", "icons", {primary:"ui-icon-arrowthick-1-n"});
 //    $("#move_up").button("option", "text", false);
 //    $("#move_up").click(function () {IPython.notebook.move_cell_up();});
 //    $("#move_down").button("option", "icons", {primary:"ui-icon-arrowthick-1-s"});
 //    $("#move_down").button("option", "text", false);
 //    $("#move_down").click(function () {IPython.notebook.move_cell_down();});
 
 //    $("#insert_delete").buttonset();
 //    $("#insert_cell_before").click(function () {IPython.notebook.insert_code_cell_before();});
 //    $("#insert_cell_after").click(function () {IPython.notebook.insert_code_cell_after();});
 //    $("#delete_cell").button("option", "icons", {primary:"ui-icon-closethick"});
 //    $("#delete_cell").button("option", "text", false);
 //    $("#delete_cell").click(function () {IPython.notebook.delete_cell();});
 
 //    $("#cell_type").buttonset();
 //    $("#to_code").click(function () {IPython.notebook.text_to_code();});
 //    $("#to_text").click(function () {IPython.notebook.code_to_text();});
 
 //    $("#sort").buttonset();
 //    $("#sort_cells").click(function () {IPython.notebook.sort_cells();});
 
 //    $("#toggle").buttonset();
 //    $("#collapse").click(function () {IPython.notebook.collapse();});
 //    $("#expand").click(function () {IPython.notebook.expand();});
 
 });
 

IPython/frontend/html/notebook/static/js/pager.js

@@ -1,70 +1,94 b''
 
 //============================================================================
 // Pager
 //============================================================================
 
 var IPython = (function (IPython) {
 
     var utils = IPython.utils;
 
     var Pager = function (pager_selector, pager_toggle_selector) {
         this.pager_element = $(pager_selector);
         this.pager_toggle_element = $(pager_toggle_selector);
+        this.expanded = true;
         this.style();
         this.bind_events();
-        this.collapse();
     };
 
 
     Pager.prototype.style = function () {
-        this.pager_toggle_element.addClass('ui-widget ui-widget-content')
-        this.pager_element.addClass('')
+        this.pager_toggle_element.addClass('border-box-sizing ui-widget ui-state-default');
+        this.pager_element.addClass('border-box-sizing ui-widget');
     };
 
 
     Pager.prototype.bind_events = function () {
         var that = this;
-        this.pager_toggle_element.click(function () {
-            that.pager_element.toggle('fast');
+
+        this.pager_element.bind('collapse_pager', function () {
+            that.pager_element.hide('fast');
+        });
+
+        this.pager_element.bind('expand_pager', function () {
+            that.pager_element.show('fast');
         });
 
         this.pager_toggle_element.hover(
             function () {
                 that.pager_toggle_element.addClass('ui-state-hover');
             },
             function () {
                 that.pager_toggle_element.removeClass('ui-state-hover');
             }
         );
+
+        this.pager_toggle_element.click(function () {
+            that.toggle();
+        });
     };
 
 
     Pager.prototype.collapse = function () {
-        this.pager_element.hide('fast');
+        if (this.expanded === true) {
+            this.pager_element.add($('div#notebook')).trigger('collapse_pager');
+            this.expanded = false;
+        };
     };
 
 
     Pager.prototype.expand = function () {
-        this.pager_element.show('fast');
+        if (this.expanded !== true) {
+            this.pager_element.add($('div#notebook')).trigger('expand_pager');
+            this.expanded = true;
+        };
+    };
+
+
+    Pager.prototype.toggle = function () {
+        if (this.expanded === true) {
+            this.collapse();
+        } else {
+            this.expand();
+        };
     };
 
 
     Pager.prototype.clear = function (text) {
         this.pager_element.empty();
     };
 
 
     Pager.prototype.append_text = function (text) {
         var toinsert = $("<div/>").addClass("output_area output_stream monospace-font");
         toinsert.append($("<pre/>").addClass("monospace-font").
             html(utils.fixConsole(text)));
         this.pager_element.append(toinsert);
     };   
 
 
     IPython.Pager = Pager;
 
     return IPython;
 
 }(IPython));
 

IPython/frontend/html/notebook/static/js/utils.js

@@ -1,72 +1,92 b''
 
 //============================================================================
 // Utilities
 //============================================================================
 
 IPython.namespace('IPython.utils')
 
 IPython.utils = (function (IPython) {
 
     var uuid = function () {
         // http://www.ietf.org/rfc/rfc4122.txt
         var s = [];
         var hexDigits = "0123456789ABCDEF";
         for (var i = 0; i < 32; i++) {
             s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
         }
         s[12] = "4";  // bits 12-15 of the time_hi_and_version field to 0010
         s[16] = hexDigits.substr((s[16] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
 
         var uuid = s.join("");
         return uuid;
     };
 
 
     //Fix raw text to parse correctly in crazy XML
     function xmlencode(string) {
         return string.replace(/\&/g,'&'+'amp;')
             .replace(/</g,'&'+'lt;')
             .replace(/>/g,'&'+'gt;')
             .replace(/\'/g,'&'+'apos;')
             .replace(/\"/g,'&'+'quot;')
             .replace(/`/g,'&'+'#96;')
     }
 
+
     //Map from terminal commands to CSS classes
     attrib = {
         "30":"cblack", "31":"cred",
         "32":"cgreen", "33":"cyellow",  
         "34":"cblue", "36":"ccyan", 
         "37":"cwhite", "01":"cbold"}
 
     //Fixes escaped console commands, IE colors. Turns them into HTML
     function fixConsole(txt) {
         txt = xmlencode(txt)
         var re = /\033\[([\d;]*?)m/
         var opened = false
         var cmds = []
         var opener = ""
         var closer = ""
         
         while (re.test(txt)) {
             var cmds = txt.match(re)[1].split(";")
             closer = opened?"</span>":""
             opened = cmds.length > 1 || cmds[0] != 0
             var rep = []
             for (var i in cmds)
                 if (typeof(attrib[cmds[i]]) != "undefined")
                     rep.push(attrib[cmds[i]])
             opener = rep.length > 0?"<span class=\""+rep.join(" ")+"\">":""
             txt = txt.replace(re, closer + opener)
         }
         if (opened) txt += "</span>"
         return txt.trim()
     }
 
+
+    grow = function(element) {
+        // Grow the cell by hand. This is used upon reloading from JSON, when the
+        // autogrow handler is not called.
+        var dom = element.get(0);
+        var lines_count = 0;
+        // modified split rule from
+        // http://stackoverflow.com/questions/2035910/how-to-get-the-number-of-lines-in-a-textarea/2036424#2036424
+        var lines = dom.value.split(/\r|\r\n|\n/);
+        lines_count = lines.length;
+        if (lines_count >= 1) {
+            dom.rows = lines_count;
+        } else {
+            dom.rows = 1;
+        }
+    };
+
+
     return {
         uuid : uuid,
-        fixConsole : fixConsole
+        fixConsole : fixConsole,
+        grow : grow
     }
 
 }(IPython));
 

IPython/frontend/html/notebook/templates/notebook.html

@@ -1,120 +1,120 b''
 <!DOCTYPE HTML>
 <html>
 
 <head>
     <meta charset="utf-8">
 
     <title>IPython Notebook</title>
 
-    <!-- <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" /> -->
+    <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
     <!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> -->
-    <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />
+<!--    <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />-->
 
     <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" charset="utf-8"></script>
     <!-- <script type='text/javascript' src='static/mathjax/MathJax.js?config=TeX-AMS_HTML' charset='utf-8'></script> -->
     <script type="text/javascript">
     if (typeof MathJax == 'undefined') {
         console.log("Trying to load local copy of MathJax");
         document.write(unescape("%3Cscript type='text/javascript' src='static/mathjax/MathJax.js%3Fconfig=TeX-AMS_HTML' charset='utf-8'%3E%3C/script%3E"));
     }
     </script>
 
     <link rel="stylesheet" href="static/codemirror2/lib/codemirror.css">
     <link rel="stylesheet" href="static/codemirror2/mode/python/python.css">
 
     <link rel="stylesheet" href="static/css/layout.css" type="text/css" />
     <link rel="stylesheet" href="static/css/notebook.css" type="text/css" />
 
 </head>
 
 <body>
 
 <div id="header">
     <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
 </div>
 
 <div id="notebook_app">
 
     <div id="left_panel"></div>
     <div id="left_panel_splitter"></div>
     <div id="notebook_panel">
         <div id="notebook"></div>
         <div id="pager_splitter"></div>
         <div id="pager"></div>
     </div>
 
 </div>
 
 <script src="static/jquery/js/jquery-1.6.2.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/jquery/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/jquery/js/jquery.autogrow.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/namespace.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/utils.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/cell.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/codecell.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/textcell.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/kernel.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/pager.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/notebook.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/notebook_main.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/codemirror2/lib/codemirror.js"></script>
 <script src="static/codemirror2/mode/python/python.js"></script>
 
 </body>
 
 </html>
 
 
 <!--<div id="tools">-->
 
 <!--<div id="menu_tabs">-->
 <!--    <span id="kernel_status">Idle</span>-->
 <!--    <ul>-->
 <!--        <li><a href="#cell_tab">Cell</a></li>-->
 <!--        <li><a href="#kernel_tab">Kernel</a></li>-->
 <!--        <li><a href="#help_tab">Help</a></li>-->
 <!--    </ul>-->
 <!--    <div id="cell_tab">-->
 <!--        <span id="cell_toolbar">-->
 <!--            <span id="move_cell">-->
 <!--                <button id="move_up">Move up</button>-->
 <!--                <button id="move_down">Move down</button>-->
 <!--            </span>-->
 <!--            <span id="insert_delete">-->
 <!--                <button id="insert_cell_before">Before</button>-->
 <!--                <button id="insert_cell_after">After</button>-->
 <!--                <button id="delete_cell">Delete</button>-->
 <!--            </span>-->
 <!--            <span id="cell_type">-->
 <!--                <button id="to_code">Code</button>-->
 <!--                <button id="to_text">Text</button>-->
 <!--            </span>-->
 <!--            <span id="sort">-->
 <!--                <button id="sort_cells">Sort</button>-->
 <!--            </span>-->
 <!--            <span id="toggle">-->
 <!--                <button id="collapse">Collapse</button>-->
 <!--                <button id="expand">Expand</button>-->
 <!--            </span>-->
 <!--        </span>-->
 <!--    </div>-->
 <!--    <div id="kernel_tab">-->
 <!--        <span id="kernel_toolbar">-->
 <!--            <button id="interrupt_kernel">Interrupt</button>-->
 <!--            <button id="restart_kernel">Restart</button>-->
 <!--        </span>-->
 <!--    </div>-->
 <!--    <div id="help_tab">-->
 <!--        <span id="help_toolbar">-->
 <!--            <button><a href="http://docs.python.org" target="_blank">Python</a></button>-->
 <!--            <button><a href="http://ipython.github.com/ipython-doc/dev/index.html" target="_blank">IPython</a></button>-->
 <!--            <button><a href="http://matplotlib.sourceforge.net/" target="_blank">Matplotlib</a></button>-->
 <!--            <button><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></button>-->
 <!--            <button><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></button>-->
 <!--            <button><a href="http://docs.sympy.org/dev/index.html" target="_blank">SymPy</a></button>-->
 <!--        </span>-->
 <!--    </div>-->
 <!--</div>-->
 
 <!--</div>-->