From 56563fd7815ac86f4a433f96e3e9aaf606ab893c Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 22 Sep 2022 03:13:14 -0400 Subject: [PATCH] Decouple login/logout toolshed from Galaxy makos --- .../webapp/templates/webapps/tool_shed/user/login.mako | 4 +--- .../webapp/templates/webapps/tool_shed/user/logout.mako | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako index e011b828b8c..919d0e4b5d3 100644 --- a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako +++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/login.mako @@ -1,9 +1,7 @@ <%! #This is a hack, we should restructure templates to avoid this. def inherit(context): - if context.get('trans').webapp.name == 'galaxy' and context.get( 'use_panels', True ): - return '/webapps/galaxy/base_panels.mako' - elif context.get('trans').webapp.name == 'tool_shed' and context.get( 'use_panels', True ): + if context.get('trans').webapp.name == 'tool_shed' and context.get( 'use_panels', True ): return '/webapps/tool_shed/base_panels.mako' else: return '/base.mako' diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako index 20a38c04f36..5d388a2c241 100644 --- a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako +++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/logout.mako @@ -1,9 +1,7 @@ <%! #This is a hack, we should restructure templates to avoid this. def inherit(context): - if context.get('trans').webapp.name == 'galaxy': - return '/webapps/galaxy/base_panels.mako' - elif context.get('trans').webapp.name == 'tool_shed': + if context.get('trans').webapp.name == 'tool_shed': return '/webapps/tool_shed/base_panels.mako' else: return '/base.mako'