##// END OF EJS Templates
Adding prompt area to non-CodeCells to indent content....
Brian E. Granger -
Show More
@@ -122,17 +122,16 b' var IPython = (function (IPython) {'
122 var cell = $('<div></div>').addClass('cell border-box-sizing code_cell');
122 var cell = $('<div></div>').addClass('cell border-box-sizing code_cell');
123 cell.attr('tabindex','2');
123 cell.attr('tabindex','2');
124
124
125 this.celltoolbar = new IPython.CellToolbar(this);
126
127 var input = $('<div></div>').addClass('input');
125 var input = $('<div></div>').addClass('input');
128 var vbox = $('<div/>').addClass('vbox box-flex1');
126 var prompt = $('<div/>').addClass('prompt input_prompt');
129 input.append($('<div/>').addClass('prompt input_prompt'));
127 var inner_cell = $('<div/>').addClass('inner_cell');
130 vbox.append(this.celltoolbar.element);
128 this.celltoolbar = new IPython.CellToolbar(this);
129 inner_cell.append(this.celltoolbar.element);
131 var input_area = $('<div/>').addClass('input_area');
130 var input_area = $('<div/>').addClass('input_area');
132 this.code_mirror = CodeMirror(input_area.get(0), this.cm_config);
131 this.code_mirror = CodeMirror(input_area.get(0), this.cm_config);
133 $(this.code_mirror.getInputField()).attr("spellcheck", "false");
132 $(this.code_mirror.getInputField()).attr("spellcheck", "false");
134 vbox.append(input_area);
133 inner_cell.append(input_area);
135 input.append(vbox);
134 input.append(prompt).append(inner_cell);
136 var output = $('<div></div>');
135 var output = $('<div></div>');
137 cell.append(input).append(output);
136 cell.append(input).append(output);
138 this.element = cell;
137 this.element = cell;
@@ -72,19 +72,22 b' var IPython = (function (IPython) {'
72 */
72 */
73 TextCell.prototype.create_element = function () {
73 TextCell.prototype.create_element = function () {
74 IPython.Cell.prototype.create_element.apply(this, arguments);
74 IPython.Cell.prototype.create_element.apply(this, arguments);
75
75 var cell = $("<div>").addClass('cell text_cell border-box-sizing');
76 var cell = $("<div>").addClass('cell text_cell border-box-sizing');
76 cell.attr('tabindex','2');
77 cell.attr('tabindex','2');
77
78
79 var prompt = $('<div/>').addClass('prompt input_prompt');
80 cell.append(prompt);
81 var inner_cell = $('<div/>').addClass('inner_cell');
78 this.celltoolbar = new IPython.CellToolbar(this);
82 this.celltoolbar = new IPython.CellToolbar(this);
79 cell.append(this.celltoolbar.element);
83 inner_cell.append(this.celltoolbar.element);
80
81 var input_area = $('<div/>').addClass('text_cell_input border-box-sizing');
84 var input_area = $('<div/>').addClass('text_cell_input border-box-sizing');
82 this.code_mirror = CodeMirror(input_area.get(0), this.cm_config);
85 this.code_mirror = CodeMirror(input_area.get(0), this.cm_config);
83
84 // The tabindex=-1 makes this div focusable.
86 // The tabindex=-1 makes this div focusable.
85 var render_area = $('<div/>').addClass('text_cell_render border-box-sizing').
87 var render_area = $('<div/>').addClass('text_cell_render border-box-sizing').
86 addClass('rendered_html').attr('tabindex','-1');
88 addClass('rendered_html').attr('tabindex','-1');
87 cell.append(input_area).append(render_area);
89 inner_cell.append(input_area).append(render_area);
90 cell.append(inner_cell);
88 this.element = cell;
91 this.element = cell;
89 };
92 };
90
93
@@ -24,3 +24,8 b' div.prompt {'
24 /* This has to match that of the the CodeMirror class line-height below */
24 /* This has to match that of the the CodeMirror class line-height below */
25 line-height: @code_line_height;
25 line-height: @code_line_height;
26 }
26 }
27
28 div.inner_cell {
29 .vbox();
30 .box-flex1();
31 }
@@ -1,5 +1,6 b''
1 div.text_cell {
1 div.text_cell {
2 padding: 5px 5px 5px 5px;
2 padding: 5px 5px 5px 5px;
3 .hbox();
3 }
4 }
4
5
5 div.text_cell_input {
6 div.text_cell_input {
@@ -30,3 +31,8 b' h1,h2,h3,h4,h5,h6 {'
30 visibility: visible;
31 visibility: visible;
31 }
32 }
32 }
33 }
34
35 .code_cell + .text_cell .inner_cell {
36 border-top: 1px solid @border_color;
37 }
38
@@ -56,6 +56,7 b' input.engine_num_input{height:20px;margin-bottom:2px;padding-top:0;padding-botto'
56 .ansibggray{background-color:gray;}
56 .ansibggray{background-color:gray;}
57 div.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 7px;outline:none;}div.cell.selected{border-radius:4px;border:thin #ababab solid;}
57 div.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 7px;outline:none;}div.cell.selected{border-radius:4px;border:thin #ababab solid;}
58 div.prompt{min-width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231em;}
58 div.prompt{min-width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231em;}
59 div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
59 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
60 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
60 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
61 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
61 div.input_prompt{color:navy;border-top:1px solid transparent;}
62 div.input_prompt{color:navy;border-top:1px solid transparent;}
@@ -139,8 +140,9 b' p.p-space{margin-bottom:10px;}'
139 .rendered_html *+p{margin-top:1em;}
140 .rendered_html *+p{margin-top:1em;}
140 .rendered_html *+table{margin-top:1em;}
141 .rendered_html *+table{margin-top:1em;}
141 .rendered_html *+img{margin-top:1em;}
142 .rendered_html *+img{margin-top:1em;}
142 div.text_cell{padding:5px 5px 5px 5px;}
143 div.text_cell{padding:5px 5px 5px 5px;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
143 div.text_cell_input{color:#000000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
144 div.text_cell_input{color:#000000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
144 div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:5px;color:#000000;}
145 div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:5px;color:#000000;}
145 a.anchor-link:link{text-decoration:none;padding:0px 20px;visibility:hidden;}
146 a.anchor-link:link{text-decoration:none;padding:0px 20px;visibility:hidden;}
146 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible;}
147 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible;}
148 .code_cell+.text_cell .inner_cell{border-top:1px solid #ababab;}
@@ -1437,6 +1437,7 b' input.engine_num_input{height:20px;margin-bottom:2px;padding-top:0;padding-botto'
1437 .ansibggray{background-color:gray;}
1437 .ansibggray{background-color:gray;}
1438 div.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 7px;outline:none;}div.cell.selected{border-radius:4px;border:thin #ababab solid;}
1438 div.cell{border:1px solid transparent;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 7px;outline:none;}div.cell.selected{border-radius:4px;border:thin #ababab solid;}
1439 div.prompt{min-width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231em;}
1439 div.prompt{min-width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231em;}
1440 div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
1440 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
1441 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
1441 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
1442 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
1442 div.input_prompt{color:navy;border-top:1px solid transparent;}
1443 div.input_prompt{color:navy;border-top:1px solid transparent;}
@@ -1520,11 +1521,12 b' p.p-space{margin-bottom:10px;}'
1520 .rendered_html *+p{margin-top:1em;}
1521 .rendered_html *+p{margin-top:1em;}
1521 .rendered_html *+table{margin-top:1em;}
1522 .rendered_html *+table{margin-top:1em;}
1522 .rendered_html *+img{margin-top:1em;}
1523 .rendered_html *+img{margin-top:1em;}
1523 div.text_cell{padding:5px 5px 5px 5px;}
1524 div.text_cell{padding:5px 5px 5px 5px;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
1524 div.text_cell_input{color:#000000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
1525 div.text_cell_input{color:#000000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
1525 div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:5px;color:#000000;}
1526 div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:5px;color:#000000;}
1526 a.anchor-link:link{text-decoration:none;padding:0px 20px;visibility:hidden;}
1527 a.anchor-link:link{text-decoration:none;padding:0px 20px;visibility:hidden;}
1527 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible;}
1528 h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible;}
1529 .code_cell+.text_cell .inner_cell{border-top:1px solid #ababab;}
1528 body{background-color:#ffffff;}
1530 body{background-color:#ffffff;}
1529 body.notebook_app{overflow:hidden;}
1531 body.notebook_app{overflow:hidden;}
1530 span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;}
1532 span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;}
General Comments 0
You need to be logged in to leave comments. Login now