diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py index c1ad9eacc5..56976a89e4 100644 --- a/mayan/apps/documents/__init__.py +++ b/mayan/apps/documents/__init__.py @@ -76,7 +76,7 @@ register_links([DocumentTypeFilename, 'documents:document_type_filename_list', ' # Register document links register_links(Document, [document_edit, document_document_type_edit, document_print, document_delete, document_download, document_clear_transformations, document_update_page_count]) -register_links([Document], [link_spacer, document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count, document_multiple_document_type_edit], menu_name='multi_item_links') +register_links([Document], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count, document_multiple_document_type_edit, link_spacer], menu_name='multi_item_links') register_links(Document, [document_preview], menu_name='form_header', position=0) register_links(Document, [document_content], menu_name='form_header', position=1) register_links(Document, [document_properties], menu_name='form_header', position=2) diff --git a/mayan/apps/folders/__init__.py b/mayan/apps/folders/__init__.py index de64d43510..cdd59fb576 100644 --- a/mayan/apps/folders/__init__.py +++ b/mayan/apps/folders/__init__.py @@ -26,7 +26,7 @@ register_links(Folder, [folder_view, folder_edit, folder_acl_list, folder_delete register_links([Folder, 'folders:folder_list', 'folders:folder_create'], [folder_list, folder_create], menu_name='secondary_menu') register_links(['folders:document_folder_list', 'folders:folder_add_document'], [folder_add_document], menu_name="sidebar") register_links(Document, [document_folder_list], menu_name='form_header') -register_links([Document], [link_spacer, folder_add_multiple_documents, folder_document_multiple_remove], menu_name='multi_item_links') +register_links([Document], [folder_add_multiple_documents, folder_document_multiple_remove, link_spacer], menu_name='multi_item_links') register_top_menu(name='folders', link=folders_main_menu_link) diff --git a/mayan/apps/metadata/__init__.py b/mayan/apps/metadata/__init__.py index 8048c11918..2a8845d3c8 100644 --- a/mayan/apps/metadata/__init__.py +++ b/mayan/apps/metadata/__init__.py @@ -66,7 +66,7 @@ Document.add_to_class('metadata_value_of', DocumentMetadataHelper.constructor) register_links(['metadata:metadata_add', 'metadata:metadata_edit', 'metadata:metadata_remove', 'metadata:metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar') register_links(Document, [metadata_view], menu_name='form_header') -register_links([Document], [link_spacer, metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove], menu_name='multi_item_links') +register_links([Document], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove, link_spacer], menu_name='multi_item_links') register_links(DocumentType, [setup_document_type_metadata, setup_document_type_metadata_required]) register_links(MetadataType, [setup_metadata_type_edit, setup_metadata_type_delete]) register_links([MetadataType, 'metadata:setup_metadata_type_list', 'metadata:setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu') diff --git a/mayan/apps/navigation/forms.py b/mayan/apps/navigation/forms.py index 78348deb42..c8213643be 100644 --- a/mayan/apps/navigation/forms.py +++ b/mayan/apps/navigation/forms.py @@ -1,13 +1,24 @@ from django import forms from django.utils.translation import ugettext as _ +from .links import link_spacer + class MultiItemForm(forms.Form): def __init__(self, *args, **kwargs): actions = kwargs.pop('actions', []) super(MultiItemForm, self).__init__(*args, **kwargs) choices = [] - choices.extend([(action[0], action[1]) for action in actions]) + group = [] + + for action in actions: + if not action[0]: + if group: + choices.append((link_spacer['text'], group)) + group = [] + else: + group.append(action) + self.fields['action'].choices = choices action = forms.ChoiceField(label=_(u'Actions'), required=False) diff --git a/mayan/apps/navigation/links.py b/mayan/apps/navigation/links.py index f9ab054f33..6c0bba5d46 100644 --- a/mayan/apps/navigation/links.py +++ b/mayan/apps/navigation/links.py @@ -1 +1,3 @@ -link_spacer = {'text': ('------'), 'url': ''} +# -*- coding: utf-8 -*- + +link_spacer = {'text': ('───────────────'), 'url': ''} diff --git a/mayan/apps/ocr/__init__.py b/mayan/apps/ocr/__init__.py index 63d6151ea7..7f16bfad7d 100644 --- a/mayan/apps/ocr/__init__.py +++ b/mayan/apps/ocr/__init__.py @@ -27,7 +27,7 @@ from .tasks import task_do_ocr logger = logging.getLogger(__name__) register_links(Document, [submit_document]) -register_links([Document], [link_spacer, submit_document_multiple], menu_name='multi_item_links') +register_links([Document], [submit_document_multiple, link_spacer], menu_name='multi_item_links') register_links(['ocr:queue_document_list'], [re_queue_multiple_document, queue_document_multiple_delete]) register_links(['ocr:queue_document_list'], [queue_document_list], menu_name='secondary_menu') diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index db8e05a97d..37690aebb0 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -51,10 +51,10 @@ register_model_list_columns(Document, [ register_top_menu('tags', link={'text': _(u'Tags'), 'view': 'tags:tag_list', 'famfam': 'tag_blue'}) register_links(Tag, [tag_tagged_item_list, tag_edit, tag_acl_list, tag_delete]) -register_links([Tag], [link_spacer, tag_multiple_delete], menu_name='multi_item_links') +register_links([Tag], [tag_multiple_delete, link_spacer], menu_name='multi_item_links') register_links([Tag, 'tags:tag_list', 'tags:tag_create'], [tag_list, tag_create], menu_name='secondary_menu') register_links(Document, [tag_document_list], menu_name='form_header') register_links(['tags:document_tags', 'tags:tag_remove', 'tags:tag_multiple_remove', 'tags:tag_attach'], [tag_attach], menu_name='sidebar') -register_links(['tags:document_tags'], [link_spacer, single_document_multiple_tag_remove], menu_name='multi_item_links') -register_links([Document], [link_spacer, tag_multiple_attach, multiple_documents_selection_tag_remove], menu_name='multi_item_links') +register_links(['tags:document_tags'], [single_document_multiple_tag_remove, link_spacer], menu_name='multi_item_links') +register_links([Document], [tag_multiple_attach, multiple_documents_selection_tag_remove, link_spacer], menu_name='multi_item_links') diff --git a/mayan/apps/user_management/__init__.py b/mayan/apps/user_management/__init__.py index 6edf42c966..f79a2d29f9 100644 --- a/mayan/apps/user_management/__init__.py +++ b/mayan/apps/user_management/__init__.py @@ -15,11 +15,11 @@ from .links import (group_add, group_delete, group_edit, group_list, register_links(User, [user_edit, user_set_password, user_groups, user_delete]) register_links([User, 'user_management:user_multiple_set_password', 'user_management:user_multiple_delete', 'user_management:user_list', 'user_management:user_add'], [user_list, user_add], menu_name=u'secondary_menu') -register_links(['user_management:user_list'], [link_spacer, user_multiple_set_password, user_multiple_delete], menu_name='multi_item_links') +register_links(['user_management:user_list'], [user_multiple_set_password, user_multiple_delete, link_spacer], menu_name='multi_item_links') register_links(Group, [group_edit, group_members, group_delete]) register_links(['user_management:group_multiple_delete', 'user_management:group_delete', 'user_management:group_edit', 'user_management:group_list', 'user_management:group_add', 'user_management:group_members'], [group_list, group_add], menu_name=u'secondary_menu') -register_links(['user_management:group_list'], [link_spacer, group_multiple_delete], menu_name='multi_item_links') +register_links(['user_management:group_list'], [group_multiple_delete, link_spacer], menu_name='multi_item_links') register_setup(user_setup) register_setup(group_setup)