diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index a8ff07f1ff8..3e02987b0f2 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -154,6 +154,10 @@ class Configuration( object ): self.ucsc_display_sites = kwargs.get( 'ucsc_display_sites', "main,test,archaea,ucla" ).lower().split(",") self.gbrowse_display_sites = kwargs.get( 'gbrowse_display_sites', "modencode,sgd_yeast,tair,wormbase,wormbase_ws120,wormbase_ws140,wormbase_ws170,wormbase_ws180,wormbase_ws190,wormbase_ws200,wormbase_ws204,wormbase_ws210,wormbase_ws220,wormbase_ws225" ).lower().split(",") self.brand = kwargs.get( 'brand', None ) + # Configuration for the message box directly below the masthead. + self.message_box_visible = kwargs.get( 'message_box_visible', False ) + self.message_box_content = kwargs.get( 'message_box_content', None ) + self.message_box_class = kwargs.get( 'message_box_class', 'info' ) self.support_url = kwargs.get( 'support_url', 'http://wiki.g2.bx.psu.edu/Support' ) self.wiki_url = kwargs.get( 'wiki_url', 'http://g2.trac.bx.psu.edu/' ) self.blog_url = kwargs.get( 'blog_url', None ) diff --git a/lib/galaxy/webapps/tool_shed/config.py b/lib/galaxy/webapps/tool_shed/config.py index 739596f71ef..4f1a51387ba 100644 --- a/lib/galaxy/webapps/tool_shed/config.py +++ b/lib/galaxy/webapps/tool_shed/config.py @@ -79,6 +79,10 @@ class Configuration( object ): self.nginx_upload_path = kwargs.get( 'nginx_upload_path', False ) self.log_actions = string_as_bool( kwargs.get( 'log_actions', 'False' ) ) self.brand = kwargs.get( 'brand', None ) + # Configuration for the message box directly below the masthead. + self.message_box_visible = kwargs.get( 'message_box_visible', False ) + self.message_box_content = kwargs.get( 'message_box_content', None ) + self.message_box_class = kwargs.get( 'message_box_class', 'info' ) self.support_url = kwargs.get( 'support_url', 'http://wiki.g2.bx.psu.edu/Support' ) self.wiki_url = kwargs.get( 'wiki_url', 'http://wiki.g2.bx.psu.edu/FrontPage' ) self.blog_url = kwargs.get( 'blog_url', None ) diff --git a/templates/base/base_panels.mako b/templates/base/base_panels.mako index e1bde686ff1..0722438540c 100644 --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -3,9 +3,8 @@ <% self.has_left_panel = hasattr( self, 'left_panel' ) self.has_right_panel = hasattr( self, 'right_panel' ) - self.message_box_visible=False + self.message_box_visible = app.config.message_box_visible self.overlay_visible=False - self.message_box_class="" self.active_view=None self.body_class="" self.require_javascript=False @@ -245,16 +244,16 @@ -## Messagebox -<%def name="message_box_content()"> - - ## Document ${self.init()} - ${self.title()} + %if app.config.brand: + ${self.title()} / ${app.config.brand} + %else: + ${self.title()} + %endif ## For mobile browsers, don't scale up @@ -284,9 +283,9 @@ ${self.masthead()} -
- %if self.message_box_visible: - ${self.message_box_content()} +
+ %if self.message_box_visible and app.config.message_box_content: + ${app.config.message_box_content} %endif
${self.overlay(visible=self.overlay_visible)} diff --git a/tool_shed_wsgi.ini.sample b/tool_shed_wsgi.ini.sample index 263a4b04265..3c211ef338a 100644 --- a/tool_shed_wsgi.ini.sample +++ b/tool_shed_wsgi.ini.sample @@ -88,6 +88,11 @@ sendmail_path = /usr/sbin/sendmail # Use the new iframe / javascript based layout use_new_layout = true +# Show a message box under the masthead. +#message_box_visible = False +#message_box_content = None +#message_box_class = info + # Serving static files (needed if running standalone) static_enabled = True static_cache_time = 360 diff --git a/universe_wsgi.ini.sample b/universe_wsgi.ini.sample index 8e1668e6340..65585890f00 100644 --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -264,6 +264,11 @@ nglims_config_file = tool-data/nglims.yaml # -- UI Localization +# Show a message box under the masthead. +#message_box_visible = False +#message_box_content = None +#message_box_class = info + # Append "/{brand}" to the "Galaxy" text in the masthead. #brand = None