Merge pull request #113 from minrk/reorder-output-div

fix output div ordering in html

templates/basichtml.tpl

@@ -1,139 +1,143 b''
 {%- extends 'display_priority.tpl' -%}
 
 
 
 {% block codecell %}
 <div class="cell border-box-sizing code_cell vbox">
 {{ super() }}</div>
 {%- endblock codecell %}
 
 {% block input_group -%}
 <div class="input hbox">
 {{super()}}
 </div>
 {% endblock input_group %}
 
-{% block outputs -%}
-<div class="output vbox">
-{{ super() }}
-</div>
-{% endblock outputs %}
-
-{% block output_group -%}
+{% block output_group %}
 <div class="vbox output_wrapper">
-<div class="hbox output_area">
+<div class="output vbox">
 {{ super() }}
 </div>
 </div>
 {% endblock output_group %}
 
-
 {% block in_prompt -%}
 <div class="prompt input_prompt">In&nbsp;[{{cell.prompt_number}}]:</div>
 {%- endblock in_prompt %}
 
-{% block output_prompt -%}
-<div class="prompt output_prompt">
-{%- if cell.haspyout -%}
-Out[{{cell.prompt_number}}]:
-{%- endif -%}
-</div>
+{# 
+  output_prompt doesn't do anything in HTML,
+  because there is a prompt div in each output area (see output block)
+#}
+{% block output_prompt %}
 {% endblock output_prompt %}
 
 {% block input %}
 <div class="input_area box-flex1">
 {{cell.input | highlight }}
 </div>
 {%- endblock input %}
 
+{% block output %}
+<div class="hbox output_area">
+{%- if output.output_type == 'pyout' -%}
+<div class="prompt output_prompt">
+Out[{{cell.prompt_number}}]:
+{%- else -%}
+<div class="prompt">
+{%- endif -%}
+</div>
+{{ super() }}
+</div>
+{% endblock output %}
 
 {% block markdowncell scoped %}
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ cell.source | markdown| rm_fake}}
 </div>
 {%- endblock markdowncell %}
 
 {% block headingcell scoped %}
 <div class="text_cell_render border-box-sizing rendered_html">
 <h{{cell.level}}>
 {% set source = cell.source | replace(' ','_') %}
 <a class="heading-anchor" id="{{source}}" href="#{{source}}">
   {{cell.source}}
 </a>
 </h{{cell.level}}>
 </div>
 {% endblock headingcell %}
 
 {% block rawcell scoped %}
 {{ cell.source }}
 {% endblock rawcell %}
 
 {% block unknowncell scoped %}
 unknown type  {{cell.type}}
 {% endblock unknowncell %}
 
 
 {% block pyout -%}
 <div class="box-flex1 output_subarea output_pyout">
 {% block data_priority scoped %}{{ super()}}{% endblock %}
 </div>
 {%- endblock pyout %}
 
 {% block stream_stdout -%}
 <div class="box-flex1 output_subarea output_stream output_stdout">
 <pre>{{output.text |ansi2html}}</pre>
 </div>
 {%- endblock stream_stdout %}
 
 {% block stream_stderr -%}
 <div class="box-flex1 output_subarea output_stream output_stderr">
 <pre>{{output.text |ansi2html}}</pre>
 </div>
 {%- endblock stream_stderr %}
 
 {% block data_svg -%}
 {{output.svg}}
 {%- endblock data_svg %}
 
 
 {% block data_html -%}
 <div class="output_html rendered_html">
 {{output.html}}
 </div>
 {%- endblock data_html %}
 
 {% block data_png %}
 <img src="data:image/png;base64,{{output.png}}">
 {%- endblock data_png %}
 
 
 {% block data_jpg %}
 <img src="data:image/jpeg;base64,{{output.jpeg}}">
 {%- endblock data_jpg %}
 
 
 {% block data_latex %}
 {{output.latex}}
 {%- endblock data_latex %}
 
 {% block pyerr -%}
 <div class="box-flex1 output_subarea output_pyerr">
 <pre>{{super()}}</pre>
 </div>
 {%- endblock pyerr %}
 
 {%- block traceback_line %}
 {{line| ansi2html}}
 {%- endblock traceback_line %}
 
 
 {%- block data_text %}
 <pre>{{output.text | ansi2html}}</pre>
 {%- endblock -%}
 
 
 {%- block display_data scoped -%}
 <div class="box-flex1 output_subarea output_display_data">
 {{super()}}
 </div>
 {%- endblock display_data -%}

templates/skeleton/null.tpl

@@ -1,89 +1,91 b''
 {#
 
 DO NOT USE THIS AS A BASE WORK,
 IF YOU ARE COPY AND PASTING THIS FILE
 YOU ARE PROBABLY DOING THINGS WRONG.
 
 Null template, Does nothing except defining a basic structure
-To layout the diferents blocks of a notebook.
+To layout the different blocks of a notebook.
 
-Subtemplates can Override Blocks to define their custom reresentation.
+Subtemplates can override blocks to define their custom representation.
 
-If one of the block you do overrite is not a leave block, consider
+If one of the block you do overwrite is not a leave block, consider
 calling super.
 
 {%- block nonLeaveBlock -%}
     #add stuff at beginning
     {{ super() }}
     #add stuff at end
 {%- endblock nonLeaveBlock -%}
 
-consider calling super even if block is leave block, we might insert more block later.
+consider calling super even if it is a leave block, we might insert more blocks later.
 
 #}
 {%- block header -%}
 {%- endblock header -%}
 {%- block body -%}
 {%- for worksheet in nb.worksheets -%}
     {%- for cell in worksheet.cells -%}
         {%- block any_cell scoped -%}
             {%- if cell.type in ['code'] -%}
                 {%- block codecell scoped -%}
                     {%- block input_group -%}
                         {%- block in_prompt -%}{%- endblock in_prompt -%}
                         {%- block input -%}{%- endblock input -%}
                     {%- endblock input_group -%}
-                        {%- if cell.outputs -%}
+                    {%- if cell.outputs -%}
                     {%- block output_group -%}
-                            {%- block output_prompt -%}{%- endblock output_prompt -%}
-                            {%- block outputs -%}
-                                {%- for output in cell.outputs -%}
+                        {%- block output_prompt -%}{%- endblock output_prompt -%}
+                        {%- block outputs scoped -%}
+                            {%- for output in cell.outputs -%}
+                                {%- block output scoped -%}
                                     {%- if output.output_type in ['pyout'] -%}
                                         {%- block pyout scoped -%}{%- endblock pyout -%}
                                     {%- elif output.output_type in ['stream'] -%}
                                         {%- block stream scoped -%}
                                             {%- if output.stream in ['stdout'] -%}
                                                 {%- block stream_stdout scoped -%}
                                                 {%- endblock stream_stdout -%}
                                             {%- elif output.stream in ['stderr'] -%}
                                                 {%- block stream_stderr scoped -%}
                                                 {%- endblock stream_stderr -%}
                                             {%- endif -%}
                                         {%- endblock stream -%}
                                     {%- elif output.output_type in ['display_data'] -%}
                                         {%- block display_data scoped -%}
                                             {%- block data_priority scoped -%}
                                             {%- endblock data_priority -%}
                                         {%- endblock display_data -%}
                                     {%- elif output.output_type in ['pyerr'] -%}
                                         {%- block pyerr scoped -%}
                                         {%- for line in output.traceback -%}
                                             {%- block traceback_line scoped -%}{%- endblock traceback_line -%}
                                         {%- endfor -%}
                                         {%- endblock pyerr -%}
                                     {%- endif -%}
-                                {%- endfor -%}
-                            {%- endblock outputs -%}
+                                {%- endblock output -%}
+                            {%- endfor -%}
+                        {%- endblock outputs -%}
                     {%- endblock output_group -%}
-                        {%- endif -%}
+                    {%- endif -%}
                 {%- endblock codecell -%}
             {%- elif cell.type in ['markdown'] -%}
                 {%- block markdowncell scoped-%}
                 {%- endblock markdowncell -%}
             {%- elif cell.type in ['heading'] -%}
                 {%- block headingcell scoped-%}
                 {%- endblock headingcell -%}
             {%- elif cell.type in ['raw'] -%}
                 {%- block rawcell scoped-%}
                 {%- endblock rawcell -%}
             {%- else -%}
                 {%- block unknowncell scoped-%}
                 {%- endblock unknowncell -%}
             {%- endif -%}
         {%- endblock any_cell -%}
     {%- endfor -%}
 {%- endfor -%}
 {%- endblock body -%}
 
 {%- block footer -%}
 {%- endblock footer -%}

templates/skeleton/tex/null.tplx

@@ -1,90 +1,92 b''
 ((= autogenerated file do not edit =))
 ((=
 
 DO NOT USE THIS AS A BASE WORK,
 IF YOU ARE COPY AND PASTING THIS FILE
 YOU ARE PROBABLY DOING THINGS WRONG.
 
 Null template, Does nothing except defining a basic structure
-To layout the diferents blocks of a notebook.
+To layout the different blocks of a notebook.
 
-Subtemplates can Override Blocks to define their custom reresentation.
+Subtemplates can override blocks to define their custom representation.
 
-If one of the block you do overrite is not a leave block, consider
+If one of the block you do overwrite is not a leave block, consider
 calling super.
 
 ((*- block nonLeaveBlock -*))
     #add stuff at beginning
     ((( super() )))
     #add stuff at end
 ((*- endblock nonLeaveBlock -*))
 
-consider calling super even if block is leave block, we might insert more block later.
+consider calling super even if it is a leave block, we might insert more blocks later.
 
 =))
 ((*- block header -*))
 ((*- endblock header -*))
 ((*- block body -*))
 ((*- for worksheet in nb.worksheets -*))
     ((*- for cell in worksheet.cells -*))
         ((*- block any_cell scoped -*))
             ((*- if cell.type in ['code'] -*))
                 ((*- block codecell scoped -*))
                     ((*- block input_group -*))
                         ((*- block in_prompt -*))((*- endblock in_prompt -*))
                         ((*- block input -*))((*- endblock input -*))
                     ((*- endblock input_group -*))
-                        ((*- if cell.outputs -*))
+                    ((*- if cell.outputs -*))
                     ((*- block output_group -*))
-                            ((*- block output_prompt -*))((*- endblock output_prompt -*))
-                            ((*- block outputs -*))
-                                ((*- for output in cell.outputs -*))
+                        ((*- block output_prompt -*))((*- endblock output_prompt -*))
+                        ((*- block outputs scoped -*))
+                            ((*- for output in cell.outputs -*))
+                                ((*- block output scoped -*))
                                     ((*- if output.output_type in ['pyout'] -*))
                                         ((*- block pyout scoped -*))((*- endblock pyout -*))
                                     ((*- elif output.output_type in ['stream'] -*))
                                         ((*- block stream scoped -*))
                                             ((*- if output.stream in ['stdout'] -*))
                                                 ((*- block stream_stdout scoped -*))
                                                 ((*- endblock stream_stdout -*))
                                             ((*- elif output.stream in ['stderr'] -*))
                                                 ((*- block stream_stderr scoped -*))
                                                 ((*- endblock stream_stderr -*))
                                             ((*- endif -*))
                                         ((*- endblock stream -*))
                                     ((*- elif output.output_type in ['display_data'] -*))
                                         ((*- block display_data scoped -*))
                                             ((*- block data_priority scoped -*))
                                             ((*- endblock data_priority -*))
                                         ((*- endblock display_data -*))
                                     ((*- elif output.output_type in ['pyerr'] -*))
                                         ((*- block pyerr scoped -*))
                                         ((*- for line in output.traceback -*))
                                             ((*- block traceback_line scoped -*))((*- endblock traceback_line -*))
                                         ((*- endfor -*))
                                         ((*- endblock pyerr -*))
                                     ((*- endif -*))
-                                ((*- endfor -*))
-                            ((*- endblock outputs -*))
+                                ((*- endblock output -*))
+                            ((*- endfor -*))
+                        ((*- endblock outputs -*))
                     ((*- endblock output_group -*))
-                        ((*- endif -*))
+                    ((*- endif -*))
                 ((*- endblock codecell -*))
             ((*- elif cell.type in ['markdown'] -*))
                 ((*- block markdowncell scoped-*))
                 ((*- endblock markdowncell -*))
             ((*- elif cell.type in ['heading'] -*))
                 ((*- block headingcell scoped-*))
                 ((*- endblock headingcell -*))
             ((*- elif cell.type in ['raw'] -*))
                 ((*- block rawcell scoped-*))
                 ((*- endblock rawcell -*))
             ((*- else -*))
                 ((*- block unknowncell scoped-*))
                 ((*- endblock unknowncell -*))
             ((*- endif -*))
         ((*- endblock any_cell -*))
     ((*- endfor -*))
 ((*- endfor -*))
 ((*- endblock body -*))
 
 ((*- block footer -*))
 ((*- endblock footer -*))