mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
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
This commit is contained in:
Nicola Soranzo
@@ -122,30 +122,38 @@ 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',
|
||||
@@ -153,15 +161,16 @@ var DatasetListItemEdit = _super.extend(
|
||||
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">',
|
||||
|
||||
@@ -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%;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
{"version":3,"file":"change-password.js","sources":["../../../src/mvc/user/change-password.js"],"names":["define","Manage","ChangePassword","Backbone","View","extend","initialize","data","this","render","renderMessage","msg","status","template","self","$","css","remove","ManageUserInformation","prototype","hideErrorDoneMessage","append","on","e","savePassword","show","url","Galaxy","root","current","val","password","confirm","messageBar","change_password_button","token","getJSON","response","renderError","renderDone"],"mappings":"AACAA,QAAQ,oCAAqC,SAAUC,GAEvD,GAAIC,GAAiBC,SAASC,KAAKC,QAE/BC,WAAY,SAAWC,GACnBC,KAAKC,OAAQF,IAIjBG,cAAe,SAAUC,EAAKC,GAC1B,MAAO,gBAA6B,KAAXA,EAAgB,OAAQA,GAAU,WAAwB,UAAXA,EAAqB,YAAc,IAAO,KAAMD,EAAK,UAIjIF,OAAQ,SAAUF,GACd,GAAIM,GAAW,GACXC,EAAON,IACXO,GAAG,cAAeC,IAAK,UAAW,QAClCD,EAAE,4BAA4BE,SAC9BhB,EAAOiB,sBAAsBC,UAAUC,uBACnCb,EAAa,SACbM,EAAWC,EAAKJ,cAAeH,EAAc,QAAGA,EAAa,SAEjEM,GAAsB,iEACtBA,GAAsB,mIAKtBA,EAAWA,EAAW,0HAE4CN,EAAkB,YAAG,sDAEnFA,EAAY,MACZM,EAAWA,EAAW,4CAA6CN,EAAY,MAAG,MAGlFM,GAAsB,yHAK1BA,GAAsB,iXAarBA,GAAsB,SACtBE,EAAE,yBAAyBM,OAAQR,GACnCE,EAAE,kBAAkBO,GAAI,QAAS,SAAUC,GAAMT,EAAKU,aAAcV,EAAMS,KAC1ER,EAAE,mBAAmBO,GAAI,QAAS,WAC9BP,EAAE,4BAA4BE,SAC9BhB,EAAOiB,sBAAsBC,UAAUC,uBACvCL,EAAG,cAAeU,UAK3BD,aAAc,WACV,GAAIE,GAAMC,OAAOC,KAAO,uCACpBC,EAAUd,EAAG,yBAA0Be,MACvCC,EAAWhB,EAAG,0BAA2Be,MACzCE,EAAUjB,EAAG,yBAA0Be,MACvCvB,KACA0B,EAAahC,EAAOiB,sBAAsBC,SAE9CZ,IAAS2B,wBAA0B,EAAMH,SAAYA,EAAUF,QAAWA,EAASG,QAAWA,EAASG,MAAS,IAChHpB,EAAEqB,QAASV,EAAKnB,EAAM,SAAU8B,GACA,UAAvBA,EAAiB,OAChBJ,EAAWK,YAAaD,EAAkB,UAG1CtB,EAAE,4BAA4BE,SAC9BgB,EAAWM,WAAYF,EAAkB,SACzCtB,EAAG,cAAeU,YAMpC,QACIvB,eAAgBA"}
|
||||
@@ -0,0 +1 @@
|
||||
{"version":3,"file":"extra-information.js","sources":["../../../src/mvc/user/extra-information.js"],"names":["define","Manage","ExtraInformation","Backbone","View","extend","initialize","data","this","render","data_plugin","template","self","item_object","model","plugins","plugin_name","is_plugin_empty","$","hide","Object","keys","length","JSON","parse","undefined","item","input_val","i","input_object","name","label","type","append","on","e","saveExtraInformation","remove","show","url","Galaxy","root","val","messageBar","ManageUserInformation","prototype","is_form_valid","each","attr","section_name","parent","split","element","attrname","attrvalue","getJSON","plugin_data","stringify","response","renderDone"],"mappings":"AACAA,QAAQ,oCAAqC,SAAUC,GAEvD,GAAIC,GAAmBC,SAASC,KAAKC,QACjCC,WAAY,SAAWC,GACnBC,KAAKC,OAAQF,IAIjBE,OAAQ,SAAUC,GACd,GAAIC,GAAW,GACXC,EAAOJ,KACPK,EAAc,KACdC,EAAQ,KACRP,KACAQ,KACAC,EAAc,GACdC,GAAkB,CAetB,IAbAC,EAAG,cAAeC,OAClBD,EAAG,gBAAiBC,OACpBD,EAAG,iBAAkBC,OAErBZ,EAAOG,EAAoB,OAE3BK,EAA4D,IAAhDK,OAAOC,KAAMX,EAAqB,SAAGY,UAAsBC,KAAKC,MAAOd,EAAqB,SAExGC,GAAsB,qEACtBA,GAAsB,oIAIT,OAATJ,GAA0BkB,SAATlB,GAA8C,OAAxBA,EAAkB,aAAuCkB,SAAxBlB,EAAkB,YAC1FI,GAAsB,0EAErB,CACDA,GAAsB,gIAGtB,KAAK,GAAIe,KAAQnB,GAAkB,YAAI,CAEnCM,EAAcN,EAAkB,YAAEmB,EAGlC,IAAIC,GAAY,EACoB,KAAhCP,OAAOC,KAAKN,GAASO,QACrBN,EAAcU,EACdZ,EAAQC,EAAQC,IAGhBC,GAAkB,EAGtBN,EAAWA,EAAW,wBAAyBK,EAAa,MAC5DL,EAAWA,EAAW,UAAYE,EAAyB,YAAI,WAE/D,KAAK,GAAIe,GAAI,EAAGA,EAAIf,EAAoB,OAAES,OAAQM,IAAM,CACpD,GAAIC,GAAehB,EAAoB,OAAEe,EACzCD,GAAcV,EAAkB,GAAQH,EAAaA,EAAMe,EAAaC,MAAxB,GAChDnB,GAAsB,yBACtBA,EAAWA,EAAW,UAAYkB,EAAaE,MAAQ,yBAA0BF,EAAaG,KACnF,WAAYH,EAAaC,KAAM,YAAaH,EAAW,OAClEhB,GAAsB,SAE1BA,GAAsB,SAG1BA,GAAsB,gIAEtBA,GAAsB,4BAG1BA,GAAsB,SACtBO,EAAE,yBAAyBe,OAAQtB,GACnCO,EAAE,oBAAoBgB,GAAI,QAAS,SAAUC,GAAMvB,EAAKwB,qBAAsBxB,EAAMuB,KACpFjB,EAAE,mBAAmBgB,GAAI,QAAS,WAC7BhB,EAAE,8BAA8BmB,SAChCnB,EAAG,gBAAiBC,OACpBD,EAAG,iBAAkBC,OACrBD,EAAG,cAAeoB,UAK3BF,qBAAsB,WAClB,GAAIG,GAAMC,OAAOC,KAAO,+CAIpBlC,GAHWW,EAAG,0BAA2BwB,MAC9BxB,EAAG,0BAA2BwB,MAC/BxB,EAAG,qBAAsBwB,UAEnCC,EAAa1C,EAAO2C,sBAAsBC,UAC1CC,GAAgB,CAEpB5B,GAAE,mBAAmB6B,KAAM,WACvB,GAA6B,SAAzB7B,EAAEV,MAAMwC,KAAK,SAA+C,aAAzB9B,EAAEV,MAAMwC,KAAK,QAAyB,CACzE,GAAIC,GAAe/B,EAAEA,EAAEV,MAAM0C,SAASA,SAAS,IAAIF,KAAK,SAASG,MAAM,KAAK,GACxEC,IACJC,UAAWnC,EAAEV,MAAMwC,KAAK,QACxBM,UAAYpC,EAAEV,MAAMkC,MAGpBU,EAASlC,EAAEV,MAAMwC,KAAK,SAAYM,UAC9B/C,EAAK0C,GACL1C,EAAK0C,GAAcI,UAAYC,UAG/B/C,EAAK0C,GAAgBG,KAI7BN,GACA5B,EAAEqC,QAAShB,GAAMiB,YAAgBjC,KAAKkC,UAAUlD,IAAQ,SAAUmD,GAC9Df,EAAWgB,WAAYD,EAAkB,aAMzD,QACIxD,iBAAkBA"}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,2 @@
|
||||
define(["mvc/user/manage-user-information"],function(a){var b=Backbone.View.extend({initialize:function(a){this.render(a)},renderMessage:function(a,b){return'<div class="'+(""===b?"done":b)+"message"+("error"===b?" validate":"")+'">'+a+"</div>"},render:function(b){var c="",d=this;$(".user-pref").css("display","none"),$(".change-password-section").remove(),a.ManageUserInformation.prototype.hideErrorDoneMessage(),b.status&&(c=d.renderMessage(b.message,b.status)),c+='<div class="change-password-section"> <h2>Change Password</h2>',c+='<ul class="manage-table-actions"><li><a class="action-button back-user-pref" target="galaxy_main">User preferences</a></li></ul>',c=c+'<div class="toolForm"><form name="change_password" id="change_password"><input type="hidden" name="display_top" value="'+b.display_top+'"/><div class="toolFormTitle">Change Password</div>',b.token?c=c+'<input type="hidden" name="token" value="'+b.token+'"/>':c+='<div class="form-row"><label>Current password:</label><input type="password" name="current" value="" size="40"/></div>',c+='<div class="form-row"><label>New password:</label><input type="password" name="password" value="" size="40"/></div><div class="form-row"><label>Confirm:</label><input type="password" name="confirm" value="" size="40"/></div><div class="form-row"><input type="button" class="save-password action-button" name="change_password_button" value="Save"/></div></form></div>',c+="</div>",$(".user-preferences-all").append(c),$(".save-password").on("click",function(a){d.savePassword(d,a)}),$(".back-user-pref").on("click",function(){$(".change-password-section").remove(),a.ManageUserInformation.prototype.hideErrorDoneMessage(),$(".user-pref").show()})},savePassword:function(){var b=Galaxy.root+"api/user_preferences/change_password",c=$("input[name='current']").val(),d=$("input[name='password']").val(),e=$("input[name='confirm']").val(),f={},g=a.ManageUserInformation.prototype;f={change_password_button:!0,password:d,current:c,confirm:e,token:""},$.getJSON(b,f,function(a){"error"===a.status?g.renderError(a.message):($(".change-password-section").remove(),g.renderDone(a.message),$(".user-pref").show())})}});return{ChangePassword:b}});
|
||||
//# sourceMappingURL=../../../maps/mvc/user/change-password.js.map
|
||||
@@ -0,0 +1,2 @@
|
||||
define(["mvc/user/manage-user-information"],function(a){var b=Backbone.View.extend({initialize:function(a){this.render(a)},render:function(a){var b="",c=this,d=null,e=null,f={},g={},h="",i=!1;if($(".user-pref").hide(),$(".donemessage").hide(),$(".errormessage").hide(),f=a.config,g=0===Object.keys(a.plugins).length?{}:JSON.parse(a.plugins),b+='<div class="extra-information-section"> <h2>Extra Information</h2>',b+='<ul class="manage-table-actions"> <li><a class="action-button back-user-pref" target="galaxy_main">User preferences</a></li></ul>',null===f||void 0===f||null===f.preferences||void 0===f.preferences)b+="<div>No plugins available. Please contact your administrator.</div>";else{b+='<div class="toolForm"><form name="extra_information" id="extra_information"><div class="toolFormTitle">Extra Information</div>';for(var j in f.preferences){d=f.preferences[j];var k="";0!==Object.keys(g).length?(h=j,e=g[h]):i=!0,b=b+'<div class="form-row '+h+' ">',b=b+"<label>"+d.description+":</label>";for(var l=0;l<d.inputs.length;l++){var m=d.inputs[l];k=i?"":e?e[m.name]:"",b+='<div class="form-row">',b=b+"<label>"+m.label+':</label><input type="'+m.type+'" name="'+m.name+'" value="'+k+'" />',b+="</div>"}b+="</div>"}b+='<div class="form-row"><input type="button" class="save-extra-info action-button" name="save_extra_information" value="Save"/>',b+="</div></div></form></div>"}b+="</div>",$(".user-preferences-all").append(b),$(".save-extra-info").on("click",function(a){c.saveExtraInformation(c,a)}),$(".back-user-pref").on("click",function(){$(".extra-information-section").remove(),$(".donemessage").hide(),$(".errormessage").hide(),$(".user-pref").show()})},saveExtraInformation:function(){var b=Galaxy.root+"api/user_preferences/save_extra_preferences/",c=($("input[name='username']").val(),$("input[name='password']").val(),$("input[name='url']").val(),{}),d=a.ManageUserInformation.prototype,e=!0;$(".form-row input").each(function(){if("text"===$(this).attr("type")||"password"===$(this).attr("type")){var a=$($(this).parent().parent()[0]).attr("class").split(" ")[1],b={};attrname=$(this).attr("name"),attrvalue=$(this).val(),b[$(this).attr("name")]=attrvalue,c[a]?c[a][attrname]=attrvalue:c[a]=b}}),e&&$.getJSON(b,{plugin_data:JSON.stringify(c)},function(a){d.renderDone(a.message)})}});return{ExtraInformation:b}});
|
||||
//# sourceMappingURL=../../../maps/mvc/user/extra-information.js.map
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user