Use 'Galaxy / Brand' consistent styling instead of 'Galaxy | Brand'

client/galaxy/scripts/layout/page.js

@@ -18,7 +18,7 @@ define( [ 'layout/masthead', 'layout/panel', 'mvc/ui/ui-modal' ], function( Mast
             Galaxy.modal = this.modal = new Modal.View();
             Galaxy.display = this.display = function( view ) {
                 if ( view.title ){
-                    window.document.title = "Galaxy | " + (window.Galaxy.config.brand ? window.Galaxy.config.brand + " | " : '') + view.title;
+                    window.document.title = "Galaxy " + (window.Galaxy.config.brand ? " / " + window.Galaxy.config.brand : '') + " | " + view.title;
                 }
                 self.center.display( view );
             };

static/maps/layout/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","Masthead","Panel","Modal","View","Backbone","extend","el","className","_panelids","initialize","options","self","this","config","_","defaults","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","Galaxy","modal","display","view","title","window","document","brand","center","router","Router","masthead","CenterPanel","$el","attr","html","_template","$","replaceWith","append","frame","$messagebox","$inactivebox","panels","each","panel_id","panel_class_name","charAt","toUpperCase","slice","panel_class","panel_instance","toString","SidePanel","id","render","history","start","root","pushState","remove","renderMessageBox","renderInactivityBox","renderPanels","_checkCommunicationServerOnline","content","level","addClass","toggle","show","removeClass","hide","verificationLink","text","panel","css","join","host","communication_server_host","port","communication_server_port","preferences","user","attributes","$chat_icon_element","indexOf","communication_server","ajax","url","success","error"],"mappings":"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"}
+{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","Masthead","Panel","Modal","View","Backbone","extend","el","className","_panelids","initialize","options","self","this","config","_","defaults","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","Galaxy","modal","display","view","title","window","document","brand","center","router","Router","masthead","CenterPanel","$el","attr","html","_template","$","replaceWith","append","frame","$messagebox","$inactivebox","panels","each","panel_id","panel_class_name","charAt","toUpperCase","slice","panel_class","panel_instance","toString","SidePanel","id","render","history","start","root","pushState","remove","renderMessageBox","renderInactivityBox","renderPanels","_checkCommunicationServerOnline","content","level","addClass","toggle","show","removeClass","hide","verificationLink","text","panel","css","join","host","communication_server_host","port","communication_server_port","preferences","user","attributes","$chat_icon_element","indexOf","communication_server","ajax","url","success","error"],"mappings":"AAAAA,QAAU,kBAAmB,eAAgB,mBAAqB,SAAUC,EAAUC,EAAOC,GACzF,GAAIC,GAAOC,SAASD,KAAKE,QACrBC,GAAK,OACLC,UAAY,eACZC,WAAc,OAAQ,SAEtBC,WAAa,SAAUC,GACnB,GAAIC,GAAOC,IACXA,MAAKC,OAASC,EAAEC,SAAUL,EAAQG,YAC9BG,qBAA0B,EAC1BC,oBAA0B,GAC1BC,kBAA0B,OAC1BC,yBAA0B,EAC1BC,uBAA0B,KAI9BC,OAAOC,MAAQV,KAAKU,MAAQ,GAAIpB,GAAMC,KACtCkB,OAAOE,QAAUX,KAAKW,QAAU,SAAUC,GACjCA,EAAKC,QACNC,OAAOC,SAASF,MAAQ,WAAaC,OAAOL,OAAOR,OAAOe,MAAQ,MAAQF,OAAOL,OAAOR,OAAOe,MAAQ,IAAM,MAAQJ,EAAKC,OAE9Hd,EAAKkB,OAAON,QAASC,IAEzBH,OAAOS,OAASlB,KAAKkB,OAASpB,EAAQqB,QAAU,GAAIrB,GAAQqB,OAAQpB,EAAMD,GAC1EE,KAAKoB,SAAW,GAAIhC,GAASG,KAAMS,KAAKC,QACxCD,KAAKiB,OAAS,GAAI5B,GAAMgC,YAGxBrB,KAAKsB,IAAIC,KAAM,SAAU,MACzBvB,KAAKsB,IAAIE,KAAMxB,KAAKyB,aACpBzB,KAAK0B,EAAG,aAAcC,YAAa3B,KAAKoB,SAASE,KACjDtB,KAAK0B,EAAG,WAAYE,OAAQ5B,KAAKiB,OAAOK,KACxCtB,KAAKsB,IAAIM,OAAQ5B,KAAKoB,SAASS,MAAMP,KACrCtB,KAAKsB,IAAIM,OAAQ5B,KAAKU,MAAMY,KAC5BtB,KAAK8B,YAAc9B,KAAK0B,EAAG,eAC3B1B,KAAK+B,aAAe/B,KAAK0B,EAAG,gBAG5B1B,KAAKgC,UACL9B,EAAE+B,KAAMjC,KAAKJ,UAAW,SAAUsC,GAC9B,GAAIC,GAAmBD,EAASE,OAAQ,GAAIC,cAAgBH,EAASI,MAAO,GACxEC,EAAczC,EAASqC,EAC3B,IAAKI,EAAc,CACf,GAAIC,GAAiB,GAAID,GAAaxC,EAAMD,EAC5CC,GAAMyC,EAAeC,YAAeD,EACpCzC,EAAKiC,OAAQE,GAAa,GAAI7C,GAAMqD,WAChCC,GAAUT,EACVxC,GAAUK,EAAK2B,EAAG,IAAMQ,GACxBtB,KAAU4B,OAItBxC,KAAK4C,SAGL5C,KAAKkB,QAAU1B,SAASqD,QAAQC,OAC5BC,KAActC,OAAOsC,KACrBC,WAAc,KAItBJ,OAAS,WAQL,MANAlB,GAAG,8BAA+BuB,SAClCjD,KAAKoB,SAASwB,SACd5C,KAAKkD,mBACLlD,KAAKmD,sBACLnD,KAAKoD,eACLpD,KAAKqD,kCACErD,MAIXkD,iBAAmB,WACf,GAAKlD,KAAKC,OAAOG,oBAAqB,CAClC,GAAIkD,GAAUtD,KAAKC,OAAOI,qBAAuB,GAC7CkD,EAAQvD,KAAKC,OAAOK,mBAAqB,MAC7CN,MAAKsB,IAAIkC,SAAU,mBACnBxD,KAAK8B,YACAP,KAAM,QAAS,SAAWgC,EAAQ,YAClC/B,KAAM8B,GACNG,SAAUH,GACVI,WAEL1D,MAAKsB,IAAIqC,YAAa,mBACtB3D,KAAK8B,YAAY8B,MAErB,OAAO5D,OAIXmD,oBAAsB,WAClB,GAAInD,KAAKC,OAAOM,wBAAyB,CACrC,GAAI+C,GAAUtD,KAAKC,OAAOO,wBAA0B,GAChDqD,EAAmBnC,EAAG,QAASH,KAAM,OAAQd,OAAOsC,KAAO,4BAA6Be,KAAM,sBAClG9D,MAAKsB,IAAIkC,SAAU,sBACnBxD,KAAK+B,aACAP,KAAM8B,EAAU,KAChB1B,OAAQiC,GACRJ,SAAUH,GACVI,WAEL1D,MAAKsB,IAAIqC,YAAa,sBACtB3D,KAAK+B,aAAa6B,MAEtB,OAAO5D,OAIXoD,aAAe,WACX,GAAIrD,GAAOC,IAUX,OATAE,GAAE+B,KAAMjC,KAAKJ,UAAW,SAAUsC,GAC9B,GAAI6B,GAAQhE,EAAKiC,OAAQE,EACpB6B,GACDA,EAAMnB,UAEN7C,EAAK2B,EAAG,WAAYsC,IAAK9B,EAAU,GACnCnC,EAAK2B,EAAG,IAAMQ,GAAW0B,UAG1B5D,MAIXyB,UAAW,WACP,OACI,wBACI,yBACA,uBACA,yBACA,yDACA,oBACA,sCACA,qBACJ,SACA,0BACFwC,KAAK,KAGXxB,SAAW,WAAa,MAAO,kBAG/BY,gCAAiC,WAC7B,GAAIa,GAAOpD,OAAOL,OAAOR,OAAOkE,0BAC5BC,EAAOtD,OAAOL,OAAOR,OAAOoE,0BAC5BC,EAAcxD,OAAOL,OAAO8D,KAAKC,WAAWF,YAC5CG,EAAqB/C,EAAG,oBAEvB4C,IAA8E,KAA7D,IAAK,QAASI,QAASJ,EAAYK,sBAErDjD,EAAEkD,MACEC,IAAKX,EAAO,IAAME,IAErBU,QAAS,WAE4B,OAA1BhE,OAAOL,OAAO8D,KAAK5B,IAC4B,WAA3C8B,EAAmBT,IAAK,eACxBS,EAAmBT,IAAK,aAAc,aAIrDe,MAAO,WAEJN,EAAmBT,IAAK,aAAc,YAG1CS,EAAmBT,IAAK,aAAc,YAKlD,QAASzE,KAAMA"}

static/scripts/layout/page.js

@@ -1,2 +1,2 @@
-define(["layout/masthead","layout/panel","mvc/ui/ui-modal"],function(a,b,c){var d=Backbone.View.extend({el:"body",className:"full-content",_panelids:["left","right"],initialize:function(d){var e=this;this.config=_.defaults(d.config||{},{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""}),Galaxy.modal=this.modal=new c.View,Galaxy.display=this.display=function(a){a.title&&(window.document.title="Galaxy | "+(window.Galaxy.config.brand?window.Galaxy.config.brand+" | ":"")+a.title),e.center.display(a)},Galaxy.router=this.router=d.Router&&new d.Router(e,d),this.masthead=new a.View(this.config),this.center=new b.CenterPanel,this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$("#masthead").replaceWith(this.masthead.$el),this.$("#center").append(this.center.$el),this.$el.append(this.masthead.frame.$el),this.$el.append(this.modal.$el),this.$messagebox=this.$("#messagebox"),this.$inactivebox=this.$("#inactivebox"),this.panels={},_.each(this._panelids,function(a){var c=a.charAt(0).toUpperCase()+a.slice(1),f=d[c];if(f){var g=new f(e,d);e[g.toString()]=g,e.panels[a]=new b.SidePanel({id:a,el:e.$("#"+a),view:g})}}),this.render(),this.router&&Backbone.history.start({root:Galaxy.root,pushState:!0})},render:function(){return $(".select2-hidden-accessible").remove(),this.masthead.render(),this.renderMessageBox(),this.renderInactivityBox(),this.renderPanels(),this._checkCommunicationServerOnline(),this},renderMessageBox:function(){if(this.config.message_box_visible){var a=this.config.message_box_content||"",b=this.config.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.config.show_inactivity_warning){var a=this.config.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 _.each(this._panelids,function(b){var c=a.panels[b];c?c.render():(a.$("#center").css(b,0),a.$("#"+b).hide())}),this},_template:function(){return['<div id="everything">','<div id="background"/>','<div id="masthead"/>','<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" />'].join("")},toString:function(){return"PageLayoutView"},_checkCommunicationServerOnline:function(){var a=window.Galaxy.config.communication_server_host,b=window.Galaxy.config.communication_server_port,c=window.Galaxy.user.attributes.preferences,d=$("#show-chat-online");c&&-1!=["1","true"].indexOf(c.communication_server)?$.ajax({url:a+":"+b}).success(function(){null!==window.Galaxy.user.id&&"hidden"===d.css("visibility")&&d.css("visibility","visible")}).error(function(){d.css("visibility","hidden")}):d.css("visibility","hidden")}});return{View:d}});
+define(["layout/masthead","layout/panel","mvc/ui/ui-modal"],function(a,b,c){var d=Backbone.View.extend({el:"body",className:"full-content",_panelids:["left","right"],initialize:function(d){var e=this;this.config=_.defaults(d.config||{},{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""}),Galaxy.modal=this.modal=new c.View,Galaxy.display=this.display=function(a){a.title&&(window.document.title="Galaxy "+(window.Galaxy.config.brand?" / "+window.Galaxy.config.brand:"")+" | "+a.title),e.center.display(a)},Galaxy.router=this.router=d.Router&&new d.Router(e,d),this.masthead=new a.View(this.config),this.center=new b.CenterPanel,this.$el.attr("scroll","no"),this.$el.html(this._template()),this.$("#masthead").replaceWith(this.masthead.$el),this.$("#center").append(this.center.$el),this.$el.append(this.masthead.frame.$el),this.$el.append(this.modal.$el),this.$messagebox=this.$("#messagebox"),this.$inactivebox=this.$("#inactivebox"),this.panels={},_.each(this._panelids,function(a){var c=a.charAt(0).toUpperCase()+a.slice(1),f=d[c];if(f){var g=new f(e,d);e[g.toString()]=g,e.panels[a]=new b.SidePanel({id:a,el:e.$("#"+a),view:g})}}),this.render(),this.router&&Backbone.history.start({root:Galaxy.root,pushState:!0})},render:function(){return $(".select2-hidden-accessible").remove(),this.masthead.render(),this.renderMessageBox(),this.renderInactivityBox(),this.renderPanels(),this._checkCommunicationServerOnline(),this},renderMessageBox:function(){if(this.config.message_box_visible){var a=this.config.message_box_content||"",b=this.config.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.config.show_inactivity_warning){var a=this.config.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 _.each(this._panelids,function(b){var c=a.panels[b];c?c.render():(a.$("#center").css(b,0),a.$("#"+b).hide())}),this},_template:function(){return['<div id="everything">','<div id="background"/>','<div id="masthead"/>','<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" />'].join("")},toString:function(){return"PageLayoutView"},_checkCommunicationServerOnline:function(){var a=window.Galaxy.config.communication_server_host,b=window.Galaxy.config.communication_server_port,c=window.Galaxy.user.attributes.preferences,d=$("#show-chat-online");c&&-1!=["1","true"].indexOf(c.communication_server)?$.ajax({url:a+":"+b}).success(function(){null!==window.Galaxy.user.id&&"hidden"===d.css("visibility")&&d.css("visibility","visible")}).error(function(){d.css("visibility","hidden")}):d.css("visibility","hidden")}});return{View:d}});
 //# sourceMappingURL=../../maps/layout/page.js.map