Add voila style to tree page (#1385)

voila-dashboards · Aug 25, 2023 · e854c30 · e854c30
1 parent 68f6985
commit e854c30
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/share/jupyter/voila/templates/lab/index.html.j2 b/share/jupyter/voila/templates/lab/index.html.j2
@@ -10,7 +10,9 @@
 {%- endblock html_head_js -%}
 
 {%- block notebook_css -%}
-  {{ resources.include_js("static/voila-style.js") }}
+  {% if frontend == "voila" %}
+    {{ resources.include_js("static/voila-style.js") }}
+  {% endif %}
 
   {{ spinner.css() }}
 

diff --git a/share/jupyter/voila/templates/lab/tree.html b/share/jupyter/voila/templates/lab/tree.html
@@ -5,6 +5,9 @@
 {% block stylesheets %}
   {{ super() }}
 
+  {% if frontend == "voila" %}
+    {{ resources.include_js("static/voila-style.js") }}
+  {% endif %}
   <style>
     body {
       background-color: var(--jp-layout-color0);

diff --git a/share/jupyter/voila/templates/reveal/index.html.j2 b/share/jupyter/voila/templates/reveal/index.html.j2
@@ -36,7 +36,9 @@
 {%- block notebook_css -%}
   {{ resources.include_css("static/materialcolors.css") }}
   {{ resources.include_css("static/labvariables.css") }}
-  {{ resources.include_js("static/voila-style.js") }}
+  {% if frontend == "voila" %}
+    {{ resources.include_js("static/voila-style.js") }}
+  {% endif %}
 
   {{ spinner.css() }}
 

diff --git a/voila/tornado/treehandler.py b/voila/tornado/treehandler.py
@@ -13,7 +13,11 @@
 from tornado import web
 
 from ..treehandler import VoilaTreeHandler
-from ..utils import get_page_config, get_server_root_dir
+from ..utils import (
+    create_include_assets_functions,
+    get_page_config,
+    get_server_root_dir,
+)
 
 
 class TornadoVoilaTreeHandler(VoilaTreeHandler):
@@ -64,6 +68,8 @@ def allowed_content(content):
             page_config["frontend"] = "voila"
             page_config["query"] = self.request.query
             template_name = "tree-lab.html" if not classic_tree else "tree.html"
+
+            resources = create_include_assets_functions(template_name, self.base_url)
             self.write(
                 self.render_template(
                     template_name,
@@ -78,6 +84,7 @@ def allowed_content(content):
                     query=self.request.query,
                     page_config=page_config,
                     theme=theme_arg,
+                    resources=resources,
                 )
             )
         elif file_exists: