Browse Source

Fix template for ipython ver 3

Benjamin ABEL 10 years ago
parent
commit
1a6476f5ef
1 changed files with 32 additions and 21 deletions
  1. 32 21
      liquid_tags/pelicanhtml_3.tpl

+ 32 - 21
liquid_tags/pelicanhtml_3.tpl

@@ -1,44 +1,55 @@
 {%- extends 'basic.tpl' -%}
 
 {% block stream_stdout -%}
-<div class="box-flex1 output_subarea output_stream output_stdout">
-<pre class="ipynb">{{output.text |ansi2html}}</pre>
+<div class="output_subarea output_stream output_stdout output_text">
+<pre class="ipynb">
+{{- output.text | ansi2html -}}
+</pre>
 </div>
 {%- endblock stream_stdout %}
 
 {% block stream_stderr -%}
-<div class="box-flex1 output_subarea output_stream output_stderr">
-<pre class="ipynb">{{output.text |ansi2html}}</pre>
+<div class="output_subarea output_stream output_stderr output_text">
+<pre class="ipynb">
+{{- output.text | ansi2html -}}
+</pre>
 </div>
 {%- endblock stream_stderr %}
 
-{% block pyerr -%}
-<div class="box-flex1 output_subarea output_pyerr">
-<pre class="ipynb">{{super()}}</pre>
+{% block error -%}
+<div class="output_subarea output_text output_error">
+<pre class="ipynb">
+{{- super() -}}
+</pre>
 </div>
-{%- endblock pyerr %}
+{%- endblock error %}
 
-{%- block data_text %}
-<pre class="ipynb">{{output.text | ansi2html}}</pre>
+{%- block data_text scoped %}
+<div class="output_text output_subarea {{extra_class}}">
+<pre class="ipynb">
+{{- output.data['text/plain'] | ansi2html -}}
+</pre>
+</div>
 {%- endblock -%}
 
 {% block input %}
-{% if "# <!-- collapse=True -->" in cell.input %}
-<div class="collapseheader box-flex1"><span style="font-weight: bold;">Expand Code</span>
-<div class="input_area box-flex1" style="display:none">
-{{ cell.input.replace("# <!-- collapse=True -->\n", "") | highlight2html(metadata=cell.metadata) }}
+{% if "# <!-- collapse=True -->" in cell.source %}
+<div class="inner_cell"><span style="font-weight: bold;">Expand Code</span>
+<div class="input_area" style="display:none">
+{{ cell.source.replace("# <!-- collapse=True -->\n", "") | highlight2html(metadata=cell.metadata) }}
 </div>
 </div>
-{% elif "# <!-- collapse=False -->" in cell.input %}
-<div class="collapseheader box-flex1"><span style="font-weight: bold;">Collapse Code</span>
-<div class="input_area box-flex1">
-{{ cell.input.replace("# <!-- collapse=False -->\n", "") | highlight2html(metadata=cell.metadata) }}
+{% elif "# <!-- collapse=False -->" in cell.source %}
+<div class="inner_cell"><span style="font-weight: bold;">Collapse Code</span>
+<div class="input_area">
+{{ cell.source.replace("# <!-- collapse=False -->\n", "") | highlight2html(metadata=cell.metadata) }}
 </div>
 </div>
 {% else %}
-<div class="input_area box-flex1">
-{{ cell.input | highlight2html(metadata=cell.metadata) }}
+<div class="inner_cell">
+    <div class="input_area">
+        {{ cell.source | highlight_code(metadata=cell.metadata) }}
+    </div>
 </div>
 {% endif %}
 {%- endblock input %}
-