Move html templates into separate folder

IPython/nbconvert/exporters/html.py

@@ -12,6 +12,8 b''
 # Imports
 #-----------------------------------------------------------------------------
 
+import os
+
 from IPython.nbconvert import preprocessors
 from IPython.config import Config
 
@@ -32,8 +34,11 b' class HTMLExporter(TemplateExporter):'
     def _file_extension_default(self):
         return 'html'
 
+    def _default_template_path_default(self):
+        return os.path.join("..", "templates", "html")
+
     def _template_file_default(self):
-        return 'html_full'
+        return 'full'
     
     output_mimetype = 'text/html'
     

IPython/nbconvert/exporters/latex.py

@@ -43,9 +43,8 b' class LatexExporter(TemplateExporter):'
         return 'article'
 
     #Latex constants
-    default_template_path = Unicode(
-        os.path.join("..", "templates", "latex"), config=True,
-        help="Path where the template files are located.")
+    def _default_template_path_default(self):
+        return os.path.join("..", "templates", "latex")
 
     template_skeleton_path = Unicode(
         os.path.join("..", "templates", "latex", "skeleton"), config=True,

IPython/nbconvert/exporters/tests/test_html.py

@@ -47,7 +47,7 b' class TestHTMLExporter(ExportersTestsBase):'
         """
         Can a HTMLExporter export using the 'basic' template?
         """
-        (output, resources) = HTMLExporter(template_file='html_basic').from_filename(self._get_notebook())
+        (output, resources) = HTMLExporter(template_file='basic').from_filename(self._get_notebook())
         assert len(output) > 0
 
 
@@ -56,6 +56,6 b' class TestHTMLExporter(ExportersTestsBase):'
         """
         Can a HTMLExporter export using the 'full' template?
         """
-        (output, resources) = HTMLExporter(template_file='html_full').from_filename(self._get_notebook())
+        (output, resources) = HTMLExporter(template_file='full').from_filename(self._get_notebook())
         assert len(output) > 0
 

IPython/nbconvert/templates/html/full.tpl

@@ -1,4 +1,4 b''
-{%- extends 'html_basic.tpl' -%}
+{%- extends 'basic.tpl' -%}
 
 
 {%- block header -%}
@@ -67,4 +67,4 b' init_mathjax();'
 
 {% block footer %}
 </html>
-{% endblock footer %}
  No newline at end of file
+{% endblock footer %}

IPython/nbconvert/templates/html/reveal_internals/reveal_cells.tpl

@@ -1,4 +1,4 b''
-{%- extends 'html_basic.tpl' -%}
+{%- extends 'basic.tpl' -%}
 
 
 {%- block any_cell scoped -%}

IPython/nbconvert/tests/test_nbconvertapp.py

@@ -123,7 +123,7 b' class TestNbConvertApp(TestsBase):'
         """Is embedded png data well formed in HTML?"""
         with self.create_temp_cwd(['notebook2.ipynb']):
             self.call('nbconvert --log-level 0 --to HTML '
-                      'notebook2.ipynb --template html_full')
+                      'notebook2.ipynb --template full')
             assert os.path.isfile('notebook2.html')
             with open('notebook2.html') as f:
                 assert "data:image/png;base64,b'" not in f.read()