From df46ab16050aebbbbd107d96de6ca260f6f574af Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 23 Jul 2011 00:25:20 -0400 Subject: [PATCH] Navigation improvements --- apps/document_indexing/__init__.py | 3 --- apps/documents/__init__.py | 1 + apps/main/templates/base.html | 11 +++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py index 985727b177..5fb0eb397f 100644 --- a/apps/document_indexing/__init__.py +++ b/apps/document_indexing/__init__.py @@ -20,10 +20,7 @@ index_list = {'text': _(u'index list'), 'view': 'index_instance_list', 'famfam': index_parent = {'text': _(u'go up one level'), 'view': 'index_instance_list', 'args': 'object.parent.pk', 'famfam': 'arrow_up', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW], 'dont_mark_active': True} document_index_list = {'text': _(u'indexes'), 'view': 'document_index_list', 'args': 'object.pk', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW, PERMISSION_DOCUMENT_VIEW]} -#register_top_menu('indexes', link={'text': _('indexes'), 'famfam': 'folder_page', 'view': 'index_instance_list'}, children_path_regex=[r'^document_indexing', r'^(^document_indexing/list/for/document)'], position=10) register_top_menu('indexes', link={'text': _('indexes'), 'famfam': 'folder_page', 'view': 'index_instance_list'}, position=10) - #format_regex = re.compile(' *([A-Z0-9]+)[*]? +([A-Z0-9]+) +([rw\-+]+) *(.*).*') - rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')} diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index 2e9070582a..6b11374646 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -135,6 +135,7 @@ register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_ins secondary_menu_links = [document_list_recent, document_list, document_create_multiple] register_links(['document_list_recent', 'document_list', 'document_create', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], secondary_menu_links, menu_name='secondary_menu') +register_links(Document, secondary_menu_links, menu_name='secondary_menu') #register_links(Document, secondary_menu_links, menu_name='sidebar') # Document page links diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html index 5c2c4ca43a..ac8a0e703f 100644 --- a/apps/main/templates/base.html +++ b/apps/main/templates/base.html @@ -270,6 +270,17 @@ {% endif %} {% endif %} + {% get_object_navigation_links "related" as object_navigation_links %} + {% if object_navigation_links %} +
+

{% trans "Related actions" %}

+ +
+ {% endif %} {% get_object_navigation_links "sidebar" as object_navigation_links %} {% if object_navigation_links %}