Move help button to last position of left group, add 5px padding to h…

…elp text.
galaxyproject · Oct 18, 2016 · 5a2d01b · 5a2d01b
1 parent 32d0db8
commit 5a2d01b
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 60 deletions.
diff --git a/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js b/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
@@ -122,6 +122,52 @@ var DatasetListItemEdit = _super.extend(
         return $details;
     },
 
+    /************************************************************************** 
+     * Render help button to show tool help text without rerunning the tool.
+     * Issue #2100
+     */
+    _renderToolHelpButton : function() {
+        var datasetID = this.model.attributes.dataset_id;
+        var jobID = this.model.attributes.creating_job;
+
+        var parseToolBuild = function(data) {
+            var toolName = data.name;
+            var toolHelp = (data.help) ? data.help : "No help is available for the tool.";
+            var helpString = '<div id="thdiv-' + datasetID + '" style="background:#eee; padding: 5px;"><hr><strong>Tool Help for ' + toolName + '</strong><br/><hr>';
+            helpString += toolHelp;
+            helpString += '</div>';
+            $('#dataset-' + datasetID).append($.parseHTML(helpString));
+        };
+        var parseToolID = function(data) {
+            $.ajax({
+                url: '/api/tools/' + data.tool_id + '/build'
+            }).done(function(data){
+                parseToolBuild(data);
+            }).fail(function(){console.log("Failed in api tools build call")});
+        };
+
+        return faIconButton({
+            title: 'Tool Help',
+            classes: 'icon-btn',
+            href: '#',
+            faIcon: 'fa-question',
+            onclick: function() {
+                var divString = 'thdiv-' + datasetID;
+                if ($("#" + divString).length > 0)
+                {
+                    $("#" + divString).toggle();     
+                } else {
+                    $.ajax({
+                    url: '/api/jobs/' + jobID
+                }).done(function(data){
+                    parseToolID(data);
+                }).fail(function(){console.log('Failed on recovering /api/jobs/' + jobID + ' call.')});
+                }
+            }
+        });
+    },
+    //*************************************************************************
+
     /** Add less commonly used actions in the details section based on state */
     _renderSecondaryActions : function(){
         var actions = _super.prototype._renderSecondaryActions.call( this );
@@ -132,12 +178,12 @@ var DatasetListItemEdit = _super.extend(
             case STATES.ERROR:
                 // error button comes first
                 actions.unshift( this._renderErrButton() );
-                return actions.concat([ this._renderRerunButton() ]);
+                return actions.concat([ this._renderRerunButton(), this._renderToolHelpButton() ]);
             case STATES.OK:
             case STATES.FAILED_METADATA:
-                return actions.concat([ this._renderRerunButton(), this._renderVisualizationsButton() ]);
+                return actions.concat([ this._renderRerunButton(), this._renderVisualizationsButton(), this._renderToolHelpButton() ]);
         }
-        return actions.concat([ this._renderRerunButton() ]);
+        return actions.concat([ this._renderRerunButton(), this._renderToolHelpButton() ]);
     },
 
     /** Render icon-button to report an error on this dataset to the galaxy admin. */

diff --git a/client/galaxy/scripts/mvc/dataset/dataset-li.js b/client/galaxy/scripts/mvc/dataset/dataset-li.js
@@ -228,7 +228,7 @@ var DatasetListItemView = _super.extend(
             case STATES.OK:
             case STATES.FAILED_METADATA:
             case STATES.ERROR:
-                return [ this._renderToolHelpButton(), this._renderDownloadButton(), this._renderShowParamsButton() ];
+                return [ this._renderDownloadButton(), this._renderShowParamsButton() ];
         }
         return [ this._renderShowParamsButton() ];
     },
@@ -255,53 +255,6 @@ var DatasetListItemView = _super.extend(
     },
 
 
-    /************************************************************************** 
-     * Render help button to show tool help text without rerunning the tool.
-     * Issue #2100
-     */
-    _renderToolHelpButton : function() {
-        var datasetID = this.model.attributes.dataset_id;
-        var jobID = this.model.attributes.creating_job;
-
-        var parseToolBuild = function(data) {
-            var toolName = data.name;
-            var toolHelp = (data.help) ? data.help : "No help is available for the tool.";
-            var helpString = '<div id="thdiv-' + datasetID + '" style="background:#eee;"><hr><strong>Tool Help for ' + toolName + '</strong><br/><hr>';
-            helpString += toolHelp;
-            helpString += '</div>';
-            $('#dataset-' + datasetID).append($.parseHTML(helpString));
-        };
-        var parseToolID = function(data) {
-            $.ajax({
-                url: '/api/tools/' + data.tool_id + '/build'
-            }).done(function(data){
-                parseToolBuild(data);
-            }).fail(function(){console.log("Failed in api tools build call")});
-        };
-
-        return faIconButton({
-            title: 'Tool Help',
-            classes: 'icon-btn',
-            href: '#',
-            faIcon: 'fa-question',
-            onclick: function() {
-                var divString = 'thdiv-' + datasetID;
-                if ($("#" + divString).length > 0)
-                {
-                    $("#" + divString).toggle();     
-                } else {
-                    $.ajax({
-                    url: '/api/jobs/' + jobID
-                }).done(function(data){
-                    parseToolID(data);
-                }).fail(function(){console.log('Failed on recovering /api/jobs/' + jobID + ' call.')});
-                }
-            }
-        });
-    },
-    //*************************************************************************
-
-
     /** Render icon-button/popupmenu to download the data (and/or the associated meta files (bai, etc.)) for this.
      *  @returns {jQuery} rendered DOM
      */

diff --git a/static/maps/mvc/dataset/dataset-li-edit.js.map b/static/maps/mvc/dataset/dataset-li-edit.js.map