diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 221d25845d2..ccc7cd28b30 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -51,6 +51,7 @@ class Configuration( object ): self.use_heartbeat = kwargs.get( 'use_heartbeat', False ) self.ucsc_display_sites = kwargs.get( 'ucsc_display_sites', "main,test,archaea" ).lower().split(",") self.gbrowse_display_sites = kwargs.get( 'gbrowse_display_sites', "wormbase,flybase" ).lower().split(",") + self.brand = kwargs.get( 'brand', None ) #Parse global_conf global_conf = kwargs.get( 'global_conf', None ) global_conf_parser = ConfigParser.ConfigParser() diff --git a/lib/galaxy/web/controllers/root.py b/lib/galaxy/web/controllers/root.py index f8b037a329d..a8771753f67 100644 --- a/lib/galaxy/web/controllers/root.py +++ b/lib/galaxy/web/controllers/root.py @@ -561,7 +561,8 @@ class Universe( BaseController ): @web.expose def masthead( self, trans ): - return trans.fill_template( "masthead.tmpl" ) + brand = trans.app.config.get( "brand", None ) + return trans.fill_template( "masthead.tmpl", brand=brand ) @web.expose def dataset_errors( self, trans, id=None, **kwd ): diff --git a/static/june_2007_style/blue/masthead.css b/static/june_2007_style/blue/masthead.css index f206e7f1b44..2453c846da6 100644 --- a/static/june_2007_style/blue/masthead.css +++ b/static/june_2007_style/blue/masthead.css @@ -24,3 +24,8 @@ a:link, a:visited, a:active { color: #eeeeee; } + +span.brand +{ + font-size:60%; +} diff --git a/templates/masthead.tmpl b/templates/masthead.tmpl index 6d961f9478d..b59c4e47482 100644 --- a/templates/masthead.tmpl +++ b/templates/masthead.tmpl @@ -1,4 +1,9 @@ + +#if $brand is not None: + #set $brand = "/%s" % $brand +#end if + @@ -12,7 +17,7 @@ - +
Galaxy
Galaxy$brand
 Info: report bugs diff --git a/universe_wsgi.ini.sample b/universe_wsgi.ini.sample index 19d80bfa4af..c33beca6e4d 100644 --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -98,6 +98,9 @@ static_favicon_dir = %(here)s/static/favicon.ico static_scripts_dir = %(here)s/static/scripts/ static_style_dir = %(here)s/static/june_2007_style/blue +# Brand: appends "/[brand]" to the "Galaxy" text in the masthead +#brand = Foo + # ---- Datatypes ------------------------------------------------------------ [galaxy:datatypes]