opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_16.01' into dev

Browse Source 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
This commit is contained in:
Nicola Soranzo
2016-03-22 20:54:32 +00:00
parent 2bbae2bb1d cf16b1d692
commit d10ee6f6c4
6 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/layout/page.js
+25 -22
View File
@@ -72,11 +72,11 @@ var PageLayoutView = Backbone.View.extend( BaseMVC.LoggableMixin ).extend({
renderInactivityBox : function() {
if( this.options.show_inactivity_warning ){
var content = this.options.inactivity_box_content || '';
var verificationLink = $( '<a/>' ).attr( 'href', Galaxy.root + 'user/resend_verification' ).html( 'Resend verification.' );
var verificationLink = $( '<a/>' ).attr( 'href', Galaxy.root + 'user/resend_verification' ).text( 'Resend verification' );
this.$el.addClass( 'has-inactivity-box' );
this.$inactivebox
.html( content )
.append( ' ' + verificationLink )
.html( content + ' ' )
.append( verificationLink )
.toggle( !!content )
.show();
} else {
@@ -93,10 +93,14 @@ var PageLayoutView = Backbone.View.extend( BaseMVC.LoggableMixin ).extend({
if( _.has( page, panelId ) ){
page[ panelId ].setElement( '#' + panelId );
page[ panelId ].render();
} else if ( panelId !== 'center' ) {
page.center.$el.css( panelId, 0 );
}
});
if( !this.left ){
this.center.$el.css( 'left', 0 );
}
if( !this.right ){
this.center.$el.css( 'right', 0 );
}
return this;
},
@@ -106,27 +110,26 @@ var PageLayoutView = Backbone.View.extend( BaseMVC.LoggableMixin ).extend({
'<div id="everything">',
'<div id="background"/>',
'<div id="messagebox"/>',
'<div id="inactivebox" class="panel-warning-message"/>',
'<div id="left"/>',
'<div id="center" class="inbound"/>',
'<div id="right"/>',
'<div id="inactivebox" class="panel-warning-message" />',
this.left? '<div id="left" />' : '',
this.center? '<div id="center" class="inbound" />' : '',
this.right? '<div id="right" />' : '',
'</div>',
'<div id="dd-helper"/>',
'<noscript>',
'<div class="overlay overlay-background noscript-overlay">',
'<div>',
'<h3 class="title">Javascript Required for Galaxy</h3>',
'<div>',
'The Galaxy analysis interface requires a browser with Javascript enabled.<br>',
'Please enable Javascript and refresh this page',
'</div>',
'</div>',
'</div>',
'</noscript>'
'<div id="dd-helper" />',
].join('');
},
toString : function() { return 'PageLayoutView' }
/** hide both side panels if previously shown */
hideSidePanels : function(){
if( this.left ){
this.left.hide();
}
if( this.right ){
this.right.hide();
}
},
toString : function() { return 'PageLayoutView'; }
});
// ============================================================================
lib/galaxy/webapps/galaxy/api/lda_datasets.py
+2 -2
View File
@@ -404,8 +404,8 @@ class LibraryDatasetsController( BaseAPIController, UsesVisualizationMixin ):
"""
if payload:
kwd.update(payload)
kwd[ 'space_to_tab' ] = 'False'
kwd[ 'to_posix_lines' ] = 'True'
kwd['space_to_tab'] = False
kwd['to_posix_lines'] = True
kwd[ 'dbkey' ] = kwd.get( 'dbkey', '?' )
kwd[ 'file_type' ] = kwd.get( 'file_type', 'auto' )
kwd['link_data_only'] = 'link_to_files' if util.string_as_bool( kwd.get( 'link_data', False ) ) else 'copy_files'
static/maps/layout/page.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","Masthead","Panel","Modal","BaseMVC","PageLayoutView","Backbone","View","extend","LoggableMixin","_logNamespace","el","className","_panelIds","defaultOptions","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","initialize","options","this","log","_","pick","defaults","omit","Galaxy","modal","masthead","config","$el","attr","html","_template","append","$messagebox","$","$inactivebox","render","remove","renderMessageBox","renderInactivityBox","renderPanels","content","level","addClass","toggle","show","removeClass","hide","verificationLink","root","page","forEach","panelId","has","setElement","center","css","join","toString"],"mappings":"AAAAA,QACI,kBACA,eACA,kBACA,gBACD,SAAUC,EAAUC,EAAOC,EAAOC,GAGrC,GAAIC,GAAiBC,SAASC,KAAKC,OAAQJ,EAAQK,eAAgBD,QAC/DE,cAAgB,SAEhBC,GAAK,OACLC,UAAY,eAEZC,WACI,OAAQ,SAAU,SAGtBC,gBACIC,qBAA0B,EAC1BC,oBAA0B,GAC1BC,kBAA0B,OAC1BC,yBAA0B,EAC1BC,uBAA0B,IAG9BC,WAAa,SAAUC,GAEnBC,KAAKC,IAAKD,KAAO,eAAgBD,GACjCG,EAAEhB,OAAQc,KAAME,EAAEC,KAAMJ,EAASC,KAAKT,YACtCS,KAAKD,QAAUG,EAAEE,SAAUF,EAAEG,KAAMN,EAASC,KAAKT,WAAaS,KAAKR,gBACnEc,OAAOC,MAAQP,KAAKO,MAAQ,GAAI1B,GAAMI,KACtCe,KAAKQ,SAAW,GAAI7B,GAASM,KAAMe,KAAKD,QAAQU,QAChDT,KAAKU,IAAIC,KAAM,SAAU,MACzBX,KAAKU,IAAIE,KAAMZ,KAAKa,aACpBb,KAAKU,IAAII,OAAQd,KAAKQ,SAASE,KAC/BV,KAAKU,IAAII,OAAQd,KAAKO,MAAMG,KAC5BV,KAAKe,YAAcf,KAAKgB,EAAG,eAC3BhB,KAAKiB,aAAejB,KAAKgB,EAAG,iBAGhCE,OAAS,WAQL,MANAF,GAAG,8BAA+BG,SAClCnB,KAAKC,IAAKD,KAAO,YACjBA,KAAKQ,SAASU,SACdlB,KAAKoB,mBACLpB,KAAKqB,sBACLrB,KAAKsB,eACEtB,MAIXoB,iBAAmB,WACf,GAAKpB,KAAKD,QAAQN,oBAAqB,CACnC,GAAI8B,GAAUvB,KAAKD,QAAQL,qBAAuB,GAC9C8B,EAAQxB,KAAKD,QAAQJ,mBAAqB,MAC9CK,MAAKU,IAAIe,SAAU,mBACnBzB,KAAKe,YACAJ,KAAM,QAAS,SAAWa,EAAQ,YAClCZ,KAAMW,GACNG,SAAUH,GACVI,WAEL3B,MAAKU,IAAIkB,YAAa,mBACtB5B,KAAKe,YAAYc,MAErB,OAAO7B,OAIXqB,oBAAsB,WAClB,GAAIrB,KAAKD,QAAQH,wBAAyB,CACtC,GAAI2B,GAAUvB,KAAKD,QAAQF,wBAA0B,GACjDiC,EAAmBd,EAAG,QAASL,KAAM,OAAQL,OAAOyB,KAAO,4BAA6BnB,KAAM,uBAClGZ,MAAKU,IAAIe,SAAU,sBACnBzB,KAAKiB,aACAL,KAAMW,GACNT,OAAQ,IAAMgB,GACdJ,SAAUH,GACVI,WAEL3B,MAAKU,IAAIkB,YAAa,sBACtB5B,KAAKiB,aAAaY,MAEtB,OAAO7B,OAIXsB,aAAe,WACX,GAAIU,GAAOhC,IASX,OARAA,MAAKT,UAAU0C,QAAS,SAAUC,GAC1BhC,EAAEiC,IAAKH,EAAME,IACbF,EAAME,GAAUE,WAAY,IAAMF,GAClCF,EAAME,GAAUhB,UACI,WAAZgB,GACRF,EAAKK,OAAO3B,IAAI4B,IAAKJ,EAAS,KAG/BlC,MAIXa,UAAW,WACP,OACI,wBACI,yBACA,yBACA,wDACA,mBACA,qCACA,oBACJ,SACA,wBACA,aACI,4DACI,QACI,wDACA,QACI,gFACA,iDACJ,SACJ,SACJ,SACJ,eACF0B,KAAK,KAGXC,SAAW,WAAa,MAAO,mBAI/B,QACIzD,eAAgBA"}
{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","Masthead","Panel","Modal","BaseMVC","PageLayoutView","Backbone","View","extend","LoggableMixin","_logNamespace","el","className","_panelIds","defaultOptions","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","initialize","options","this","log","_","pick","defaults","omit","Galaxy","modal","masthead","config","$el","attr","html","_template","append","$messagebox","$","$inactivebox","render","remove","renderMessageBox","renderInactivityBox","renderPanels","content","level","addClass","toggle","show","removeClass","hide","verificationLink","root","text","page","forEach","panelId","has","setElement","left","center","css","right","join","hideSidePanels","toString"],"mappings":"AAAAA,QACI,kBACA,eACA,kBACA,gBACD,SAAUC,EAAUC,EAAOC,EAAOC,GAGrC,GAAIC,GAAiBC,SAASC,KAAKC,OAAQJ,EAAQK,eAAgBD,QAC/DE,cAAgB,SAEhBC,GAAK,OACLC,UAAY,eAEZC,WACI,OAAQ,SAAU,SAGtBC,gBACIC,qBAA0B,EAC1BC,oBAA0B,GAC1BC,kBAA0B,OAC1BC,yBAA0B,EAC1BC,uBAA0B,IAG9BC,WAAa,SAAUC,GAEnBC,KAAKC,IAAKD,KAAO,eAAgBD,GACjCG,EAAEhB,OAAQc,KAAME,EAAEC,KAAMJ,EAASC,KAAKT,YACtCS,KAAKD,QAAUG,EAAEE,SAAUF,EAAEG,KAAMN,EAASC,KAAKT,WAAaS,KAAKR,gBACnEc,OAAOC,MAAQP,KAAKO,MAAQ,GAAI1B,GAAMI,KACtCe,KAAKQ,SAAW,GAAI7B,GAASM,KAAMe,KAAKD,QAAQU,QAChDT,KAAKU,IAAIC,KAAM,SAAU,MACzBX,KAAKU,IAAIE,KAAMZ,KAAKa,aACpBb,KAAKU,IAAII,OAAQd,KAAKQ,SAASE,KAC/BV,KAAKU,IAAII,OAAQd,KAAKO,MAAMG,KAC5BV,KAAKe,YAAcf,KAAKgB,EAAG,eAC3BhB,KAAKiB,aAAejB,KAAKgB,EAAG,iBAGhCE,OAAS,WAQL,MANAF,GAAG,8BAA+BG,SAClCnB,KAAKC,IAAKD,KAAO,YACjBA,KAAKQ,SAASU,SACdlB,KAAKoB,mBACLpB,KAAKqB,sBACLrB,KAAKsB,eACEtB,MAIXoB,iBAAmB,WACf,GAAKpB,KAAKD,QAAQN,oBAAqB,CACnC,GAAI8B,GAAUvB,KAAKD,QAAQL,qBAAuB,GAC9C8B,EAAQxB,KAAKD,QAAQJ,mBAAqB,MAC9CK,MAAKU,IAAIe,SAAU,mBACnBzB,KAAKe,YACAJ,KAAM,QAAS,SAAWa,EAAQ,YAClCZ,KAAMW,GACNG,SAAUH,GACVI,WAEL3B,MAAKU,IAAIkB,YAAa,mBACtB5B,KAAKe,YAAYc,MAErB,OAAO7B,OAIXqB,oBAAsB,WAClB,GAAIrB,KAAKD,QAAQH,wBAAyB,CACtC,GAAI2B,GAAUvB,KAAKD,QAAQF,wBAA0B,GACjDiC,EAAmBd,EAAG,QAASL,KAAM,OAAQL,OAAOyB,KAAO,4BAA6BC,KAAM,sBAClGhC,MAAKU,IAAIe,SAAU,sBACnBzB,KAAKiB,aACAL,KAAMW,EAAU,KAChBT,OAAQgB,GACRJ,SAAUH,GACVI,WAEL3B,MAAKU,IAAIkB,YAAa,sBACtB5B,KAAKiB,aAAaY,MAEtB,OAAO7B,OAIXsB,aAAe,WACX,GAAIW,GAAOjC,IAaX,OAZAA,MAAKT,UAAU2C,QAAS,SAAUC,GAC1BjC,EAAEkC,IAAKH,EAAME,KACbF,EAAME,GAAUE,WAAY,IAAMF,GAClCF,EAAME,GAAUjB,YAGnBlB,KAAKsC,MACNtC,KAAKuC,OAAO7B,IAAI8B,IAAK,OAAQ,GAE5BxC,KAAKyC,OACNzC,KAAKuC,OAAO7B,IAAI8B,IAAK,QAAS,GAE3BxC,MAIXa,UAAW,WACP,OACI,wBACI,yBACA,yBACA,yDACAb,KAAKsC,KAAQ,oBAAsB,GACnCtC,KAAKuC,OAAQ,sCAAwC,GACrDvC,KAAKyC,MAAQ,qBAAuB,GACxC,SACA,0BACFC,KAAK,KAIXC,eAAiB,WACT3C,KAAKsC,MACLtC,KAAKsC,KAAKT,OAEV7B,KAAKyC,OACLzC,KAAKyC,MAAMZ,QAInBe,SAAW,WAAa,MAAO,mBAI/B,QACI7D,eAAgBA"}
static/scripts/bundled/libs.bundled.js
+2 -2
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/layout/page.js
+1 -1
View File
@@ -1,2 +1,2 @@
define(["layout/masthead","layout/panel","mvc/ui/ui-modal","mvc/base-mvc"],function(a,b,c,d){var e=Backbone.View.extend(d.LoggableMixin).extend({_logNamespace:"layout",el:"body",className:"full-content",_panelIds:["left","center","right"],defaultOptions:{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""},initialize:function(b){this.log(this+".initialize:",b),_.extend(this,_.pick(b,this._panelIds)),this.options=_.defaults(_.omit(b,this._panelIds),this.defaultOptions),Galaxy.modal=this.modal=new c.View,this.masthead=new a.View(this.options.config),this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$el.append(this.masthead.$el),this.$el.append(this.modal.$el),this.$messagebox=this.$("#messagebox"),this.$inactivebox=this.$("#inactivebox")},render:function(){return $(".select2-hidden-accessible").remove(),this.log(this+".render:"),this.masthead.render(),this.renderMessageBox(),this.renderInactivityBox(),this.renderPanels(),this},renderMessageBox:function(){if(this.options.message_box_visible){var a=this.options.message_box_content||"",b=this.options.message_box_class||"info";this.$el.addClass("has-message-box"),this.$messagebox.attr("class","panel-"+b+"-message").html(a).toggle(!!a).show()}else this.$el.removeClass("has-message-box"),this.$messagebox.hide();return this},renderInactivityBox:function(){if(this.options.show_inactivity_warning){var a=this.options.inactivity_box_content||"",b=$("<a/>").attr("href",Galaxy.root+"user/resend_verification").html("Resend verification.");this.$el.addClass("has-inactivity-box"),this.$inactivebox.html(a).append(" "+b).toggle(!!a).show()}else this.$el.removeClass("has-inactivity-box"),this.$inactivebox.hide();return this},renderPanels:function(){var a=this;return this._panelIds.forEach(function(b){_.has(a,b)?(a[b].setElement("#"+b),a[b].render()):"center"!==b&&a.center.$el.css(b,0)}),this},_template:function(){return['<div id="everything">','<div id="background"/>','<div id="messagebox"/>','<div id="inactivebox" class="panel-warning-message"/>','<div id="left"/>','<div id="center" class="inbound"/>','<div id="right"/>',"</div>",'<div id="dd-helper"/>',"<noscript>",'<div class="overlay overlay-background noscript-overlay">',"<div>",'<h3 class="title">Javascript Required for Galaxy</h3>',"<div>","The Galaxy analysis interface requires a browser with Javascript enabled.<br>","Please enable Javascript and refresh this page","</div>","</div>","</div>","</noscript>"].join("")},toString:function(){return"PageLayoutView"}});return{PageLayoutView:e}});
define(["layout/masthead","layout/panel","mvc/ui/ui-modal","mvc/base-mvc"],function(a,b,c,d){var e=Backbone.View.extend(d.LoggableMixin).extend({_logNamespace:"layout",el:"body",className:"full-content",_panelIds:["left","center","right"],defaultOptions:{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""},initialize:function(b){this.log(this+".initialize:",b),_.extend(this,_.pick(b,this._panelIds)),this.options=_.defaults(_.omit(b,this._panelIds),this.defaultOptions),Galaxy.modal=this.modal=new c.View,this.masthead=new a.View(this.options.config),this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$el.append(this.masthead.$el),this.$el.append(this.modal.$el),this.$messagebox=this.$("#messagebox"),this.$inactivebox=this.$("#inactivebox")},render:function(){return $(".select2-hidden-accessible").remove(),this.log(this+".render:"),this.masthead.render(),this.renderMessageBox(),this.renderInactivityBox(),this.renderPanels(),this},renderMessageBox:function(){if(this.options.message_box_visible){var a=this.options.message_box_content||"",b=this.options.message_box_class||"info";this.$el.addClass("has-message-box"),this.$messagebox.attr("class","panel-"+b+"-message").html(a).toggle(!!a).show()}else this.$el.removeClass("has-message-box"),this.$messagebox.hide();return this},renderInactivityBox:function(){if(this.options.show_inactivity_warning){var a=this.options.inactivity_box_content||"",b=$("<a/>").attr("href",Galaxy.root+"user/resend_verification").text("Resend verification");this.$el.addClass("has-inactivity-box"),this.$inactivebox.html(a+" ").append(b).toggle(!!a).show()}else this.$el.removeClass("has-inactivity-box"),this.$inactivebox.hide();return this},renderPanels:function(){var a=this;return this._panelIds.forEach(function(b){_.has(a,b)&&(a[b].setElement("#"+b),a[b].render())}),this.left||this.center.$el.css("left",0),this.right||this.center.$el.css("right",0),this},_template:function(){return['<div id="everything">','<div id="background"/>','<div id="messagebox"/>','<div id="inactivebox" class="panel-warning-message" />',this.left?'<div id="left" />':"",this.center?'<div id="center" class="inbound" />':"",this.right?'<div id="right" />':"","</div>",'<div id="dd-helper" />'].join("")},hideSidePanels:function(){this.left&&this.left.hide(),this.right&&this.right.hide()},toString:function(){return"PageLayoutView"}});return{PageLayoutView:e}});
//# sourceMappingURL=../../maps/layout/page.js.map