diff --git a/client/galaxy/scripts/layout/page.js b/client/galaxy/scripts/layout/page.js index 9721a9af37c..407f9285b63 100644 --- a/client/galaxy/scripts/layout/page.js +++ b/client/galaxy/scripts/layout/page.js @@ -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 = $( '' ).attr( 'href', Galaxy.root + 'user/resend_verification' ).html( 'Resend verification.' ); + var verificationLink = $( '' ).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({ '
', '
', '
', - '
', - '
', - '
', - '