opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Decouple trackster form invoking masthead component

Browse Source
This commit is contained in:
guerler
2022-10-16 00:15:38 -04:00
parent 56563fd781
commit d0aa13fb84
5 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/visualization.py
+2 -2
View File
@@ -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):
templates/base/base_panels.mako
-6
View File
@@ -20,7 +20,6 @@
## Default stylesheets
<%def name="stylesheets()">
<!--- base/base_panels.mako stylesheets() -->
${h.css(
'bootstrap-tour',
)}
@@ -32,7 +31,6 @@
## Default javascripts
## TODO: remove when all libs are required directly in modules
<%def name="javascripts()">
<!--- base/base_panels.mako javascripts() -->
${ h.dist_js(
'libs.bundled',
'generic.bundled'
@@ -40,14 +38,11 @@
</%def>
<%def name="javascript_app()">
<!--- base/base_panels.mako javascript_app() -->
${ galaxy_client.load() }
</%def>
## Default late-load javascripts
<%def name="late_javascripts()">
<!--- base/base_panels.mako 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
<html>
<!--base_panels.mako-->
${self.init()}
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
templates/webapps/galaxy/base_panels.mako
+1 -1
View File
@@ -1,6 +1,6 @@
<%inherit file="/base/base_panels.mako"/>
<!-- webapps/galaxy/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()"></%def>
templates/webapps/galaxy/galaxy.masthead.mako → templates/webapps/galaxy/masthead.mako
View File
templates/webapps/galaxy/galaxy.panels.mako → templates/webapps/galaxy/visualization/trackster.mako
-13
View File
@@ -1,4 +1,3 @@
<%namespace name="masthead" file="/webapps/galaxy/galaxy.masthead.mako"/>
<%namespace name="galaxy_client" file="/galaxy_client_app.mako" />
<!DOCTYPE html>
@@ -49,28 +48,16 @@
<body scroll="no" class="full-content">
<div id="everything">
<div id="background"></div>
%if self.galaxy_config['master']:
<div id="masthead" class="navbar navbar-fixed-top navbar-inverse"></div>
${masthead.load()}
%endif
${self.message_box()}
<div id="columns">
${self.left_panel()}
${self.center_panel()}
${self.right_panel()}
</div>
</div>
<div id='dd-helper' style="display: none;"></div>
${self.late_javascripts()}
</body>
</html>