diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py index 5fb0eb397f..34f850b0bc 100644 --- a/apps/document_indexing/__init__.py +++ b/apps/document_indexing/__init__.py @@ -20,7 +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'}, position=10) +register_top_menu('indexes', link={'text': _('indexes'), 'famfam': 'folder_page', 'view': 'index_instance_list'}) 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/main/__init__.py b/apps/main/__init__.py index 5e669a4f4a..e6225b1c9b 100644 --- a/apps/main/__init__.py +++ b/apps/main/__init__.py @@ -44,10 +44,9 @@ if not DISABLE_HOME_VIEW: if not SIDE_BAR_SEARCH: register_top_menu('search', link={'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'}, children_path_regex=[r'^search/']) -register_top_menu('tools', link=tools_menu, children_views=['statistics', 'history_list', 'formats_list']) +register_top_menu('tools', link=tools_menu, children_views=['statistics', 'history_list', 'formats_list'], position=-3) #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', r'^metadata/setup', r'sources/setup']) -register_top_menu('about', link={'text': _(u'about'), 'view': 'about', 'famfam': 'information'}) +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', r'sources/setup'], position=-2) register_links(['tools_menu', 'statistics', 'history_list', 'history_view', 'formats_list'], [tools_menu, statistics, history_list, formats_list, sentry], menu_name='secondary_menu') diff --git a/settings.py b/settings.py index 60b9afc094..7f84463082 100644 --- a/settings.py +++ b/settings.py @@ -134,7 +134,6 @@ INSTALLED_APPS = ( 'dynamic_search', 'filetransfers', 'converter', - 'ocr', 'permissions', 'djcelery', 'indexer', @@ -152,6 +151,7 @@ INSTALLED_APPS = ( 'grouping', 'mptt', 'document_indexing', + 'ocr', 'sources', 'mimetype', 'scheduler',