Fixed css in reveal template and move static_html css to full_html template.

converters/transformers.py

@@ -1,271 +1,269 b''
 """
 Module that regroups transformer that woudl be applied to ipynb files
 before going through the templating machinery.
 
 It exposes convenient classes to inherit from to access configurability
 as well as decorator to simplify tasks.
 """
 
 from __future__ import print_function
 
 from IPython.config.configurable import Configurable
 from IPython.utils.traitlets import Unicode, Bool, Dict, List
 
 from converters.config import GlobalConfigurable
 
 class ConfigurableTransformers(GlobalConfigurable):
     """ A configurable transformer
 
     Inherit from this class if you wish to have configurability for your
     transformer.
 
     Any configurable traitlets this class exposed will be configurable in profiles
     using c.SubClassName.atribute=value
 
     you can overwrite cell_transform to apply a transformation independently on each cell
     or __call__ if you prefer your own logic. See orresponding docstring for informations.
 
 
     """
 
     def __init__(self, config=None, **kw):
         super(ConfigurableTransformers, self).__init__(config=config, **kw)
 
     def __call__(self, nb, other):
         """transformation to apply on each notebook.
 
         received a handle to the current notebook as well as a dict of resources
         which structure depends on the transformer.
 
         You should return modified nb, other.
 
         If you wish to apply on each cell, you might want to overwrite cell_transform method.
         """
         try :
             for worksheet in nb.worksheets :
                 for index, cell in enumerate(worksheet.cells):
                     worksheet.cells[index], other = self.cell_transform(cell, other, index)
             return nb, other
         except NotImplementedError:
             raise NotImplementedError('should be implemented by subclass')
 
     def cell_transform(self, cell, other, index):
         """
         Overwrite if you want to apply a transformation on each cell,
 
         receive the current cell, the resource dict and the index of current cell as parameter.
 
         You should return modified cell and resource dict.
         """
         raise NotImplementedError('should be implemented by subclass')
         return cell, other
 
 
 class ActivatableTransformer(ConfigurableTransformers):
     """A simple ConfigurableTransformers that have an enabled flag
 
     Inherit from that if you just want to have a transformer which is
     no-op by default but can be activated in profiles with
 
     c.YourTransformerName.enabled = True
     """
 
     enabled = Bool(False, config=True)
 
     def __call__(self, nb, other):
         if not self.enabled :
             return nb, other
         else :
             return super(ActivatableTransformer, self).__call__(nb, other)
 
 
 def cell_preprocessor(function):
     """ wrap a function to be executed on all cells of a notebook
 
     wrapped function  parameters :
         cell  : the cell
         other : external resources
         index : index of the cell
     """
     def wrappedfunc(nb, other):
         for worksheet in nb.worksheets :
             for index, cell in enumerate(worksheet.cells):
                 worksheet.cells[index], other = function(cell, other, index)
         return nb, other
     return wrappedfunc
 
 
 @cell_preprocessor
 def haspyout_transformer(cell, other, count):
     """
     Add a haspyout flag to cell that have it
 
     Easier for templating, where you can't know in advance
     wether to write the out prompt
 
     """
     cell.type = cell.cell_type
     cell.haspyout = False
     for out in cell.get('outputs', []):
         if out.output_type == 'pyout':
             cell.haspyout = True
             break
     return cell, other
 
 @cell_preprocessor
 def coalesce_streams(cell, other, count):
     """merge consecutive sequences of stream output into single stream
 
     to prevent extra newlines inserted at flush calls
 
     TODO: handle \r deletion
     """
     outputs = cell.get('outputs', [])
     if not outputs:
         return cell, other
     new_outputs = []
     last = outputs[0]
     new_outputs = [last]
     for output in outputs[1:]:
         if (output.output_type == 'stream' and
             last.output_type == 'stream' and
             last.stream == output.stream
         ):
             last.text += output.text
         else:
             new_outputs.append(output)
 
     cell.outputs = new_outputs
     return cell, other
 
 class ExtractFigureTransformer(ActivatableTransformer):
 
 
     extra_ext_map =  Dict({},
             config=True,
             help="""extra map to override extension based on type.
             Usefull for latex where svg will be converted to pdf before inclusion
             """
             )
 
     key_format_map =  Dict({},
             config=True,
             )
 
     figname_format_map =  Dict({},
             config=True,
             )
 
 
     #to do change this to .format {} syntax
     default_key_tpl = Unicode('_fig_{count:02d}.{ext}', config=True)
 
     def _get_ext(self, ext):
         if ext in self.extra_ext_map :
             return self.extra_ext_map[ext]
         return ext
 
     def _new_figure(self, data, fmt, count):
         """Create a new figure file in the given format.
 
         """
         tplf = self.figname_format_map.get(fmt, self.default_key_tpl)
         tplk = self.key_format_map.get(fmt, self.default_key_tpl)
 
         # option to pass the hash as data ?
         figname = tplf.format(count=count, ext=self._get_ext(fmt))
         key     = tplk.format(count=count, ext=self._get_ext(fmt))
 
         # Binary files are base64-encoded, SVG is already XML
         if fmt in ('png', 'jpg', 'pdf'):
             data = data.decode('base64')
 
         return figname, key, data
 
 
     def cell_transform(self, cell, other, count):
         if other.get('figures', None) is None :
             other['figures'] = {}
         for out in cell.get('outputs', []):
             for out_type in self.display_data_priority:
                 if out.hasattr(out_type):
                     figname, key, data = self._new_figure(out[out_type], out_type, count)
                     out['key_'+out_type] = figname
                     other['figures'][key] = data
                     count = count+1
         return cell, other
 
 
 class RevealHelpTransformer(ConfigurableTransformers):
 
     def __call__(self, nb, other):
         for worksheet in nb.worksheets :
             for i, cell in enumerate(worksheet.cells):
                 cell.metadata.slide_type = cell.metadata.get('slideshow', {}).get('slide_type', None)
                 if cell.metadata.slide_type is None:
                     cell.metadata.slide_type = '-'
                 if cell.metadata.slide_type in ['slide']:
                     worksheet.cells[i - 1].metadata.slide_helper = 'slide_end'
                 if cell.metadata.slide_type in ['subslide']:
                     worksheet.cells[i - 1].metadata.slide_helper = 'subslide_end'
         return nb, other
 
 
 class CSSHtmlHeaderTransformer(ActivatableTransformer):
 
     def __call__(self, nb, resources):
         """Fetch and add css to the resource dict
 
         Fetch css from IPython adn Pygment to add at the beginning
         of the html files.
 
         Add this css in resources in the "inlining.css" key
         """
         resources['inlining'] = {}
         resources['inlining']['css'] = self.header
         return nb, resources
 
     header = []
 
     def __init__(self, config=None, **kw):
         super(CSSHtmlHeaderTransformer, self).__init__(config=config, **kw)
         if self.enabled :
             self.regen_header()
 
     def regen_header(self):
         ## lazy load asa this might not be use in many transformers
         import os
         from IPython.utils import path
         import io
         from pygments.formatters import HtmlFormatter
         header = []
         static = os.path.join(path.get_ipython_package_dir(),
             'frontend', 'html', 'notebook', 'static',
         )
         here = os.path.split(os.path.realpath(__file__))[0]
         css = os.path.join(static, 'css')
         for sheet in [
             # do we need jquery and prettify?
             # os.path.join(static, 'jquery', 'css', 'themes', 'base',
             # 'jquery-ui.min.css'),
             # os.path.join(static, 'prettify', 'prettify.css'),
             os.path.join(css, 'boilerplate.css'),
             os.path.join(css, 'fbm.css'),
             os.path.join(css, 'notebook.css'),
             os.path.join(css, 'renderedhtml.css'),
             os.path.join(css, 'style.min.css'),
-            # our overrides:
-            os.path.join(here, '..', 'css', 'static_html.css'),
         ]:
             try:
                 with io.open(sheet, encoding='utf-8') as f:
                     s = f.read()
                     header.append(s)
             except IOError:
                 # new version of ipython with style.min.css, pass
                 pass
 
         pygments_css = HtmlFormatter().get_style_defs('.highlight')
         header.append(pygments_css)
         self.header = header
 

templates/fullhtml.tpl

@@ -1,46 +1,58 b''
 {%- extends 'basichtml.tpl' -%}
 
 {%- block header -%}<!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
 <title>[{{nb.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.4em;
+}
+</style>
+
 <script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript">
 
 </script>
 <script type="text/javascript">
 init_mathjax = function() {
     if (window.MathJax) {
         // MathJax loaded
         MathJax.Hub.Config({
             tex2jax: {
                 inlineMath: [ ['$','$'], ["\\(","\\)"] ],
                 displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
             },
             displayAlign: 'left', // Change this to 'center' to center equations.
             "HTML-CSS": {
                 styles: {'.MathJax_Display': {"margin": 0}}
             }
         });
         MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
     }
 }
 init_mathjax();
 </script>
 </head>
 {%- endblock header -%}
 
 
 {% block body %}
 <body>{{ super() }}
 </body>
 {%- endblock body %}
 
 
 {% block footer %}
 </html>{% endblock footer %}

templates/reveal.tpl

@@ -1,148 +1,154 b''
 {%- extends 'slides.tpl' -%}
 
 
 {% block header %}
 <!DOCTYPE html>
 <html>
 <head>
 
 <meta charset="utf-8" />
 <meta http-equiv="X-UA-Compatible" content="chrome=1">
 
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 
 <link rel="stylesheet" href="reveal/css/reveal.css">
 <link rel="stylesheet" href="reveal/css/theme/simple.css" id="theme">
 
 <!-- For syntax highlighting -->
 <link rel="stylesheet" href="reveal/lib/css/zenburn.css">
 
 <!-- If the query includes 'print-pdf', use the PDF print sheet -->
 <script>
 document.write( '<link rel="stylesheet" href="reveal/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
 </script>
 
 <!--[if lt IE 9]>
 <script src="reveal/lib/js/html5shiv.js"></script>
 <![endif]-->
 
 {% 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 */
-
 .reveal {
   font-size: 20px;
 }
 .reveal pre {
-    width: 100%;
-    padding: 0.2em;
-    margin: 0px auto;
-    font-family: monospace, sans-serif;
-    font-size: 60%;
-    box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+width: 100%;
+padding: 0.3em;
+margin: 0px auto;
+font-family: monospace, sans-serif;
+font-size: 80%;
+box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
 }
 .reveal section img {
-    border: 0px solid black;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0);
+border: 0px solid black;
+box-shadow: 0 0 10px rgba(0, 0, 0, 0);
+}
+.reveal .slides {
+text-align: left;
 }
 div.input_area {
-    padding: 0.2em;
+padding: 0.06em;
 }
 div.code_cell {
-    background-color: transparent;
+background-color: transparent;
 }
 div.prompt {
-    width: 11ex;
-    padding: 0.0em;
-    margin: 0px;
-    font-family: monospace;
-    font-size: 60%;
-    text-align: center;
+width: 11ex;
+padding: 0.4em;
+margin: 0px;
+font-family: monospace, sans-serif;
+font-size: 80%;
+text-align: right;
+}
+div.output_area pre {
+font-family: monospace, sans-serif;
+font-size: 80%;
 }
 div.output_prompt {
     /* 5px right shift to account for margin in parent container */
     margin: 5px 5px 0 -5px;
 }
 </style>
 </head>
 {% endblock header%}
 
 
 {% block body %}
 <body>
 <div class="reveal"><div class="slides">
 
 {{ super() }}
 
 </div></div>
 
 <!-- Social buttons -->
 <div class="addthis_toolbox addthis_floating_style addthis_32x32_style" style="left:20px;top:20px;">
 <a class="addthis_button_twitter"></a>
 <a class="addthis_button_google_plusone_share"></a>
 <a class="addthis_button_linkedin"></a>
 <a class="addthis_button_facebook"></a>
 <a class="addthis_button_more"></a>
 </div>
 <!-- End of social buttons -->
 
 <!-- MathJax configuration -->
 <script type="text/x-mathjax-config">
 MathJax.Hub.Config({
     tex2jax: {
         inlineMath: [ ['$','$'], ["\\(","\\)"] ],
         displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
     },
-    displayAlign: 'center', // Change this to 'center' to center equations.
+    displayAlign: 'left', // Change this to 'center' to center equations.
     "HTML-CSS": {
         styles: {'.MathJax_Display': {"margin": 0}}
     }
 });
 </script>
 <!-- End of mathjax configuration -->
 
 <script src="reveal/lib/js/head.min.js"></script>
 
 <script src="reveal/js/reveal.min.js"></script>
 
 <script>
 
 // Full list of configuration options available here: https://github.com/hakimel/reveal.js#configuration
 Reveal.initialize({
 controls: true,
 progress: true,
 history: true,
 
 theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
 transition: Reveal.getQueryHash().transition || 'linear', // default/cube/page/concave/zoom/linear/none
 
 // Optional libraries used to extend on reveal.js
 dependencies: [
 { src: 'reveal/lib/js/classList.js', condition: function() { return !document.body.classList; } },
 { src: 'reveal/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
 { src: 'reveal/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
 { src: 'reveal/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
 { src: 'http://s7.addthis.com/js/300/addthis_widget.js', async: true},
 { src: 'js/mathjax-onload.js', async: true}
 ]
 });
 </script>
 
 <script>
 Reveal.addEventListener( 'slidechanged', function( event ) {
 MathJax.Hub.Rerender(event.currentSlide);
 });
 </script>
 
 </body>
 {% endblock body %}
 
 {% block footer %}
 </html>
 {% endblock footer %}
  No newline at end of file