From 66d42bc5e7e5770fcdc5e704e9c86449e8d04f8b 2013-07-26 22:44:55 From: Jonathan Frederic Date: 2013-07-26 22:44:55 Subject: [PATCH] Merge pull request #3770 from damianavila/group_reveal Organizing reveal's templates. --- diff --git a/IPython/nbconvert/templates/reveal.tpl b/IPython/nbconvert/templates/reveal.tpl index e40999e..9039e17 100644 --- a/IPython/nbconvert/templates/reveal.tpl +++ b/IPython/nbconvert/templates/reveal.tpl @@ -1,4 +1,4 @@ -{%- extends 'slides.tpl' -%} +{%- extends 'reveal_internals/slides.tpl' -%} {% block header %} diff --git a/IPython/nbconvert/templates/align_reveal_cells.tpl b/IPython/nbconvert/templates/reveal_internals/align_reveal_cells.tpl similarity index 92% rename from IPython/nbconvert/templates/align_reveal_cells.tpl rename to IPython/nbconvert/templates/reveal_internals/align_reveal_cells.tpl index 191add6..6eadac8 100644 --- a/IPython/nbconvert/templates/align_reveal_cells.tpl +++ b/IPython/nbconvert/templates/reveal_internals/align_reveal_cells.tpl @@ -1,4 +1,4 @@ -{%- extends 'reveal_cells.tpl' -%} +{%- extends 'reveal_internals/reveal_cells.tpl' -%} diff --git a/IPython/nbconvert/templates/reveal_cells.tpl b/IPython/nbconvert/templates/reveal_internals/reveal_cells.tpl similarity index 100% rename from IPython/nbconvert/templates/reveal_cells.tpl rename to IPython/nbconvert/templates/reveal_internals/reveal_cells.tpl diff --git a/IPython/nbconvert/templates/slides.tpl b/IPython/nbconvert/templates/reveal_internals/slides.tpl similarity index 91% rename from IPython/nbconvert/templates/slides.tpl rename to IPython/nbconvert/templates/reveal_internals/slides.tpl index b33084c..543379d 100644 --- a/IPython/nbconvert/templates/slides.tpl +++ b/IPython/nbconvert/templates/reveal_internals/slides.tpl @@ -1,4 +1,4 @@ -{%- extends 'subslides.tpl' -%} +{%- extends 'reveal_internals/subslides.tpl' -%} diff --git a/IPython/nbconvert/templates/subslides.tpl b/IPython/nbconvert/templates/reveal_internals/subslides.tpl similarity index 90% rename from IPython/nbconvert/templates/subslides.tpl rename to IPython/nbconvert/templates/reveal_internals/subslides.tpl index a3c10b4..9a14900 100644 --- a/IPython/nbconvert/templates/subslides.tpl +++ b/IPython/nbconvert/templates/reveal_internals/subslides.tpl @@ -1,4 +1,4 @@ -{%- extends 'align_reveal_cells.tpl' -%} +{%- extends 'reveal_internals/align_reveal_cells.tpl' -%} diff --git a/setupbase.py b/setupbase.py index 08ab416..fe32e16 100644 --- a/setupbase.py +++ b/setupbase.py @@ -153,7 +153,8 @@ def find_package_data(): 'IPython.qt.console' : ['resources/icon/*.svg'], 'IPython.nbconvert' : ['templates/*.tpl', 'templates/latex/*.tplx', 'templates/latex/skeleton/*.tplx', 'templates/skeleton/*', - 'tests/files/*.*', 'exporters/tests/files/*.*'] + 'templates/reveal_internals/*.tpl', 'tests/files/*.*', + 'exporters/tests/files/*.*'] } return package_data