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 pull request #2182 from guerler/fix_masthead_002

Browse Source 
[16.04] Remove redundant ui divs, move masthead into #everything
This commit is contained in:
Dannon Baker
2016-04-18 09:56:52 -04:00
parent e1d937e430 cea9a12238
commit ab015c67df
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/layout/page.js
+2 -1
View File
@@ -34,7 +34,7 @@ var PageLayoutView = Backbone.View.extend( BaseMVC.LoggableMixin ).extend({
this.$el.attr( 'scroll', 'no' );
this.$el.html( this._template() );
this.$el.append( this.masthead.frame.$el );
this.$el.append( this.masthead.$el );
this.$( '#masthead' ).replaceWith( this.masthead.$el );
this.$el.append( this.modal.$el );
this.$messagebox = this.$( '#messagebox' );
this.$inactivebox = this.$( '#inactivebox' );
@@ -110,6 +110,7 @@ var PageLayoutView = Backbone.View.extend( BaseMVC.LoggableMixin ).extend({
return [
'<div id="everything">',
'<div id="background"/>',
'<div id="masthead"/>',
'<div id="messagebox"/>',
'<div id="inactivebox" class="panel-warning-message" />',
this.left? '<div id="left" />' : '',
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","config","Galaxy","modal","masthead","$el","attr","html","_template","append","frame","$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,EAAQO,OAAQN,KAAKT,WAAaS,KAAKR,gBAC1Ee,OAAOC,MAAQR,KAAKQ,MAAQ,GAAI3B,GAAMI,KACtCe,KAAKS,SAAW,GAAI9B,GAASM,KAAMe,KAAKD,SACxCC,KAAKU,IAAIC,KAAM,SAAU,MACzBX,KAAKU,IAAIE,KAAMZ,KAAKa,aACpBb,KAAKU,IAAII,OAAQd,KAAKS,SAASM,MAAML,KACrCV,KAAKU,IAAII,OAAQd,KAAKS,SAASC,KAC/BV,KAAKU,IAAII,OAAQd,KAAKQ,MAAME,KAC5BV,KAAKgB,YAAchB,KAAKiB,EAAG,eAC3BjB,KAAKkB,aAAelB,KAAKiB,EAAG,iBAGhCE,OAAS,WAQL,MANAF,GAAG,8BAA+BG,SAClCpB,KAAKC,IAAKD,KAAO,YACjBA,KAAKS,SAASU,SACdnB,KAAKqB,mBACLrB,KAAKsB,sBACLtB,KAAKuB,eACEvB,MAIXqB,iBAAmB,WACf,GAAKrB,KAAKD,QAAQN,oBAAqB,CACnC,GAAI+B,GAAUxB,KAAKD,QAAQL,qBAAuB,GAC9C+B,EAAQzB,KAAKD,QAAQJ,mBAAqB,MAC9CK,MAAKU,IAAIgB,SAAU,mBACnB1B,KAAKgB,YACAL,KAAM,QAAS,SAAWc,EAAQ,YAClCb,KAAMY,GACNG,SAAUH,GACVI,WAEL5B,MAAKU,IAAImB,YAAa,mBACtB7B,KAAKgB,YAAYc,MAErB,OAAO9B,OAIXsB,oBAAsB,WAClB,GAAItB,KAAKD,QAAQH,wBAAyB,CACtC,GAAI4B,GAAUxB,KAAKD,QAAQF,wBAA0B,GACjDkC,EAAmBd,EAAG,QAASN,KAAM,OAAQJ,OAAOyB,KAAO,4BAA6BC,KAAM,sBAClGjC,MAAKU,IAAIgB,SAAU,sBACnB1B,KAAKkB,aACAN,KAAMY,EAAU,KAChBV,OAAQiB,GACRJ,SAAUH,GACVI,WAEL5B,MAAKU,IAAImB,YAAa,sBACtB7B,KAAKkB,aAAaY,MAEtB,OAAO9B,OAIXuB,aAAe,WACX,GAAIW,GAAOlC,IAaX,OAZAA,MAAKT,UAAU4C,QAAS,SAAUC,GAC1BlC,EAAEmC,IAAKH,EAAME,KACbF,EAAME,GAAUE,WAAY,IAAMF,GAClCF,EAAME,GAAUjB,YAGnBnB,KAAKuC,MACNvC,KAAKwC,OAAO9B,IAAI+B,IAAK,OAAQ,GAE5BzC,KAAK0C,OACN1C,KAAKwC,OAAO9B,IAAI+B,IAAK,QAAS,GAE3BzC,MAIXa,UAAW,WACP,OACI,wBACI,yBACA,yBACA,yDACAb,KAAKuC,KAAQ,oBAAsB,GACnCvC,KAAKwC,OAAQ,sCAAwC,GACrDxC,KAAK0C,MAAQ,qBAAuB,GACxC,SACA,0BACFC,KAAK,KAIXC,eAAiB,WACT5C,KAAKuC,MACLvC,KAAKuC,KAAKT,OAEV9B,KAAK0C,OACL1C,KAAK0C,MAAMZ,QAInBe,SAAW,WAAa,MAAO,mBAI/B,QACI9D,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","config","Galaxy","modal","masthead","$el","attr","html","_template","append","frame","$","replaceWith","$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,EAAQO,OAAQN,KAAKT,WAAaS,KAAKR,gBAC1Ee,OAAOC,MAAQR,KAAKQ,MAAQ,GAAI3B,GAAMI,KACtCe,KAAKS,SAAW,GAAI9B,GAASM,KAAMe,KAAKD,SACxCC,KAAKU,IAAIC,KAAM,SAAU,MACzBX,KAAKU,IAAIE,KAAMZ,KAAKa,aACpBb,KAAKU,IAAII,OAAQd,KAAKS,SAASM,MAAML,KACrCV,KAAKgB,EAAG,aAAcC,YAAajB,KAAKS,SAASC,KACjDV,KAAKU,IAAII,OAAQd,KAAKQ,MAAME,KAC5BV,KAAKkB,YAAclB,KAAKgB,EAAG,eAC3BhB,KAAKmB,aAAenB,KAAKgB,EAAG,iBAGhCI,OAAS,WAQL,MANAJ,GAAG,8BAA+BK,SAClCrB,KAAKC,IAAKD,KAAO,YACjBA,KAAKS,SAASW,SACdpB,KAAKsB,mBACLtB,KAAKuB,sBACLvB,KAAKwB,eACExB,MAIXsB,iBAAmB,WACf,GAAKtB,KAAKD,QAAQN,oBAAqB,CACnC,GAAIgC,GAAUzB,KAAKD,QAAQL,qBAAuB,GAC9CgC,EAAQ1B,KAAKD,QAAQJ,mBAAqB,MAC9CK,MAAKU,IAAIiB,SAAU,mBACnB3B,KAAKkB,YACAP,KAAM,QAAS,SAAWe,EAAQ,YAClCd,KAAMa,GACNG,SAAUH,GACVI,WAEL7B,MAAKU,IAAIoB,YAAa,mBACtB9B,KAAKkB,YAAYa,MAErB,OAAO/B,OAIXuB,oBAAsB,WAClB,GAAIvB,KAAKD,QAAQH,wBAAyB,CACtC,GAAI6B,GAAUzB,KAAKD,QAAQF,wBAA0B,GACjDmC,EAAmBhB,EAAG,QAASL,KAAM,OAAQJ,OAAO0B,KAAO,4BAA6BC,KAAM,sBAClGlC,MAAKU,IAAIiB,SAAU,sBACnB3B,KAAKmB,aACAP,KAAMa,EAAU,KAChBX,OAAQkB,GACRJ,SAAUH,GACVI,WAEL7B,MAAKU,IAAIoB,YAAa,sBACtB9B,KAAKmB,aAAaY,MAEtB,OAAO/B,OAIXwB,aAAe,WACX,GAAIW,GAAOnC,IAaX,OAZAA,MAAKT,UAAU6C,QAAS,SAAUC,GAC1BnC,EAAEoC,IAAKH,EAAME,KACbF,EAAME,GAAUE,WAAY,IAAMF,GAClCF,EAAME,GAAUjB,YAGnBpB,KAAKwC,MACNxC,KAAKyC,OAAO/B,IAAIgC,IAAK,OAAQ,GAE5B1C,KAAK2C,OACN3C,KAAKyC,OAAO/B,IAAIgC,IAAK,QAAS,GAE3B1C,MAIXa,UAAW,WACP,OACI,wBACI,yBACA,uBACA,yBACA,yDACAb,KAAKwC,KAAQ,oBAAsB,GACnCxC,KAAKyC,OAAQ,sCAAwC,GACrDzC,KAAK2C,MAAQ,qBAAuB,GACxC,SACA,0BACFC,KAAK,KAIXC,eAAiB,WACT7C,KAAKwC,MACLxC,KAAKwC,KAAKT,OAEV/B,KAAK2C,OACL3C,KAAK2C,MAAMZ,QAInBe,SAAW,WAAa,MAAO,mBAI/B,QACI/D,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.config,this._panelIds),this.defaultOptions),Galaxy.modal=this.modal=new c.View,this.masthead=new a.View(this.options),this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$el.append(this.masthead.frame.$el),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}});
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.config,this._panelIds),this.defaultOptions),Galaxy.modal=this.modal=new c.View,this.masthead=new a.View(this.options),this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$el.append(this.masthead.frame.$el),this.$("#masthead").replaceWith(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="masthead"/>','<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
templates/webapps/galaxy/galaxy.masthead.mako
+1 -1
View File
@@ -73,7 +73,7 @@
if (!Galaxy.masthead) {
Galaxy.masthead = new Masthead.View(${ h.dumps( masthead_config ) });
Galaxy.modal = new Modal.View();
$('body').append( Galaxy.masthead.render().$el );
$('#masthead').replaceWith( Galaxy.masthead.render().$el );
}
});
});