Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Adding page break logic to the print css.

* I have added page-break-inside logic to div.input and
  div.output_area.
* Fixed a bug in CodeCell that was putting the output_area class
  on the wrong div.
  • Loading branch information...
commit 898a609ace1e50eee9f101d768e58647242826c5 1 parent d5b4ff0
Brian E. Granger ellisonbg authored
12 IPython/frontend/html/notebook/static/css/notebook.css
View
@@ -184,6 +184,10 @@ div.prompt {
font-family: monospace;
}
+div.input {
+ page-break-inside: avoid;
+}
+
div.input_area {
color: black;
}
@@ -203,7 +207,8 @@ div.output_prompt {
/* This class is applied to all types of output (pyout, pyerr, stream, display_data) */
div.output_area {
- padding: 0px 0.4em
+ padding: 0px 0.4em;
+ page-break-inside: avoid;
}
/* This is the output area after the Out[] prompt of type pyout */
@@ -295,3 +300,8 @@ div.text_cell_render {
font-family: monospace;
}
+@media print {
+ body { overflow: visible !important; }
+ .ui-widget-content { border: 0px; }
+}
+
30 IPython/frontend/html/notebook/static/js/codecell.js
View
@@ -206,12 +206,12 @@ var IPython = (function (IPython) {
CodeCell.prototype.append_pyout = function (json) {
n = json.prompt_number || ' ';
- var toinsert = $("<div/>").addClass("output_pyout hbox");
+ var toinsert = $("<div/>").addClass("output_pyout hbox output_area");
toinsert.append($('<div/>').
addClass('prompt output_prompt').
html('Out[' + n + ']:')
);
- this.append_mime_type(json, toinsert).addClass('output_area');
+ this.append_mime_type(json, toinsert);
toinsert.children().last().addClass("box_flex1 pyout_area");
this.element.find("div.output").append(toinsert);
// If we just output latex, typeset it.
@@ -252,19 +252,19 @@ var IPython = (function (IPython) {
CodeCell.prototype.append_mime_type = function (json, element) {
element = element || this.element.find("div.output");
if (json.html !== undefined) {
- this.append_html(json.html, element);
+ inserted = this.append_html(json.html, element);
} else if (json.latex !== undefined) {
- this.append_latex(json.latex, element);
+ inserted = this.append_latex(json.latex, element);
} else if (json.svg !== undefined) {
- this.append_svg(json.svg, element);
+ inserted = this.append_svg(json.svg, element);
} else if (json.png !== undefined) {
- this.append_png(json.png, element);
+ inserted = this.append_png(json.png, element);
} else if (json.jpeg !== undefined) {
- this.append_jpeg(json.jpeg, element);
+ inserted = this.append_jpeg(json.jpeg, element);
} else if (json.text !== undefined) {
- this.append_text(json.text, element);
+ inserted = this.append_text(json.text, element);
};
- return element;
+ return inserted;
};
@@ -273,7 +273,7 @@ var IPython = (function (IPython) {
var toinsert = $("<div/>").addClass("output_html rendered_html");
toinsert.append(html);
element.append(toinsert);
- return element;
+ return toinsert;
}
@@ -282,7 +282,7 @@ var IPython = (function (IPython) {
var toinsert = $("<div/>").addClass("output_stream");
toinsert.append($("<pre/>").html(data));
element.append(toinsert);
- return element;
+ return toinsert;
};
@@ -291,7 +291,7 @@ var IPython = (function (IPython) {
var toinsert = $("<div/>").addClass("output_svg");
toinsert.append(svg);
element.append(toinsert);
- return element;
+ return toinsert;
};
@@ -300,7 +300,7 @@ var IPython = (function (IPython) {
var toinsert = $("<div/>").addClass("output_png");
toinsert.append($("<img/>").attr('src','data:image/png;base64,'+png));
element.append(toinsert);
- return element;
+ return toinsert;
};
@@ -309,7 +309,7 @@ var IPython = (function (IPython) {
var toinsert = $("<div/>").addClass("output_jpeg");
toinsert.append($("<img/>").attr('src','data:image/jpeg;base64,'+jpeg));
element.append(toinsert);
- return element;
+ return toinsert;
};
@@ -320,7 +320,7 @@ var IPython = (function (IPython) {
var toinsert = $("<div/>").addClass("output_latex");
toinsert.append(latex);
element.append(toinsert);
- return element;
+ return toinsert;
}
2  IPython/frontend/html/notebook/static/js/printwidget.js
View
@@ -51,4 +51,4 @@ var IPython = (function (IPython) {
return IPython;
-}(IPython));
+}(IPython));
2  IPython/frontend/html/notebook/templates/notebook.html
View
@@ -69,7 +69,7 @@ <h3 class="section_header">Notebook</h3>
</span>
<span class="section_row_buttons">
<span id="print_widget">
- <button id="print_notebook">Print/HTML</button>
+ <button id="print_notebook">Print</button>
</span>
<button id="download_notebook">Export</button>
Please sign in to comment.
Something went wrong with that request. Please try again.