Merge pull request #1422 from dannon/interactive_tours

Interactive Tours
galaxyproject · Jan 5, 2016 · 6bd854e · 6bd854e
2 parents 1730c12 + a1a549e
commit 6bd854e
Show file tree

Hide file tree

Showing 43 changed files with 1,557 additions and 70 deletions.
diff --git a/client/bower.json b/client/bower.json
@@ -14,6 +14,7 @@
     "underscore": "~1.7.0",
     "backbone": "~1.1.2",
     "bootstrap": "~3.3.2",
+    "bootstrap-tour":"~0.10.2",
     "d3": "~3.5.3",
     "farbtastic": "~2.0.0-alpha.1",
     "toastr": "~2.1.0",

diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js
@@ -1,5 +1,5 @@
 /** Masthead Collection **/
-define([], function() {
+define(['mvc/tours'], function( Tours ) {
 var Collection = Backbone.Collection.extend({
     model: Backbone.Model.extend({
         defaults: {
@@ -142,6 +142,12 @@ var Collection = Backbone.Collection.extend({
                     title   : 'How to Cite Galaxy',
                     url     : options.citation_url,
                     target  : '_blank'
+                },{
+                    title   : 'Interactive Tours',
+                    onclick : function(c){
+                        Galaxy.app.display(new Tours.ToursView());
+                    },
+                    target  : 'galaxy_main'
             }]
         };
         options.terms_url && helpTab.menu.push({
@@ -244,6 +250,7 @@ var Tab = Backbone.View.extend({
         this.$menu      = this.$( '.dropdown-menu' );
         this.$note      = this.$( '.dropdown-note' );
         this.model = options.model;
+        this.$el.attr( 'id', this.model.id );
         this.model.on( 'init change:title', function() {
             this.get( 'title' ) && self.$toggle.html( this.get( 'title' ) );
         }).on( 'init change:visible', function() {

diff --git a/client/galaxy/scripts/layout/scratchbook.js b/client/galaxy/scripts/layout/scratchbook.js
@@ -7,6 +7,7 @@ return Backbone.View.extend({
         this.frames = new Frames.View({ visible : false });
         this.setElement( this.frames.$el );
         this.buttonActive = options.collection.add({
+            id              : 'enable-scratchbook',
             icon            : 'fa-th',
             tooltip         : 'Enable/Disable Scratchbook',
             onclick         : function() {
@@ -25,6 +26,7 @@ return Backbone.View.extend({
             }
         });
         this.buttonLoad = options.collection.add({
+            id              : 'show-scratchbook',
             icon            : 'fa-eye',
             tooltip         : 'Show/Hide Scratchbook',
             show_note       : true,