diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js index aafb5acc90d..23d47a52a47 100644 --- a/client/galaxy/scripts/apps/analysis.js +++ b/client/galaxy/scripts/apps/analysis.js @@ -100,7 +100,7 @@ window.app = function app( options, bootstrapped ){ '(/)' : 'home', // TODO: remove annoying 'root' from root urls '(/)root*' : 'home', - '(/)tours(/:tour_id)' : 'show_tours', + '(/)tours(/)(:tour_id)' : 'show_tours', }, show_tours : function( tour_id ){ diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js index 9c609773cf8..7d90c302a68 100644 --- a/client/galaxy/scripts/layout/menu.js +++ b/client/galaxy/scripts/layout/menu.js @@ -144,15 +144,15 @@ var Collection = Backbone.Collection.extend({ target : '_blank' },{ title : 'Interactive Tours', + url : 'tours', onclick : function(){ if (Galaxy.app){ Galaxy.app.display(new Tours.ToursView()); } else { // Redirect and use clientside routing to go to tour index - window.location = Galaxy.root + "#/tours"; + window.location = Galaxy.root + "tours"; } - }, - target : 'galaxy_main' + } }] }; options.terms_url && helpTab.menu.push({ @@ -383,4 +383,4 @@ return { Tab : Tab }; -}); \ No newline at end of file +}); diff --git a/client/galaxy/scripts/mvc/tours.js b/client/galaxy/scripts/mvc/tours.js index b0bfd9dd809..6fd15b2dcb9 100644 --- a/client/galaxy/scripts/mvc/tours.js +++ b/client/galaxy/scripts/mvc/tours.js @@ -101,14 +101,15 @@ define(['libs/bootstrap-tour'],function(BootstrapTour) { ""].join('')); - this.$el.html(tpl({tours: this.model.models})).on("click", ".tourItem", function(){ + this.$el.html(tpl({tours: this.model.models})).on("click", ".tourItem", function(e){ + e.preventDefault(); giveTour($(this).data("tour.id")); }); } diff --git a/config/tool_conf.xml.main b/config/tool_conf.xml.main index b4db4af7c7a..4575f630f5e 100644 --- a/config/tool_conf.xml.main +++ b/config/tool_conf.xml.main @@ -28,18 +28,18 @@
- +