Move template files to templates directory under source #89

vatlab · Jun 20, 2018 · 5b43833 · 5b43833
1 parent 0ff92c1
commit 5b43833
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/sos_notebook/converter.py b/src/sos_notebook/converter.py
@@ -390,12 +390,10 @@ def notebook_to_html(notebook_file, output_file, sargs=None, unknown_args=None):
     import os
     if unknown_args is None:
         unknown_args = []
-    if sargs.template and sargs.template.startswith('sos') and not os.path.isfile(sargs.template):
-        # use the default sos template
-        unknown_args = ['--template', os.path.join(os.path.split(__file__)[0], sargs.template + (
-            '' if sargs.template.endswith('.tpl') else '.tpl'))] + unknown_args
-    elif sargs.template:
-        unknown_args = ['--template', sargs.template] + unknown_args
+    if sargs.template:
+        sos_template = os.path.join(os.path.split(os.path.abspath(__file__))[0],
+            'templates', sargs.template + ('' if sargs.template.endswith('.tpl') else '.tpl'))
+        unknown_args = ['--template', sos_template if os.path.isfile(sos_template) else sargs.template] + unknown_args
     export_notebook(HTMLExporter, 'html', notebook_file, output_file, unknown_args, view=sargs.view)
 
 

diff --git a/src/sos_notebook/sos-full.tpl → src/sos_notebook/templates/sos-full.tpl b/src/sos_notebook/sos-full.tpl → src/sos_notebook/templates/sos-full.tpl
diff --git a/src/sos_notebook/sos-report.tpl → src/sos_notebook/templates/sos-report.tpl b/src/sos_notebook/sos-report.tpl → src/sos_notebook/templates/sos-report.tpl