From e39f162a5ef042f6bd73bc4a8b7e0b696970d7a4 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 19 Jun 2011 00:51:01 -0400 Subject: [PATCH] Improved menu highlighting for metadata setup and document metadata view --- 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 cb23eb070c..8a653601ec 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/[^t]', 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/[^s]', r'comments'], position=0) diff --git a/apps/main/__init__.py b/apps/main/__init__.py index 7244f7b71b..f2d5cf7fbb 100644 --- a/apps/main/__init__.py +++ b/apps/main/__init__.py @@ -41,7 +41,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', 'formats_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', r'^documents/type']) +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', r'^metadata/setup']) register_top_menu('about', link={'text': _(u'about'), 'view': 'about', 'famfam': 'information'}) register_links(['tools_menu', 'statistics', 'history_list', 'history_view', 'formats_list'], [tools_menu, statistics, history_list, formats_list, sentry], menu_name='secondary_menu')