Moving configure menu call to user preferences

galaxyproject · Jun 6, 2017 · 207249a · 207249a
1 parent 07ea4c0
commit 207249a
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 18 deletions.
diff --git a/client/galaxy/scripts/mvc/user/user-preferences.js b/client/galaxy/scripts/mvc/user/user-preferences.js
@@ -65,6 +65,14 @@ define( [ 'mvc/form/form-view', 'mvc/ui/ui-misc' ], function( Form, Ui ) {
                         window.location.href = Galaxy.root + 'custom_builds';
                     }
                 },
+                'configure_menu': {
+                    title           : 'Configure workflow menu',
+                    description     : 'Configure your workflow items which appear in the Tool panel.',
+                    icon            : 'fa-cog',
+                    onclick         : function() {
+                        window.location.href = Galaxy.root + 'workflow/configure_menu';
+                    }
+                },
                 'logout': {
                     title           : 'Sign out',
                     description     : 'Click here to sign out of all sessions.',
@@ -119,6 +127,7 @@ define( [ 'mvc/form/form-view', 'mvc/ui/ui-misc' ], function( Form, Ui ) {
                 if( config.enable_openid && !config.use_remote_user ) {
                     self._addLink( 'openids' );
                 }
+                self._addLink( 'configure_menu' );
                 self._addLink( 'logout' );
                 self.$preferences.append( self._templateFooter( data ) );
                 self.$el.empty().append( self.$preferences );

diff --git a/client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js b/client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js
@@ -80,7 +80,7 @@ define( [], function() {
                     data: JSON.stringify( { 'workflow_ids': ids } ),
                     contentType : 'application/json'
                 }).done( function( response ) {
-                    window.location = Galaxy.root + 'workflow?status='+ response.status +'&message=' + response.message;
+                    window.location = Galaxy.root + 'user';
                 });
             });
         },
@@ -121,8 +121,8 @@ define( [], function() {
             tableHtml = tableHtml + '<a class="action-button wf-save-menu wf-action fa fa-floppy-o" href="#" title="Save">' +
                                         '<span>Save</span>' +
                                     '</a>' +
-                                    '<a class="action-button wf-back wf-action fa fa-arrow-left" href="'+ Galaxy.root +'workflow" title="Back to workflow">' +
-                                        '<span>Back to workflow</span>' +
+                                    '<a class="action-button wf-back wf-action fa fa-arrow-left" href="'+ Galaxy.root +'user" title="Back to User Preferences">' +
+                                        '<span>Back to User Preferences</span>' +
                                     '</a>';
             return tableHtml;
         },

diff --git a/client/galaxy/scripts/mvc/workflow/workflow.js b/client/galaxy/scripts/mvc/workflow/workflow.js
@@ -182,12 +182,6 @@ define( [ 'mvc/tool/tool-form-composite', 'mvc/form/form-view', 'mvc/ui/ui-misc'
                            '<div class="response-message"></div>' +
                            '<h2>Your workflows</h2>' +
                        '</div>'+
-                       '<div class="other-options wf">' +
-                           '<h2>Other options</h2>' +
-                           '<a class="action-button fa fa-cog wf-action" href="'+ Galaxy.root +'workflow/configure_menu" title="Configure your workflow menu">' +
-                               '<span>Configure your workflow menu</span>' +
-                           '</a>' +
-                       '</div>' +
                    '</div>';
         }
     });

diff --git a/static/maps/mvc/user/user-preferences.js.map b/static/maps/mvc/user/user-preferences.js.map
diff --git a/static/maps/mvc/workflow/workflow-configure-menu.js.map b/static/maps/mvc/workflow/workflow-configure-menu.js.map