From cd5128b7bd957a797c38c28c42524a5ab981dd7d Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 4 Apr 2022 12:42:29 -0400 Subject: [PATCH 1/2] Fix toolshed style loading --- lib/tool_shed/webapp/templates/base.mako | 2 +- lib/tool_shed/webapp/templates/base/base_panels.mako | 7 ++++++- .../webapp/templates/webapps/tool_shed/index.mako | 3 --- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/tool_shed/webapp/templates/base.mako b/lib/tool_shed/webapp/templates/base.mako index 04a05c3534a..c908acbceae 100644 --- a/lib/tool_shed/webapp/templates/base.mako +++ b/lib/tool_shed/webapp/templates/base.mako @@ -44,7 +44,7 @@ ## Default stylesheets <%def name="stylesheets()"> ${h.css('bootstrap-tour')} - ${h.css('base')} + ${h.dist_css('base')} ## Default javascripts diff --git a/lib/tool_shed/webapp/templates/base/base_panels.mako b/lib/tool_shed/webapp/templates/base/base_panels.mako index 996a2c2755c..f99a2c3f8df 100644 --- a/lib/tool_shed/webapp/templates/base/base_panels.mako +++ b/lib/tool_shed/webapp/templates/base/base_panels.mako @@ -1,6 +1,7 @@ <%namespace name="galaxy_client" file="/galaxy_client_app.mako" /> + <% self.has_left_panel = hasattr( self, 'left_panel' ) self.has_right_panel = hasattr( self, 'right_panel' ) @@ -21,6 +22,8 @@ ${h.css( 'bootstrap-tour', + )} + ${h.dist_css( 'base' )} @@ -117,7 +120,7 @@ ## Document - + ${self.init()} @@ -137,7 +140,9 @@ ## relative href for site root + ${self.stylesheets()} + ## Normally, we'd put all the javascripts at the bottom of the ## but during this transitional period we need access to the config diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/index.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/index.mako index 7d4d8b7dfbc..ca554f96684 100644 --- a/lib/tool_shed/webapp/templates/webapps/tool_shed/index.mako +++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/index.mako @@ -2,9 +2,6 @@ <%namespace file="/message.mako" import="render_msg" /> <%def name="stylesheets()"> - ## Include "base.css" for styling tool menu and forms (details) - ${h.css( "base" )} - ## But make sure styles for the layout take precedence ${parent.stylesheets()} From de71354678c3e89ac9f00ba1331046d1a765e0f3 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 4 Apr 2022 12:44:53 -0400 Subject: [PATCH 2/2] Drop debugging commentary from base mako --- lib/tool_shed/webapp/templates/base/base_panels.mako | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/tool_shed/webapp/templates/base/base_panels.mako b/lib/tool_shed/webapp/templates/base/base_panels.mako index f99a2c3f8df..b3a947cfa84 100644 --- a/lib/tool_shed/webapp/templates/base/base_panels.mako +++ b/lib/tool_shed/webapp/templates/base/base_panels.mako @@ -1,7 +1,6 @@ <%namespace name="galaxy_client" file="/galaxy_client_app.mako" /> - <% self.has_left_panel = hasattr( self, 'left_panel' ) self.has_right_panel = hasattr( self, 'right_panel' ) @@ -140,9 +139,7 @@ ## relative href for site root - ${self.stylesheets()} - ## Normally, we'd put all the javascripts at the bottom of the ## but during this transitional period we need access to the config