Restructuration of null.tpl and addition of inner_cell classes.

IPython/nbconvert/templates/html/basic.tpl

@@ -53,24 +53,40 b' In [{{ cell.prompt_number }}]:'
 </div>
 {% endblock output %}
 
-{% block markdowncell scoped %}
-<div class="text_cell_render border-box-sizing rendered_html">
-<div class="prompt input_prompt"></div>
+{% block e_in_prompt -%}
+<div class="prompt input_prompt">
+</div>
+{%- endblock e_in_prompt %}
+
+{% block m_input %}
 <div class="inner_cell">
+<div class="text_cell_render border-box-sizing rendered_html">
 {{ cell.source  | markdown2html | strip_files_prefix }}
 </div>
 </div>
-{%- endblock markdowncell %}
+{%- endblock m_input %}
 
-{% block headingcell scoped %}
+{% block h_input %}
+<div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ ("#" * cell.level + cell.source) | replace('\n', ' ')  | markdown2html | strip_files_prefix | add_anchor }}
 </div>
-{% endblock headingcell %}
+</div>
+{% endblock h_input %}
+
+{% block r_input %}
+<div class="inner_cell">
+{% if cell.metadata.get('raw_mimetype', resources.get('raw_mimetype', '')).lower() in resources.get('raw_mimetypes', ['']) %}
+    {{ cell.source }}
+{% endif %}
+</div>
+{% endblock r_input %}
 
-{% block unknowncell scoped %}
+{% block u_input %}
+<div class="inner_cell">
 unknown type  {{ cell.type }}
-{% endblock unknowncell %}
+</div>
+{% endblock u_input %}
 
 {% block pyout -%}
 <div class="box-flex1 output_subarea output_pyout">

IPython/nbconvert/templates/skeleton/null.tpl

@@ -71,9 +71,17 b' consider calling super even if it is a leave block, we might insert more blocks '
                 {%- endblock codecell -%}
             {%- elif cell.cell_type in ['markdown'] -%}
                 {%- block markdowncell scoped-%}
+                    {%- block input_group -%}
+                            {%- block e_in_prompt -%}{%- endblock e_in_prompt -%}
+                            {%- block m_input -%}{%- endblock m_input -%}
+                    {%- endblock input_group -%}
                 {%- endblock markdowncell -%}
             {%- elif cell.cell_type in ['heading'] -%}
                 {%- block headingcell scoped-%}
+                    {%- block input_group -%}
+                            {%- block e_in_prompt -%}{%- endblock e_in_prompt -%}
+                            {%- block h_input -%}{%- endblock h_input -%}
+                    {%- endblock input_group -%}
                 {%- endblock headingcell -%}
             {%- elif cell.cell_type in ['raw'] -%}
                 {%- block rawcell scoped -%}
@@ -83,6 +91,10 b' consider calling super even if it is a leave block, we might insert more blocks '
                 {%- endblock rawcell -%}
             {%- else -%}
                 {%- block unknowncell scoped-%}
+                    {%- block input_group -%}
+                            {%- block e_in_prompt -%}{%- endblock e_in_prompt -%}
+                            {%- block u_input -%}{%- endblock u_input -%}
+                    {%- endblock input_group -%}
                 {%- endblock unknowncell -%}
             {%- endif -%}
         {%- endblock any_cell -%}