From 49175ed0535c398673f4bcf06af45d458a2208d8 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 13 Jun 2024 15:36:43 -0700 Subject: [PATCH 1/2] Use correctly-calculated html_file parameter for new display --- python/lsst/display/firefly/firefly.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/lsst/display/firefly/firefly.py b/python/lsst/display/firefly/firefly.py index 3f71911..4b12dd8 100644 --- a/python/lsst/display/firefly/firefly.py +++ b/python/lsst/display/firefly/firefly.py @@ -107,7 +107,7 @@ def __init__(self, display, verbose=False, url=None, print('Starting Jupyterlab client') _fireflyClient = firefly_client.FireflyClient.make_lab_client( start_tab=True, start_browser_tab=start_browser_tab, - html_file=kwargs.get('html_file'), verbose=verbose, + html_file=html_file, verbose=verbose, token=token) else: From 7cda820c0964acf65d9f8dce88ec0a995dfc028a Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 13 Jun 2024 15:37:23 -0700 Subject: [PATCH 2/2] Default to newer triview rather than slate for display page --- python/lsst/display/firefly/firefly.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/lsst/display/firefly/firefly.py b/python/lsst/display/firefly/firefly.py index 4b12dd8..80e15f6 100644 --- a/python/lsst/display/firefly/firefly.py +++ b/python/lsst/display/firefly/firefly.py @@ -84,7 +84,7 @@ def __init__(self, display, verbose=False, url=None, import os start_tab = None html_file = kwargs.get('html_file', - os.environ.get('FIREFLY_HTML', 'slate.html')) + os.environ.get('FIREFLY_HTML', '')) if url is None: if (('fireflyLabExtension' in os.environ) and ('fireflyURLLab' in os.environ)):