upstream/ipython Commit - r11196:719de27e

Merge pull request from damianavila/reveal_cdn...

Min RK -

r11196:719de27e

parent child

IPython/nbconvert/exporters/reveal.py

0 +8 -1

             """
             Reveal slide show exporter.
             """
             #-----------------------------------------------------------------------------
             # Copyright (c) 2013, the IPython Development Team.
             #
             # Distributed under the terms of the Modified BSD License.
             #
             # The full license is in the file COPYING.txt, distributed with this software.
             #-----------------------------------------------------------------------------
             #-----------------------------------------------------------------------------
             # Imports
             #-----------------------------------------------------------------------------
             from IPython.utils.traitlets import Unicode
             from IPython.config import Config
             from .basichtml import BasicHTMLExporter
             from IPython.nbconvert import transformers
             #-----------------------------------------------------------------------------
             # Classes
             #-----------------------------------------------------------------------------
             class RevealExporter(BasicHTMLExporter):
                 """
                 Exports a Reveal slide show (.HTML) which may be rendered in a web browser.
                 """
                 file_extension = Unicode(
                     'reveal.html', config=True,
                     help="Extension of the file that should be written to disk")
                 template_file = Unicode(
                         'reveal', config=True,
                         help="Name of the template file to use")
                 def _register_transformers(self):
                     """
                     Register all of the transformers needed for this exporter.
                     """
                     #Register the transformers of the base class.
                     super(RevealExporter, self)._register_transformers()
                     #Register reveal help transformer
                     self.register_transformer(transformers.RevealHelpTransformer)
                 @property
                 def default_config(self):
-                    c = Config({'CSSHTMLHeaderTransformer':{'enabled':True}})
+                    c = Config({
+                        'CSSHTMLHeaderTransformer':{
+                            'enabled':True
+                            },
+                        'RevealHelpTransformer':{
+                            'enabled':True,
+                            },
+                        })
                     c.merge(super(RevealExporter,self).default_config)
                     return c

IPython/nbconvert/templates/reveal.tpl

0 +13 -12

             {%- 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.js/css/reveal.css">
+            <!-- General and theme style sheets -->
-            <link rel="stylesheet" href="reveal.js/css/theme/simple.css" id="theme">
+            <link rel="stylesheet" href="{{resources.reveal.url_prefix}}/css/reveal.css">
+            <link rel="stylesheet" href="{{resources.reveal.url_prefix}}/css/theme/simple.css" id="theme">
             <!-- For syntax highlighting -->
-            <link rel="stylesheet" href="reveal.js/lib/css/zenburn.css">
+            <link rel="stylesheet" href="{{resources.reveal.url_prefix}}/lib/css/zenburn.css">
             <!-- If the query includes 'print-pdf', use the PDF print sheet -->
             <script>
-            document.write( '<link rel="stylesheet" href="reveal.js/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
+            document.write( '<link rel="stylesheet" href="{{resources.reveal.url_prefix}}/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.js/lib/js/html5shiv.js"></script>
+            <script src="{{resources.reveal.url_prefix}}/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;
             overflow-y: auto;
             overflow-x: hidden;
             }
             .reveal pre {
             width: 95%;
             padding: 0.4em;
             margin: 0px;
             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);
             }
             .reveal .slides {
             text-align: left;
             }
             .reveal.fade {
             opacity: 1;
             }
             div.input_area {
             padding: 0.06em;
             }
             div.code_cell {
             background-color: transparent;
             }
             div.prompt {
             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;
             }
             .rendered_html p {
             text-align: inherit;
             }
             </style>
             </head>
             {% endblock header%}
             {% block body %}
             <body>
             <div class="reveal"><div class="slides">
             {{ super() }}
             </div></div>
             <!--
             Uncomment the following block and the addthis_widget.js (see below inside dependencies)
             to get enable 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>
             -->
-            <script src="reveal.js/lib/js/head.min.js"></script>
+            <script src="{{resources.reveal.url_prefix}}/lib/js/head.min.js"></script>
-            <script src="reveal.js/js/reveal.min.js"></script>
+            <script src="{{resources.reveal.url_prefix}}/js/reveal.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.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
+            { src: "{{resources.reveal.url_prefix}}/lib/js/classList.js", condition: function() { return !document.body.classList; } },
-            { src: 'reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
+            { src: "{{resources.reveal.url_prefix}}/plugin/highlight/highlight.js", async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
-            { src: 'reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
+            { src: "{{resources.reveal.url_prefix}}/plugin/notes/notes.js", async: true, condition: function() { return !!document.body.classList; } }
             // { src: 'http://s7.addthis.com/js/300/addthis_widget.js', async: true},
             ]
             });
             </script>
             <!-- MathJax configuration -->
             <script type="text/x-mathjax-config">
             MathJax.Hub.Config({
                 tex2jax: {
                     inlineMath: [ ['$','$'], ["\\(","\\)"] ],
                     displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
                 },
                 displayAlign: 'left', // Change this to 'center' to center equations.
                 "HTML-CSS": {
                     styles: {'.MathJax_Display': {"margin": 0}}
                 }
             });
             </script>
             <!-- End of mathjax configuration -->
             <script>
             //  We wait for the onload function to load MathJax after the page is completely loaded.
             //  MathJax is loaded 1 unit of time after the page is ready.
             //  This hack prevent problems when you load multiple js files (i.e. social button from addthis).
             //
             window.onload = function () {
               setTimeout(function () {
                 var script = document.createElement("script");
                 script.type = "text/javascript";
                 script.src  = "https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML";
                 document.getElementsByTagName("head")[0].appendChild(script);
               },1)
             }
             </script>
             <script>
             Reveal.addEventListener( 'slidechanged', function( event ) {
             MathJax.Hub.Rerender(event.currentSlide);
             });
             </script>
             </body>
             {% endblock body %}
             {% block footer %}
             </html>
             {% endblock footer %}

IPython/nbconvert/transformers/revealhelp.py

0 +15 -5

             """Module that pre-processes the notebook for export via Reveal.
             """
             #-----------------------------------------------------------------------------
             # Copyright (c) 2013, the IPython Development Team.
             #
             # Distributed under the terms of the Modified BSD License.
             #
             # The full license is in the file COPYING.txt, distributed with this software.
             #-----------------------------------------------------------------------------
             #-----------------------------------------------------------------------------
             # Imports
             #-----------------------------------------------------------------------------
             from .base import ConfigurableTransformer
+            from IPython.utils.traitlets import Unicode
             #-----------------------------------------------------------------------------
             # Classes and functions
             #-----------------------------------------------------------------------------
             class RevealHelpTransformer(ConfigurableTransformer):
+                url_prefix = Unicode('//cdn.jsdelivr.net/reveal.js/2.4.0',
+                                     config=True,
+                                     help="""If you want to use a local reveal.js library,
+                                     use 'url_prefix':'reveal.js' in your config object.""")
                 def call(self, nb, resources):
                     """
                     Called once to 'transform' contents of the notebook.
                     Parameters
                     ----------
                     nb : NotebookNode
                         Notebook being converted
                     resources : dictionary
                         Additional resources used in the conversion process.  Allows
                         transformers to pass variables into the Jinja engine.
                     """
                     for worksheet in nb.worksheets :
                         for i, cell in enumerate(worksheet.cells):
                             #Make sure the cell has slideshow metadata.
                             cell.metadata.align_type = cell.get('metadata', {}).get('slideshow', {}).get('align_type', 'Left')
                             cell.metadata.slide_type = cell.get('metadata', {}).get('slideshow', {}).get('slide_type', '-')
                             #Get the slide type.  If type is start of subslide or slide,
                             #end the last subslide/slide.
                             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'
+                    if 'reveal' not in resources:
+                        resources['reveal'] = {}
+                    resources['reveal']['url_prefix'] = self.url_prefix
                     return nb, resources
-  No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages