1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/b1f2c51d6bd8/ changeset: b1f2c51d6bd8 user: jgoecks date: 2012-08-25 00:43:33 summary: Do not use enable_tracks or enable_pages options anymore; visualizations and pages are enabled for all instances. affected #: 3 files diff -r 3d32fa091951e9aa72f3c69272960b3f6b648722 -r b1f2c51d6bd8d8b1aecce8f62304cc2df278ccec templates/root/history_common.mako --- a/templates/root/history_common.mako +++ b/templates/root/history_common.mako @@ -218,7 +218,7 @@ %if for_editing: <a href="${h.url_for( controller='tool_runner', action='rerun', id=data.id )}" target="galaxy_main" title='${_("Run this job again")}' class="icon-button arrow-circle tooltip"></a> - %if app.config.get_bool( 'enable_tracks', False ) and data.ext in app.datatypes_registry.get_available_tracks(): + %if data.ext in app.datatypes_registry.get_available_tracks(): <% if data.dbkey != '?': data_url = h.url_for( controller='tracks', action='list_tracks', dbkey=data.dbkey ) diff -r 3d32fa091951e9aa72f3c69272960b3f6b648722 -r b1f2c51d6bd8d8b1aecce8f62304cc2df278ccec templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -78,12 +78,10 @@ [ _('Data Libraries'), h.url_for( controller='/library', action='index') ], None, [ _('Published Histories'), h.url_for( controller='/history', action='list_published' ) ], - [ _('Published Workflows'), h.url_for( controller='/workflow', action='list_published' ) ] - ] - if app.config.get_bool( 'enable_tracks', False ): - menu_options.append( [ _('Published Visualizations'), h.url_for( controller='/visualization', action='list_published' ) ] ) - if app.config.get_bool( 'enable_pages', False ): - menu_options.append( [ _('Published Pages'), h.url_for( controller='/page', action='list_published' ) ] ) + [ _('Published Workflows'), h.url_for( controller='/workflow', action='list_published' ) ], + [ _('Published Visualizations'), h.url_for( controller='/visualization', action='list_published' ) ], + [ _('Published Pages'), h.url_for( controller='/page', action='list_published' ) ] + ] tab( "shared", _("Shared Data"), h.url_for( controller='/library', action='index'), menu_options=menu_options ) %> @@ -98,15 +96,13 @@ %> ## Visualization menu. - %if app.config.get_bool( 'enable_tracks', False ): - <% - menu_options = [ - [_('New Visualization'), h.url_for( controller='/tracks', action='index' ) ], - [_('Saved Visualizations'), h.url_for( controller='/visualization', action='list' ) ] - ] - tab( "visualization", _("Visualization"), h.url_for( controller='/visualization', action='list'), menu_options=menu_options ) - %> - %endif + <% + menu_options = [ + [_('New Visualization'), h.url_for( controller='/tracks', action='index' ) ], + [_('Saved Visualizations'), h.url_for( controller='/visualization', action='list' ) ] + ] + tab( "visualization", _("Visualization"), h.url_for( controller='/visualization', action='list'), menu_options=menu_options ) + %> ## Cloud menu. %if app.config.get_bool( 'enable_cloud_launch', False ): @@ -155,8 +151,7 @@ menu_options.append( [ _('Logout'), app.config.remote_user_logout_href, "_top" ] ) else: menu_options.append( [ _('Preferences'), h.url_for( controller='/user', action='index', cntrller='user', webapp='galaxy' ), "galaxy_main" ] ) - if app.config.get_bool( 'enable_tracks', False ): - menu_options.append( [ 'Custom Builds', h.url_for( controller='/user', action='dbkeys' ), "galaxy_main" ] ) + menu_options.append( [ 'Custom Builds', h.url_for( controller='/user', action='dbkeys' ), "galaxy_main" ] ) if app.config.require_login: logout_url = h.url_for( controller='/root', action='index', m_c='user', m_a='logout', webapp='galaxy' ) else: @@ -165,8 +160,7 @@ menu_options.append( None ) menu_options.append( [ _('Saved Histories'), h.url_for( controller='/history', action='list' ), "galaxy_main" ] ) menu_options.append( [ _('Saved Datasets'), h.url_for( controller='/dataset', action='list' ), "galaxy_main" ] ) - if app.config.get_bool( 'enable_pages', False ): - menu_options.append( [ _('Saved Pages'), h.url_for( controller='/page', action='list' ), "_top" ] ) + menu_options.append( [ _('Saved Pages'), h.url_for( controller='/page', action='list' ), "_top" ] ) menu_options.append( [ _('API Keys'), h.url_for( controller='/user', action='api_keys', cntrller='user', webapp='galaxy' ), "galaxy_main" ] ) if app.config.use_remote_user: menu_options.append( [ _('Public Name'), h.url_for( controller='/user', action='edit_username', cntrller='user', webapp='galaxy' ), "galaxy_main" ] ) diff -r 3d32fa091951e9aa72f3c69272960b3f6b648722 -r b1f2c51d6bd8d8b1aecce8f62304cc2df278ccec universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -506,15 +506,6 @@ # Enable Galaxy to communicate directly with a sequencer #enable_sequencer_communication = False -# Enable Galaxy's built-in visualization module, Trackster. -#enable_tracks = True - -# Enable Galaxy Pages. Pages are custom webpages that include embedded Galaxy items, -# such as datasets, histories, workflows, and visualizations; pages are useful for -# documenting and sharing multiple analyses or workflows. Pages are created using a -# WYSIWYG editor that is very similar to a word processor. -#enable_pages = True - # Enable authentication via OpenID. Allows users to log in to their Galaxy # account by authenticating with an OpenID provider. #enable_openid = False Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.