1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4440f4de1828/ Changeset: 4440f4de1828 User: guerler Date: 2013-06-26 18:36:21 Summary: Fix fixed path definitions Affected #: 3 files diff -r 9a4e6dd2d863e3e233f7e54382989d95810dbe9e -r 4440f4de1828f11439a88d1417ea914d1e6fec8f static/scripts/galaxy.frame.js --- a/static/scripts/galaxy.frame.js +++ b/static/scripts/galaxy.frame.js @@ -5,9 +5,6 @@ // dependencies define(["utils/galaxy.css", "libs/backbone/backbone-relational"], function(css) { -// load required css files -css.load_file("/static/style/galaxy.frame.css"); -css.load_file("/static/style/base.css"); // frame manager var GalaxyFrameManager = Backbone.View.extend( @@ -77,6 +74,9 @@ // initialize initialize : function(options) { + // load required css files + css.load_file(options.url.styles + "/galaxy.frame.css"); + // read in defaults if (options) this.options = _.defaults(options, this.options); diff -r 9a4e6dd2d863e3e233f7e54382989d95810dbe9e -r 4440f4de1828f11439a88d1417ea914d1e6fec8f templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -72,6 +72,13 @@ )} <script type="text/javascript"> + ## path to style sheets + var galaxy_config = { + url: { + styles : "${h.url_for('/static/style')}" + } + }; + ## check if its in a galaxy iframe function is_in_galaxy_frame() { @@ -92,7 +99,7 @@ ## load additional style sheet if (is_in_galaxy_frame()) - load_css('/static/style/galaxy.frame.masthead.css'); + load_css(galaxy_config.url.styles + '/galaxy.frame.masthead.css'); // console protection window.console = window.console || { @@ -129,7 +136,7 @@ ## frame manager var frame_manager = null; - require(['galaxy.frame'], function(frame) { this.frame_manager = new frame.GalaxyFrameManager(); }); + require(['galaxy.frame'], function(frame) { this.frame_manager = new frame.GalaxyFrameManager(galaxy_config); }); </script></%def> diff -r 9a4e6dd2d863e3e233f7e54382989d95810dbe9e -r 4440f4de1828f11439a88d1417ea914d1e6fec8f templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -147,10 +147,10 @@ ## Visualization menu. <% menu_options = [ - [_('New Track Browser'), "javascript:frame_manager.frame_new({title: 'Trackster', type: 'url', content: '/visualization/trackster'});"], - [_('Saved Visualizations'), "javascript:frame_manager.frame_new({ type: 'url', content : '/visualization/list'});" ] + [_('New Track Browser'), "javascript:frame_manager.frame_new({title: 'Trackster', type: 'url', content: '" + h.url_for( controller='/visualization', action='trackster' ) + "'});"], + [_('Saved Visualizations'), "javascript:frame_manager.frame_new({ type: 'url', content : '" + h.url_for( controller='/visualization', action='list' ) + "'});" ] ] - tab( "visualization", _("Visualization"), "javascript:frame_manager.frame_new({title: 'Trackster', type: 'url', content: '/visualization/list'});", menu_options=menu_options ) + tab( "visualization", _("Visualization"), "javascript:frame_manager.frame_new({title: 'Trackster', type: 'url', content: '" + h.url_for( controller='/visualization', action='list' ) + "'});", menu_options=menu_options ) %> ## Cloud menu. Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.