diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py index 0c6b451f213..129d1c8f055 100644 --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -819,7 +819,7 @@ class VisualizationController( app["gene_region"] = {"chrom": gene_region.chrom, "start": gene_region.start, "end": gene_region.end} # fill template - return trans.fill_template("galaxy.panels.mako", config={"right_panel": True, "app": app, "bundle": "extended"}) + return trans.fill_template("visualization/trackster.mako", config={"app": app, "bundle": "extended"}) @web.expose def circster(self, trans, id=None, hda_ldda=None, dataset_id=None, dbkey=None): @@ -880,7 +880,7 @@ class VisualizationController( app = {"jscript": "circster", "viz_config": viz_config, "genome": genome} # fill template - return trans.fill_template("galaxy.panels.mako", config={"app": app, "bundle": "extended"}) + return trans.fill_template("visualization/trackster.mako", config={"app": app, "bundle": "extended"}) @web.expose def sweepster(self, trans, id=None, hda_ldda=None, dataset_id=None, regions=None): diff --git a/templates/base/base_panels.mako b/templates/base/base_panels.mako index 9028d29b948..75c592abb69 100644 --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -20,7 +20,6 @@ ## Default stylesheets <%def name="stylesheets()"> - ${h.css( 'bootstrap-tour', )} @@ -32,7 +31,6 @@ ## Default javascripts ## TODO: remove when all libs are required directly in modules <%def name="javascripts()"> - ${ h.dist_js( 'libs.bundled', 'generic.bundled' @@ -40,14 +38,11 @@ <%def name="javascript_app()"> - ${ galaxy_client.load() } ## Default late-load javascripts <%def name="late_javascripts()"> - - %if t.webapp.name == 'galaxy' and app.config.ga_code: ${galaxy_client.config_google_analytics(app.config.ga_code)} %endif @@ -99,7 +94,6 @@ ## Document - ${self.init()} diff --git a/templates/webapps/galaxy/base_panels.mako b/templates/webapps/galaxy/base_panels.mako index a6bdbc11114..8e4cdc0a73c 100644 --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -1,6 +1,6 @@ <%inherit file="/base/base_panels.mako"/> -<%namespace name="mod_masthead" file="/webapps/galaxy/galaxy.masthead.mako"/> +<%namespace name="mod_masthead" file="/webapps/galaxy/masthead.mako"/> ## Default title <%def name="title()"> diff --git a/templates/webapps/galaxy/galaxy.masthead.mako b/templates/webapps/galaxy/masthead.mako similarity index 100% rename from templates/webapps/galaxy/galaxy.masthead.mako rename to templates/webapps/galaxy/masthead.mako diff --git a/templates/webapps/galaxy/galaxy.panels.mako b/templates/webapps/galaxy/visualization/trackster.mako similarity index 95% rename from templates/webapps/galaxy/galaxy.panels.mako rename to templates/webapps/galaxy/visualization/trackster.mako index e3d7e14d69f..4842320bbac 100644 --- a/templates/webapps/galaxy/galaxy.panels.mako +++ b/templates/webapps/galaxy/visualization/trackster.mako @@ -1,4 +1,3 @@ -<%namespace name="masthead" file="/webapps/galaxy/galaxy.masthead.mako"/> <%namespace name="galaxy_client" file="/galaxy_client_app.mako" /> @@ -49,28 +48,16 @@
-
- - %if self.galaxy_config['master']: - - ${masthead.load()} - %endif - ${self.message_box()} -
${self.left_panel()} ${self.center_panel()} ${self.right_panel()}
-
- - ${self.late_javascripts()} -