##// END OF EJS Templates
Merge pull request #13 from damianavila/fix_basichtml...
Bussonnier Matthias -
r9708:6ce6ff83 merge
parent child Browse files
Show More
@@ -14,11 +14,13 b''
14 {% endblock input_group %}
14 {% endblock input_group %}
15
15
16 {% block output_group -%}
16 {% block output_group -%}
17 <div class="output_wrapper">
17 <div class="vbox output_wrapper">
18 <div class="output vbox">
18 <div class="output vbox">
19 <div class="hbox output_area">
19 {{ super() }}
20 {{ super() }}
20 </div>
21 </div>
21 </div>
22 </div>
23 </div>
22 {% endblock output_group %}
24 {% endblock output_group %}
23
25
24
26
@@ -28,12 +30,10 b''
28
30
29 {% block output_prompt -%}
31 {% block output_prompt -%}
30 <div class="prompt output_prompt">
32 <div class="prompt output_prompt">
31 <div class="output vbox">
32 {%- if cell.haspyout -%}
33 {%- if cell.haspyout -%}
33 Out[{{cell.prompt_number}}]:
34 Out[{{cell.prompt_number}}]:
34 {%- endif -%}
35 {%- endif -%}
35 </div>
36 </div>
36 </div>
37 {% endblock output_prompt %}
37 {% endblock output_prompt %}
38
38
39 {% block input %}
39 {% block input %}
@@ -67,30 +67,21 b' unknown type {{cell.type}}'
67
67
68
68
69 {% block pyout -%}
69 {% block pyout -%}
70 <div class="hbox output_area">
71 <div class="prompt"></div>
72 <div class="box-flex1 output_subarea output_pyout">
70 <div class="box-flex1 output_subarea output_pyout">
73 {% block data_priority scoped %}{{ super()}}{% endblock %}
71 {% block data_priority scoped %}{{ super()}}{% endblock %}
74 </div>
72 </div>
75 </div>
76 {%- endblock pyout %}
73 {%- endblock pyout %}
77
74
78 {% block stream_stdout -%}
75 {% block stream_stdout -%}
79 <div class="hbox output_area">
80 <div class="prompt"></div>
81 <div class="box-flex1 output_subarea output_stream output_stdout">
76 <div class="box-flex1 output_subarea output_stream output_stdout">
82 <pre>{{output.text |ansi2html}}</pre>
77 <pre>{{output.text |ansi2html}}</pre>
83 </div>
78 </div>
84 </div>
85 {%- endblock stream_stdout %}
79 {%- endblock stream_stdout %}
86
80
87 {% block stream_stderr -%}
81 {% block stream_stderr -%}
88 <div class="hbox output_area">
89 <div class="prompt"></div>
90 <div class="box-flex1 output_subarea output_stream output_stderr">
82 <div class="box-flex1 output_subarea output_stream output_stderr">
91 <pre>{{output.text |ansi2html}}</pre>
83 <pre>{{output.text |ansi2html}}</pre>
92 </div>
84 </div>
93 </div>
94 {%- endblock stream_stderr %}
85 {%- endblock stream_stderr %}
95
86
96 {% block data_svg -%}
87 {% block data_svg -%}
@@ -119,12 +110,9 b' unknown type {{cell.type}}'
119 {%- endblock data_latex %}
110 {%- endblock data_latex %}
120
111
121 {% block pyerr -%}
112 {% block pyerr -%}
122 <div class="hbox output_area">
123 <div class="prompt"></div>
124 <div class="box-flex1 output_subarea output_pyerr">
113 <div class="box-flex1 output_subarea output_pyerr">
125 <pre>{{super()}}</pre>
114 <pre>{{super()}}</pre>
126 </div>
115 </div>
127 </div>
128 {%- endblock pyerr %}
116 {%- endblock pyerr %}
129
117
130 {%- block traceback_line %}
118 {%- block traceback_line %}
@@ -133,15 +121,12 b' unknown type {{cell.type}}'
133
121
134
122
135 {%- block data_text %}
123 {%- block data_text %}
136 <pre>{{output.text | ansi2html}}</pre>
124 <pre>{{output.text | ansi2html}}</pre>
137 {%- endblock -%}
125 {%- endblock -%}
138
126
139
127
140 {%- block display_data scoped -%}
128 {%- block display_data scoped -%}
141 <div class="hbox output_area">
142 <div class="prompt"></div>
143 <div class="box-flex1 output_subarea output_display_data">
129 <div class="box-flex1 output_subarea output_display_data">
144 {{super()}}
130 {{super()}}
145 </div>
131 </div>
146 </div>
132 {%- endblock display_data -%} No newline at end of file
147 {%- endblock display_data -%}
General Comments 0
You need to be logged in to leave comments. Login now