Merge branch 'release_16.10' into dev

Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map static/scripts/bundled/login.bundled.js.map static/style/blue/base.css
galaxyproject · Dec 15, 2016 · ed4e87e · ed4e87e
2 parents da78409 + d2ab7e7
commit ed4e87e
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 47 deletions.
diff --git a/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js b/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
@@ -122,46 +122,55 @@ 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 self = this;
 
         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;
+            var helpString = '<div id="thdiv-' + datasetID + '" class="toolhelp">'
+            if (data.name && data.help){
+                helpString += '<strong>Tool help for ' + data.name + '</strong><hr/>';
+                helpString += data.help;
+            } else {
+                helpString += '<strong>Tool help is unavailable for this dataset.</strong><hr/>';
+            }
             helpString += '</div>';
-            $('#dataset-' + datasetID).append($.parseHTML(helpString));
+            self.$el.find( '.details' ).append($.parseHTML(helpString));
         };
         var parseToolID = function(data) {
             $.ajax({
-                url: '/api/tools/' + data.tool_id + '/build'
+                url: Galaxy.root + 'api/tools/' + data.tool_id + '/build'
             }).done(function(data){
                 parseToolBuild(data);
-            }).fail(function(){console.log("Failed in api tools build call")});
+            }).fail(function(){
+                parseToolBuild({})
+            });
         };
-
+        if (Galaxy.user.id === null){
+            return null
+        }
         return faIconButton({
             title: 'Tool Help',
             classes: 'icon-btn',
             href: '#',
             faIcon: 'fa-question',
             onclick: function() {
                 var divString = 'thdiv-' + datasetID;
-                if ($("#" + divString).length > 0)
-                {
-                    $("#" + divString).toggle();     
+                if (self.$el.find(".toolhelp").length > 0){
+                    self.$el.find(".toolhelp").toggle();
                 } else {
                     $.ajax({
-                    url: '/api/jobs/' + jobID
-                }).done(function(data){
-                    parseToolID(data);
-                }).fail(function(){console.log('Failed on recovering /api/jobs/' + jobID + ' call.')});
+                        url: Galaxy.root + 'api/jobs/' + jobID
+                    }).done(function(data){
+                        parseToolID(data);
+                    }).fail(function(){
+                       console.log('Failed at recovering job information from the  Galaxy API for job id "' + jobID + '".');
+                    });
                 }
             }
         });
@@ -386,15 +395,15 @@ DatasetListItemEdit.prototype.templates = (function(){
 
     var visualizationsTemplate = BASE_MVC.wrapTemplate([
         '<% if( visualizations.length === 1 ){ %>',
-            '<a class="visualization-btn visualization-link icon-btn" href="<%- visualizations[0].href %>"',
+            '<a class="visualization-link icon-btn" href="<%- visualizations[0].href %>"',
                     ' target="<%- visualizations[0].target %>" title="', _l( 'Visualize in' ),
                     ' <%- visualizations[0].html %>">',
                 '<span class="fa fa-bar-chart-o"></span>',
             '</a>',
 
         '<% } else { %>',
-            '<div class="visualizations-dropdown dropdown">',
-                '<a class="visualization-btn icon-btn" data-toggle="dropdown" title="', _l( 'Visualize' ), '">',
+            '<div class="visualizations-dropdown dropdown icon-btn">',
+                '<a data-toggle="dropdown" title="', _l( 'Visualize' ), '">',
                     '<span class="fa fa-bar-chart-o"></span>',
                 '</a>',
                 '<ul class="dropdown-menu" role="menu">',

diff --git a/client/galaxy/style/less/dataset.less b/client/galaxy/style/less/dataset.less
@@ -234,12 +234,6 @@
                 .icon-btn {
                     margin-right: @icon-btn-margin;
                 }
-                // have to reapply here - dropdown wrapped in div
-                .icon-btn.visualization-btn {
-                    margin-left: 0px;
-                    border-radius: 0px 3px 3px 0px;
-                    border-right: 1px solid @icon-btn-border;
-                }
             }
             .right {
                 .icon-btn-group();
@@ -297,6 +291,14 @@
             }
         }
 
+        .toolhelp {
+            width: 100%;
+            background:#eee;
+            border-radius: 3px;
+            margin-top: 5px;
+            padding: 3px;
+        }
+
         .dataset-peek {
             .list-item .vertical-spacing;
             width: 100%;