Removed notebook specific divs,

Fix for double div on pyout.

IPython/nbconvert/templates/html/basic.tpl

@@ -1,193 +1,193 b''
 {%- extends 'display_priority.tpl' -%}
 
 
 {% block codecell %}
 <div class="cell border-box-sizing code_cell rendered">
 {{ super() }}
 </div>
 {%- endblock codecell %}
 
 {% block input_group -%}
 <div class="input">
 {{ super() }}
 </div>
 {% endblock input_group %}
 
 {% block output_group %}
 <div class="output_wrapper">
 <div class="output">
 {{ super() }}
 </div>
 </div>
 {% endblock output_group %}
 
 {% block in_prompt -%}
 <div class="prompt input_prompt">
 In&nbsp;[{{ cell.prompt_number }}]:
 </div>
 {%- endblock in_prompt %}
 
 {% block empty_in_prompt -%}
 <div class="prompt input_prompt">
 </div>
 {%- endblock empty_in_prompt %}
 
 {# 
   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="inner_cell">
     <div class="input_area">
 {{ cell.input | highlight2html(language=resources.get('language'), metadata=cell.metadata) }}
 </div>
 </div>
 {%- endblock input %}
 
 {% block output %}
 <div class="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="cell border-box-sizing text_cell rendered">
 {{ self.empty_in_prompt() }}
 <div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 {{ cell.source  | markdown2html | strip_files_prefix }}
 </div>
 </div>
 </div>
 {%- endblock markdowncell %}
 
 {% block headingcell scoped %}
 <div class="cell border-box-sizing text_cell rendered">
 {{ self.empty_in_prompt() }}
 <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>
 </div>
 </div>
 {% endblock headingcell %}
 
 {% block unknowncell scoped %}
 unknown type  {{ cell.type }}
 {% endblock unknowncell %}
 
 {% block pyout -%}
-<div class="output_subarea output_text output_pyout">
+{%- set extra_classes=" output_pyout" -%}
 {% block data_priority scoped %}
 {{ super() }}
 {% endblock %}
-</div>
+{%- set extra_classes="" -%}
 {%- endblock pyout %}
 
 {% block stream_stdout -%}
 <div class="output_subarea output_stream output_stdout output_text">
 <pre>
 {{ output.text | ansi2html }}
 </pre>
 </div>
 {%- endblock stream_stdout %}
 
 {% block stream_stderr -%}
 <div class="output_subarea output_stream output_stderr output_text">
 <pre>
 {{ output.text | ansi2html }}
 </pre>
 </div>
 {%- endblock stream_stderr %}
 
-{% block data_svg -%}
-<div class="output_svg output_subarea">
+{% block data_svg scoped -%}
+<div class="output_svg output_subarea{{extra_classes}}">
 {%- if output.svg_filename %}
 <img src="{{output.svg_filename | posix_path}}"
 {%- else %}
 {{ output.svg }}
 {%- endif %}
 </div>
 {%- endblock data_svg %}
 
-{% block data_html -%}
-<div class="output_html rendered_html output_subarea">
+{% block data_html scoped -%}
+<div class="output_html rendered_html output_subarea{{extra_classes}}">
 {{ output.html }}
 </div>
 {%- endblock data_html %}
 
-{% block data_png %}
-<div class="output_png output_subarea">
+{% block data_png scoped %}
+<div class="output_png output_subarea{{extra_classes}}">
 {%- if output.png_filename %}
 <img src="{{output.png_filename | posix_path}}"
 {%- else %}
 <img src="data:image/png;base64,{{ output.png }}"
 {%- endif %}
 {%- if 'metadata' in output and 'width' in output.metadata.get('png', {}) %}
 width={{output.metadata['png']['width']}}
 {%- endif %}
 {%- if 'metadata' in output and 'height' in output.metadata.get('png', {}) %}
 height={{output.metadata['png']['height']}}
 {%- endif %}
 >
 </div>
 {%- endblock data_png %}
 
-{% block data_jpg %}
-<div class="output_jpeg output_subarea">
+{% block data_jpg scoped %}
+<div class="output_jpeg output_subarea{{extra_classes}}">
 {%- if output.jpeg_filename %}
 <img src="{{output.jpeg_filename | posix_path}}"
 {%- else %}
 <img src="data:image/jpeg;base64,{{ output.jpeg }}"
 {%- endif %}
 {%- if 'metadata' in output and 'width' in output.metadata.get('jpeg', {}) %}
 width={{output.metadata['jpeg']['width']}}
 {%- endif %}
 {%- if 'metadata' in output and 'height' in output.metadata.get('jpeg', {}) %}
 height={{output.metadata['jpeg']['height']}}
 {%- endif %}
 >
 </div>
 {%- endblock data_jpg %}
 
-{% block data_latex %}
-<div class="output_latex output_subarea">
+{% block data_latex scoped %}
+<div class="output_latex output_subarea{{extra_classes}}">
 {{ output.latex }}
 </div>
 {%- endblock data_latex %}
 
 {% block pyerr -%}
 <div class="output_subarea output_text output_pyerr">
 <pre>{{ super() }}</pre>
 </div>
 {%- endblock pyerr %}
 
 {%- block traceback_line %}
 {{ line | ansi2html }}
 {%- endblock traceback_line %}
 
-{%- block data_text %}
-<div class="output_text output_subarea">
+{%- block data_text scoped %}
+<div class="output_text output_subarea{{extra_classes}}">
 <pre>
 {{ output.text | ansi2html }}
 </pre>
 </div>
 {%- endblock -%}
 
-{%- block data_javascript %}
-<div class="output_subarea output_javascript">
+{%- block data_javascript scoped %}
+<div class="output_subarea output_javascript{{extra_classes}}">
 <script type="text/javascript">
 {{ output.javascript }}
 </script>
 </div>
 {%- endblock -%}

IPython/nbconvert/templates/html/full.tpl

@@ -1,90 +1,78 b''
 {%- extends 'basic.tpl' -%}
 {% from 'mathjax.tpl' import mathjax %}
 
 
 {%- block header -%}
 <!DOCTYPE html>
 <html>
 <head>
 
 <meta charset="utf-8" />
 <title>{{resources['metadata']['name']}}</title>
 
 {% for css in resources.inlining.css -%}
     <style type="text/css">
     {{ css }}
     </style>
 {% endfor %}
 
 <style type="text/css">
 /* Overrides of notebook CSS for static HTML export */
 body {
   overflow: visible;
   padding: 8px;
 }
 .input_area {
   padding: 0.2em;
 }
 
 pre {
   padding: 0.2em;
   border: none;
   margin: 0px;
   font-size: 13px;
 }
 
-div#notebook_panel {
-  -webkit-box-shadow: none; 
-  -moz-box-shadow: none; 
-  box-shadow: none;
-}
-
 div#notebook {
   overflow: visible;
   border-top: none;
 }
 
 @media print {
   div.cell {
     display: block;
     page-break-inside: avoid;
   } 
   div.output_wrapper { 
     display: block;
     page-break-inside: avoid; 
   }
   div.output { 
     display: block;
     page-break-inside: avoid; 
   }
 }
 </style>
 
 <!-- Custom stylesheet, it must be in the same directory as the html file -->
 <link rel="stylesheet" href="custom.css">
 
 <!-- Loading mathjax macro -->
 {{ mathjax() }}
 
 </head>
 {%- endblock header -%}
 
 {% block body %}
 <body>
-<div style="display: block;" id="site" class="border-box-sizing">
-  <div id="ipython-main-app" class="border-box-sizing">
-    <div id="notebook_panel" class="border-box-sizing">
-      <div tabindex="-1" id="notebook" class="border-box-sizing">
-        <div class="container" id="notebook-container">
+  <div tabindex="-1" id="notebook" class="border-box-sizing">
+    <div class="container" id="notebook-container">
 {{ super() }}
-        </div>
-      </div>
     </div>
   </div>
-</div>
 </body>
 {%- endblock body %}
 
 {% block footer %}
 </html>
 {% endblock footer %}