Use new template option for sos convert #307

src/sos_notebook/converter.py

@@ -325,18 +325,9 @@ def convert(self, notebook_file, sos_file, args=None, unknown_args=None):
 # notebook to HTML
 #
 
-def get_template_args(name):
-    if not name:
-        return []
-    for path in [
-        '',
-        os.path.join('{os.path.split(os.path.abspath(sos.__file__))[0]}', 'templates'),
-        os.path.join('{os.path.split(os.path.abspath(__file__))[0]}', 'templates')]:
-        for template in [name, name + '.tpl']:
-            template_file = os.path.join(path, template)
-            if os.path.isfile(template_file):
-                return ['--template-file', template_file]
-    return []
+def get_template_args():
+    return ['--TemplateExporter.extra_template_basedirs', os.path.join('{os.path.split(os.path.abspath(__file__))[0]}', 'templates')]
+
 
 def export_notebook(exporter_class,
                     to_format,
@@ -484,7 +475,7 @@ def convert(self,
         if unknown_args is None:
             unknown_args = []
         if sargs.template:
-            unknown_args = get_template_args(sargs.template) + unknown_args
+            unknown_args = get_template_args() + unknown_args
 
         if sargs.execute is not None:
             notebook_file = execute_sos_notebook(
@@ -553,7 +544,7 @@ def convert(self,
         if unknown_args is None:
             unknown_args = []
         if sargs.template:
-            unknown_args = get_template_args(sargs.template) + unknown_args
+            unknown_args = get_template_args() + unknown_args
         # jupyter convert will add extension to output file...
         if output_file is not None and output_file.endswith('.pdf'):
             output_file = output_file[:-4]

src/sos_notebook/templates/sos-cm-toc/conf.json

@@ -0,0 +1,6 @@
+{
+  "base_template": "sos-cm",
+  "mimetypes": {
+    "text/html": true
+  }
+}

src/sos_notebook/templates/sos-cm-toc/index.html.j2

@@ -0,0 +1 @@
+{% extends 'sos-cm-toc.html.j2' %}

src/sos_notebook/templates/sos-cm-toc.tpl → src/sos_notebook/templates/sos-cm-toc/sos-cm-toc.html.j2

@@ -1,5 +1,5 @@
 
-{% extends 'sos-cm.tpl' %}
+{% extends 'sos-cm.html.j2' %}
 
 {% import 'parts/toc.tpl' as toc %}
 

src/sos_notebook/templates/sos-cm/conf.json

@@ -0,0 +1,6 @@
+{
+  "base_template": "sos-full",
+  "mimetypes": {
+    "text/html": true
+  }
+}

src/sos_notebook/templates/sos-cm/index.html.j2

@@ -0,0 +1 @@
+{% extends 'sos-cm.html.j2' %}