Build job success messages within tool form view

client/galaxy/scripts/mvc/tool/tool-form.js

@@ -1,16 +1,16 @@
 /**
     This is the regular tool form.
 */
-define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tool/tool-form-base', 'mvc/tool/tool-template'],
-    function( Utils, Ui, ToolFormBase, ToolTemplate ) {
+define([ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/tool/tool-form-base' ],
+    function( Utils, Ui, ToolFormBase ) {
     var View = ToolFormBase.extend({
         initialize: function( options ) {
             var self = this;
             ToolFormBase.prototype.initialize.call( this, Utils.merge({
-                customize       : function( options ) {
+                customize: function( options ) {
                     // build execute button
                     options.buttons = {
-                        execute : execute_btn = new Ui.Button({
+                        execute: execute_btn = new Ui.Button({
                             icon     : 'fa-check',
                             tooltip  : 'Execute: ' + options.name + ' (' + options.version + ')',
                             title    : 'Execute',
@@ -74,7 +74,7 @@ define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tool/tool-form-base', 'mvc/tool/to
                 data    : job_def,
                 success : function( response ) {
                     callback && callback();
-                    self.$el.empty().append( ToolTemplate.success( response ) );
+                    self.$el.empty().append( self._templateSuccess( response ) );
                     parent.Galaxy && parent.Galaxy.currHistoryPanel && parent.Galaxy.currHistoryPanel.refreshContents();
                 },
                 error   : function( response ) {
@@ -87,12 +87,13 @@ define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tool/tool-form-base', 'mvc/tool/to
                             break;
                         }
                     } else {
-                        self.modal.show({
+                        var modal = parent.Galaxy.modal;
+                        modal && modal.show({
                             title   : 'Job submission failed',
-                            body    : ( response && response.err_msg ) || ToolTemplate.error( job_def ),
+                            body    : ( response && response.err_msg ) || self._templateError( job_def ),
                             buttons : {
                                 'Close' : function() {
-                                    self.modal.hide();
+                                    modal.hide();
                                 }
                             }
                         });
@@ -141,6 +142,28 @@ define(['utils/utils', 'mvc/ui/ui-misc', 'mvc/tool/tool-form-base', 'mvc/tool/to
                 }
             }
             return true;
+        },
+
+        _templateSuccess: function( response ) {
+            if ( response.jobs && response.jobs.length > 0 ) {
+                var njobs = response.jobs.length;
+                var njobs_text = njobs == 1 ? '1 job has' : njobs + ' jobs have';
+                var $message = $( '<div/>' ).addClass( 'donemessagelarge' )
+                                .append( $( '<p/>' ).text( njobs_text + ' been successfully added to the queue - resulting in the following datasets:' ) );
+                _.each( response.outputs, function( output ) {
+                    $message.append( $( '<p/>' ).addClass( 'messagerow' ).append( $( '<b/>' ).text( output.hid + ': ' + output.name ) ) );
+                });
+                $message.append( $( '<p/>' ).append( '<b/>' ).text( 'You can check the status of queued jobs and view the resulting data by refreshing the History pane. When the job has been run the status will change from \'running\' to \'finished\' if completed successfully or \'error\' if problems were encountered.' ) );
+                return $message;
+            } else {
+                return this._templateError( response );
+            }
+        },
+
+        _templateError: function( response ) {
+            return  $( '<div/>' ).addClass( 'errormessagelarge' )
+                .append( $( '<p/>' ).text( 'The server could not complete the request. Please contact the Galaxy Team if this error persists.' ) )
+                .append( $( '<pre/>' ).text( JSON.stringify( response, null, 4 ) ) );
         }
     });
 

client/galaxy/style/less/base.less

@@ -757,6 +757,9 @@ input[type="submit"], button {
     background-image: url(error_large.png);
     background-repeat: no-repeat;
     background-position: 10px 8px;
+    .messagerow {
+        padding: 10px 20px;
+    }
 }
 
 .errormessagelarge {