From 820588920b9c0b20b782544dac64ca79f24978f6 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 13 Jun 2011 00:34:13 -0400 Subject: [PATCH] Don't highlight "Documents" menu when working document type, highlight "Setup" instead --- apps/documents/__init__.py | 2 +- apps/main/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index c7ef53c913..46e6f7fab2 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -177,4 +177,4 @@ register_model_list_columns(Document, [ }, ]) -register_top_menu('documents', link={'famfam': 'page', 'text': _(u'documents'), 'view': 'document_list_recent'}, children_path_regex=[r'^documents/', r'^metadata/', r'comments'], position=0) +register_top_menu('documents', link={'famfam': 'page', 'text': _(u'documents'), 'view': 'document_list_recent'}, children_path_regex=[r'^documents/[^t]', r'^metadata/', r'comments'], position=0) diff --git a/apps/main/__init__.py b/apps/main/__init__.py index 93cf3051fa..8ae031b1de 100644 --- a/apps/main/__init__.py +++ b/apps/main/__init__.py @@ -39,7 +39,7 @@ if not SIDE_BAR_SEARCH: register_top_menu('search', link={'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'}) register_top_menu('tools', link=tools_menu, children_views=['statistics', 'history_list']) #register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setting_list', 'famfam': 'cog'}, children=setup_views) -register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setting_list', 'famfam': 'cog'}, children_path_regex=[r'^settings/', r'^user_management/', r'^permissions']) +register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setting_list', 'famfam': 'cog'}, children_path_regex=[r'^settings/', r'^user_management/', r'^permissions', r'^documents/type']) register_top_menu('about', link={'text': _(u'about'), 'view': 'about', 'famfam': 'information'}) register_links(['tools_menu', 'statistics', 'history_list', 'history_view'], [tools_menu, statistics, history_list, sentry], menu_name='secondary_menu')