From 719de27efc4435f6cc285e1c681d6488460e843e 2013-07-05 18:34:23
From: Min RK <benjaminrk@gmail.com>
Date: 2013-07-05 18:34:23
Subject: [PATCH] Merge pull request #3533 from damianavila/reveal_cdn

Use a CDN to get reveal.js library

add reveal.url_prefix configurable
---

diff --git a/IPython/nbconvert/exporters/reveal.py b/IPython/nbconvert/exporters/reveal.py
index 3caf4c6..d42f599 100644
--- a/IPython/nbconvert/exporters/reveal.py
+++ b/IPython/nbconvert/exporters/reveal.py
@@ -49,6 +49,13 @@ class RevealExporter(BasicHTMLExporter):
 
     @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
diff --git a/IPython/nbconvert/templates/reveal.tpl b/IPython/nbconvert/templates/reveal.tpl
index bad885e..ab035cc 100644
--- a/IPython/nbconvert/templates/reveal.tpl
+++ b/IPython/nbconvert/templates/reveal.tpl
@@ -12,19 +12,20 @@
 <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">
-<link rel="stylesheet" href="reveal.js/css/theme/simple.css" id="theme">
+<!-- General and theme style sheets -->
+<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 -%}
@@ -96,7 +97,7 @@ text-align: inherit;
 
 </div></div>
 
-<!-- 
+<!--
 Uncomment the following block and the addthis_widget.js (see below inside dependencies)
 to get enable social buttons.
 -->
@@ -111,9 +112,9 @@ to get enable social buttons.
 </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>
 
@@ -128,9 +129,9 @@ transition: Reveal.getQueryHash().transition || 'linear', // default/cube/page/c
 
 // Optional libraries used to extend on reveal.js
 dependencies: [
-{ src: 'reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
-{ src: 'reveal.js/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}}/lib/js/classList.js", condition: function() { return !document.body.classList; } },
+{ src: "{{resources.reveal.url_prefix}}/plugin/highlight/highlight.js", async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
+{ 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},
 ]
 });
@@ -152,7 +153,7 @@ MathJax.Hub.Config({
 <!-- End of mathjax configuration -->
 
 <script>
-//  We wait for the onload function to load MathJax after the page is completely loaded.  
+//  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).
 //
diff --git a/IPython/nbconvert/transformers/revealhelp.py b/IPython/nbconvert/transformers/revealhelp.py
index 5ec4d1c..38cfa0e 100755
--- a/IPython/nbconvert/transformers/revealhelp.py
+++ b/IPython/nbconvert/transformers/revealhelp.py
@@ -13,6 +13,7 @@
 #-----------------------------------------------------------------------------
 
 from .base import ConfigurableTransformer
+from IPython.utils.traitlets import Unicode
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -20,10 +21,15 @@ from .base import ConfigurableTransformer
 
 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
@@ -32,8 +38,8 @@ class RevealHelpTransformer(ConfigurableTransformer):
             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):
 
@@ -47,6 +53,10 @@ class RevealHelpTransformer(ConfigurableTransformer):
                     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