Merge pull request ipython#2421 from Carreau/nbconsole

Some notebook tweaks.
mattvonrocketstein · Oct 3, 2012 · c5ce993 · c5ce993
2 parents bd3bb26 + 3d4bcab
commit c5ce993
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -238,7 +238,7 @@ div.output_area {
 /* This class is for the output subarea inside the output_area and after
    the prompt div. */
 div.output_subarea {
-    padding: 0.4em 0.4em 0.4em 0.4em;
+    padding: 0.44em 0.4em 0.4em 1px;
 }
 
 /* The rest of the output_* classes are for special styling of the different

diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -225,10 +225,33 @@ var IPython = (function (IPython) {
     };
 
 
+
+
+
+    CodeCell.input_prompt_classical = function (prompt_value, lines_number) {
+        var ns = prompt_value || "&nbsp;";
+        return 'In&nbsp;[' + ns + ']:'
+    };
+
+    CodeCell.input_prompt_continuation = function (prompt_value, lines_number) {
+        var html = [CodeCell.input_prompt_classical(prompt_value, lines_number)];
+        for(var i=1; i < lines_number; i++){html.push(['...:'])};
+        return html.join('</br>')
+    };
+
+    CodeCell.input_prompt_function = CodeCell.input_prompt_classical;
+
+
     CodeCell.prototype.set_input_prompt = function (number) {
-        this.input_prompt_number = number;
-        var ns = number || "&nbsp;";
-        this.element.find('div.input_prompt').html('In&nbsp;[' + ns + ']:');
+        var nline = 1
+        if( this.code_mirror != undefined) {
+           nline = this.code_mirror.lineCount();
+        }
+        if (number){
+            this.input_prompt_number = number;
+        }
+        var prompt_html = CodeCell.input_prompt_function(this.input_prompt_number, nline);
+        this.element.find('div.input_prompt').html(prompt_html);
     };
 
 

diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -550,6 +550,11 @@ var IPython = (function (IPython) {
     };
 
 
+    Notebook.prototype.insert_cell_at_bottom = function (type){
+        var len = this.ncells();
+        return this.insert_cell_below(type,len-1);
+    }
+
     Notebook.prototype.insert_cell_below = function (type, index) {
         // type = ('code','html','markdown')
         // index = cell index or undefined to insert below selected