diff --git a/apps/acls/icons.py b/apps/acls/icons.py index c31d05e32b..795d0dd03e 100644 --- a/apps/acls/icons.py +++ b/apps/acls/icons.py @@ -1,6 +1,7 @@ from __future__ import absolute_import -from icons.literals import KEY, KEY_GO, KEY_ADD, KEY_DELETE, LOCK, USER +from icons.literals import (KEY, KEY_GO, KEY_ADD, KEY_DELETE, LOCK, USER, + PACKAGE, LOCK_GO) from icons import Icon icon_acls = Icon(KEY) @@ -9,3 +10,10 @@ icon_acl_grant = Icon(KEY_ADD) icon_acl_revoke = Icon(KEY_DELETE) icon_acl_holder_new = Icon(USER) icon_acl_app = Icon(LOCK) + +icon_acl_class_list = Icon(PACKAGE) +icon_acl_class_acl_list = Icon(LOCK_GO) +icon_acl_class_acl_detail = Icon(KEY_GO) +icon_acl_class_new_holder_for = Icon(USER) +icon_acl_class_grant = Icon(KEY_ADD) +icon_acl_class_revoke = Icon(KEY_DELETE) diff --git a/apps/acls/links.py b/apps/acls/links.py index 63fd6199ec..3ae2b41c43 100644 --- a/apps/acls/links.py +++ b/apps/acls/links.py @@ -6,7 +6,10 @@ from navigation import Link from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL, ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL) -from .icons import icon_acls, icon_acl_detail, icon_acl_grant, icon_acl_revoke, icon_acl_holder_new +from .icons import (icon_acls, icon_acl_detail, icon_acl_grant, icon_acl_revoke, + icon_acl_holder_new, icon_acl_class_list, icon_acl_class_acl_list, + icon_acl_class_acl_list, icon_acl_class_acl_detail, icon_acl_class_new_holder_for, + icon_acl_class_grant, icon_acl_class_revoke) acl_list = Link(text=_(u'ACLs'), view='acl_list', icon=icon_acls, permissions=[ACLS_VIEW_ACL]) acl_detail = Link(text=_(u'details'), view='acl_detail', args=['access_object.gid', 'object.gid'], icon=icon_acl_detail, permissions=[ACLS_VIEW_ACL]) @@ -15,9 +18,9 @@ acl_revoke = Link(text=_(u'revoke'), view='acl_multiple_revoke', icon=icon_acl_r acl_holder_new = Link(text=_(u'New holder'), view='acl_holder_new', args='access_object.gid', icon=icon_acl_holder_new, permissions=[ACLS_EDIT_ACL]) acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon=icon_acls, permissions=[ACLS_CLASS_VIEW_ACL]) # 'children_view_regex=[r'^acl_class', r'^acl_setup']} -acl_class_list = Link(text=_(u'List of classes'), view='acl_setup_valid_classes', sprite='package', permissions=[ACLS_CLASS_VIEW_ACL]) -acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', sprite='lock_go', permissions=[ACLS_CLASS_VIEW_ACL]) -acl_class_acl_detail = Link(text=_(u'details'), view='acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_CLASS_VIEW_ACL]) -acl_class_new_holder_for = Link(text=_(u'New holder'), view='acl_class_new_holder_for', args='object.gid', sprite='user', permissions=[ACLS_CLASS_EDIT_ACL]) -acl_class_grant = Link(text=_(u'grant'), view='acl_class_multiple_grant', sprite='key_add', permissions=[ACLS_CLASS_EDIT_ACL]) -acl_class_revoke = Link(text=_(u'revoke'), view='acl_class_multiple_revoke', sprite='key_delete', permissions=[ACLS_CLASS_EDIT_ACL]) +acl_class_list = Link(text=_(u'List of classes'), view='acl_setup_valid_classes', icon=icon_acl_class_list, permissions=[ACLS_CLASS_VIEW_ACL]) +acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', icon=icon_acl_class_acl_list, permissions=[ACLS_CLASS_VIEW_ACL]) +acl_class_acl_detail = Link(text=_(u'details'), view='acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'], icon=icon_acl_class_acl_detail, permissions=[ACLS_CLASS_VIEW_ACL]) +acl_class_new_holder_for = Link(text=_(u'New holder'), view='acl_class_new_holder_for', args='object.gid', icon=icon_acl_class_new_holder_for, permissions=[ACLS_CLASS_EDIT_ACL]) +acl_class_grant = Link(text=_(u'grant'), view='acl_class_multiple_grant', icon=icon_acl_class_grant, permissions=[ACLS_CLASS_EDIT_ACL]) +acl_class_revoke = Link(text=_(u'revoke'), view='acl_class_multiple_revoke', icon=icon_acl_class_revoke, permissions=[ACLS_CLASS_EDIT_ACL]) diff --git a/apps/app_registry/links.py b/apps/app_registry/links.py index 0bd6ff456e..c2ef3ed1dc 100644 --- a/apps/app_registry/links.py +++ b/apps/app_registry/links.py @@ -7,4 +7,4 @@ from navigation import Link from .icons import icon_app app_registry_tool_link = Link(text=_(u'Apps'), view='app_list', icon=icon_app)#, permissions=[PERMISSION_BACKUP_JOB_VIEW]) -app_list = Link(text=_(u'app list'), view='app_list', sprite=icon_app)#, permissions=[PERMISSION_BACKUP_JOB_VIEW]) +app_list = Link(text=_(u'app list'), view='app_list', icon=icon_app)#, permissions=[PERMISSION_BACKUP_JOB_VIEW]) diff --git a/apps/clustering/links.py b/apps/clustering/links.py index a1f69a9263..0c36ad59ec 100644 --- a/apps/clustering/links.py +++ b/apps/clustering/links.py @@ -9,5 +9,5 @@ from .icons import icon_tool_link, icon_node_link tool_link = Link(text=_(u'clustering'), view='node_list', icon=icon_tool_link, permissions=[PERMISSION_NODES_VIEW]) node_list = Link(text=_(u'node list'), view='node_list', icon=icon_node_link, permissions=[PERMISSION_NODES_VIEW]) -clustering_config_edit = Link(text=_(u'edit cluster configuration'), view='clustering_config_edit', sprite='server_edit', permissions=[PERMISSION_EDIT_CLUSTER_CONFIGURATION]) -setup_link = Link(text=_(u'cluster configuration'), view='clustering_config_edit', icon='server.png', permissions=[PERMISSION_EDIT_CLUSTER_CONFIGURATION]) +clustering_config_edit = Link(text=_(u'edit cluster configuration'), view='clustering_config_edit', permissions=[PERMISSION_EDIT_CLUSTER_CONFIGURATION]) +setup_link = Link(text=_(u'cluster configuration'), view='clustering_config_edit', permissions=[PERMISSION_EDIT_CLUSTER_CONFIGURATION]) diff --git a/apps/documents/icons.py b/apps/documents/icons.py index b5866a9592..284df2130b 100644 --- a/apps/documents/icons.py +++ b/apps/documents/icons.py @@ -2,7 +2,11 @@ from __future__ import absolute_import from icons.literals import (LAYOUT, MAGNIFIER, PAGE, PAGE_COPY, PAGE_GEAR, PAGE_DELETE, PAGE_EDIT, PAGE_REFRESH, PAGE_SAVE, PAGE_WHITE_COPY, PAGE_WORLD, PRINTER, - TABLE_RELATIONSHIP, PAGE_GO, PAGE_WHITE_CSHARP, CAMERA_DELETE) + TABLE_RELATIONSHIP, PAGE_GO, PAGE_WHITE_CSHARP, CAMERA_DELETE, PAGE_WHITE_PICTURE, + PAGE_WHITE_TEXT, PAGE_WHITE_EDIT, RESULTSET_NEXT, RESULTSET_PREVIOUS, + RESULTSET_FIRST, RESULTSET_LAST, ZOOM_IN, ZOOM_OUT, ARROW_TURN_RIGHT, + ARROW_TURN_LEFT, PAGE_WHITE, LAYOUT_EDIT, LAYOUT_ADD, LAYOUT_DELETE, + DATABASE, DATABASE_ADD, DATABASE_EDIT, DATABASE_DELETE, PAGE_FIND) from icons import Icon icon_documents = Icon(PAGE) @@ -21,3 +25,26 @@ icon_document_types = Icon(LAYOUT) icon_document_type_document_list = Icon(PAGE_GO) icon_document_update_page_count = Icon(PAGE_WHITE_CSHARP) icon_document_clear_image_cache = Icon(CAMERA_DELETE) +icon_document_missing_list = Icon(PAGE_FIND) + +icon_document_page_view = Icon(PAGE_WHITE_PICTURE) +icon_document_page_text = Icon(PAGE_WHITE_TEXT) +icon_document_page_edit = Icon(PAGE_WHITE_EDIT) +icon_document_page_navigation_next = Icon(RESULTSET_NEXT) +icon=icon_document_page_navigation_previous = Icon(RESULTSET_PREVIOUS) +icon_document_page_navigation_first = Icon(RESULTSET_FIRST) +icon_document_page_navigation_last = Icon(RESULTSET_LAST) +icon_document_page_zoom_in = Icon(ZOOM_IN) +icon_document_page_zoom_out = Icon(ZOOM_OUT) +icon_document_page_rotate_right = Icon(ARROW_TURN_RIGHT) +icon_document_page_rotate_left = Icon(ARROW_TURN_LEFT) +icon_document_page_view_reset = Icon(PAGE_WHITE) + +icon_document_type_edit = Icon(LAYOUT_EDIT) +icon_document_type_delete = Icon(LAYOUT_DELETE) +icon_document_type_create = Icon(LAYOUT_ADD) + +icon_document_type_filename_list = Icon(DATABASE) +icon_document_type_filename_create = Icon(DATABASE_ADD) +icon_document_type_filename_edit = Icon(DATABASE_EDIT) +icon_document_type_filename_delete = Icon(DATABASE_DELETE) diff --git a/apps/documents/links.py b/apps/documents/links.py index 90d45adcf5..8183b8dd2e 100644 --- a/apps/documents/links.py +++ b/apps/documents/links.py @@ -19,7 +19,17 @@ from .icons import (icon_documents, icon_create_siblings, icon_document_delete, icon_document_download, icon_find_duplicates, icon_print, icon_version_revert, icon_version_compare, icon_versions, icon_document_types, icon_document_type_document_list, icon_document_update_page_count, - icon_document_clear_image_cache) + icon_document_clear_image_cache, icon_document_page_view, + icon_document_page_text, icon_document_page_edit, + icon_document_page_navigation_next, icon_document_page_navigation_previous, + icon_document_page_navigation_first, icon_document_page_navigation_last, + icon_document_page_zoom_in, icon_document_page_zoom_out, + icon_document_page_rotate_right, icon_document_page_rotate_left, + icon_document_page_view_reset, icon_document_type_edit, + icon_document_type_delete, icon_document_type_create, + icon_document_type_filename_list, icon_document_type_filename_create, + icon_document_type_filename_edit, icon_document_type_filename_delete, + icon_document_missing_list) # Document page links expressions def is_first_page(context): @@ -59,33 +69,33 @@ document_version_download = Link(text=_(u'download'), view='document_version_dow document_find_duplicates = Link(text=_(u'find duplicates'), view='document_find_duplicates', args='object.id', icon=icon_find_duplicates, permissions=[PERMISSION_DOCUMENT_VIEW]) document_find_all_duplicates = Link(text=_(u'find all duplicates'), view='document_find_all_duplicates', icon=icon_find_duplicates, permissions=[PERMISSION_DOCUMENT_VIEW], description=_(u'Search all the documents\' checksums and return a list of the exact matches.')) document_update_page_count = Link(text=_(u'update office documents\' page count'), view='document_update_page_count', icon=icon_document_update_page_count, permissions=[PERMISSION_DOCUMENT_TOOLS], description=_(u'Update the page count of the office type documents. This is useful when enabling office document support after there were already office type documents in the database.')) -document_clear_transformations = Link(text=_(u'clear transformations'), view='document_clear_transformations', args='object.id', sprite='page_paintbrush', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) -document_multiple_clear_transformations = Link(text=_(u'clear transformations'), view='document_multiple_clear_transformations', sprite='page_paintbrush', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) +document_clear_transformations = Link(text=_(u'clear transformations'), view='document_clear_transformations', args='object.id', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) +document_multiple_clear_transformations = Link(text=_(u'clear transformations'), view='document_multiple_clear_transformations', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) document_print = Link(text=_(u'print'), view='document_print', args='object.id', icon=icon_print, permissions=[PERMISSION_DOCUMENT_VIEW]) document_history_view = Link(text=_(u'history'), view='history_for_object', args=['"documents"', '"document"', 'object.pk'], icon=icon_history_link, permissions=[PERMISSION_HISTORY_VIEW]) -document_missing_list = Link(text=_(u'Find missing document files'), view='document_missing_list', sprite='page_find', description=_(u'Return a list of documents found on the database but that don\'t physically exist in the document storage.'), permissions=[PERMISSION_DOCUMENT_VIEW]) +document_missing_list = Link(text=_(u'Find missing document files'), view='document_missing_list', icon=icon_document_missing_list, description=_(u'Return a list of documents found on the database but that don\'t physically exist in the document storage.'), permissions=[PERMISSION_DOCUMENT_VIEW]) # Tools document_clear_image_cache = Link(text=_(u'Clear the document image cache'), view='document_clear_image_cache', icon=icon_document_clear_image_cache, permissions=[PERMISSION_DOCUMENT_TOOLS], description=_(u'Clear the graphics representations used to speed up the documents\' display and interactive transformations results.')) # Document pages -document_page_transformation_list = Link(text=_(u'page transformations'), klass='no-parent-history', view='document_page_transformation_list', args='page.pk', sprite='pencil_go', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) -document_page_transformation_create = Link(text=_(u'create new transformation'), klass='no-parent-history', view='document_page_transformation_create', args='page.pk', sprite='pencil_add', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) -document_page_transformation_edit = Link(text=_(u'edit'), klass='no-parent-history', view='document_page_transformation_edit', args='transformation.pk', sprite='pencil_go', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) -document_page_transformation_delete = Link(text=_(u'delete'), klass='no-parent-history', view='document_page_transformation_delete', args='transformation.pk', sprite='pencil_delete', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) +document_page_transformation_list = Link(text=_(u'page transformations'), klass='no-parent-history', view='document_page_transformation_list', args='page.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) +document_page_transformation_create = Link(text=_(u'create new transformation'), klass='no-parent-history', view='document_page_transformation_create', args='page.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) +document_page_transformation_edit = Link(text=_(u'edit'), klass='no-parent-history', view='document_page_transformation_edit', args='transformation.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) +document_page_transformation_delete = Link(text=_(u'delete'), klass='no-parent-history', view='document_page_transformation_delete', args='transformation.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM]) -document_page_view = Link(text=_(u'page image'), klass='no-parent-history', view='document_page_view', args='page.pk', sprite='page_white_picture', permissions=[PERMISSION_DOCUMENT_VIEW]) -document_page_text = Link(text=_(u'page text'), klass='no-parent-history', view='document_page_text', args='page.pk', sprite='page_white_text', permissions=[PERMISSION_DOCUMENT_VIEW]) -document_page_edit = Link(text=_(u'edit page text'), klass='no-parent-history', view='document_page_edit', args='page.pk', sprite='page_white_edit', permissions=[PERMISSION_DOCUMENT_EDIT]) -document_page_navigation_next = Link(text=_(u'next page'), klass='no-parent-history', view='document_page_navigation_next', args='page.pk', sprite='resultset_next', permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_last_page) -document_page_navigation_previous = Link(text=_(u'previous page'), klass='no-parent-history', view='document_page_navigation_previous', args='page.pk', sprite='resultset_previous', permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_first_page) -document_page_navigation_first = Link(text=_(u'first page'), klass='no-parent-history', view='document_page_navigation_first', args='page.pk', sprite='resultset_first', permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_first_page) -document_page_navigation_last = Link(text=_(u'last page'), klass='no-parent-history', view='document_page_navigation_last', args='page.pk', sprite='resultset_last', permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_last_page) -document_page_zoom_in = Link(text=_(u'zoom in'), klass='no-parent-history', view='document_page_zoom_in', args='page.pk', sprite='zoom_in', permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_max_zoom) -document_page_zoom_out = Link(text=_(u'zoom out'), klass='no-parent-history', view='document_page_zoom_out', args='page.pk', sprite='zoom_out', permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_min_zoom) -document_page_rotate_right = Link(text=_(u'rotate right'), klass='no-parent-history', view='document_page_rotate_right', args='page.pk', sprite='arrow_turn_right', permissions=[PERMISSION_DOCUMENT_VIEW]) -document_page_rotate_left = Link(text=_(u'rotate left'), klass='no-parent-history', view='document_page_rotate_left', args='page.pk', sprite='arrow_turn_left', permissions=[PERMISSION_DOCUMENT_VIEW]) -document_page_view_reset = Link(text=_(u'reset view'), klass='no-parent-history', view='document_page_view_reset', args='page.pk', sprite='page_white', permissions=[PERMISSION_DOCUMENT_VIEW]) +document_page_view = Link(text=_(u'page image'), klass='no-parent-history', view='document_page_view', args='page.pk', icon=icon_document_page_view, permissions=[PERMISSION_DOCUMENT_VIEW]) +document_page_text = Link(text=_(u'page text'), klass='no-parent-history', view='document_page_text', args='page.pk', icon=icon_document_page_text, permissions=[PERMISSION_DOCUMENT_VIEW]) +document_page_edit = Link(text=_(u'edit page text'), klass='no-parent-history', view='document_page_edit', args='page.pk', icon=icon_document_page_edit, permissions=[PERMISSION_DOCUMENT_EDIT]) +document_page_navigation_next = Link(text=_(u'next page'), klass='no-parent-history', view='document_page_navigation_next', args='page.pk', icon=icon_document_page_navigation_next, permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_last_page) +document_page_navigation_previous = Link(text=_(u'previous page'), klass='no-parent-history', view='document_page_navigation_previous', args='page.pk', icon=icon_document_page_navigation_previous, permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_first_page) +document_page_navigation_first = Link(text=_(u'first page'), klass='no-parent-history', view='document_page_navigation_first', args='page.pk', icon=icon_document_page_navigation_first, permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_first_page) +document_page_navigation_last = Link(text=_(u'last page'), klass='no-parent-history', view='document_page_navigation_last', args='page.pk', icon=icon_document_page_navigation_last, permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_last_page) +document_page_zoom_in = Link(text=_(u'zoom in'), klass='no-parent-history', view='document_page_zoom_in', args='page.pk', icon=icon_document_page_zoom_in, permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_max_zoom) +document_page_zoom_out = Link(text=_(u'zoom out'), klass='no-parent-history', view='document_page_zoom_out', args='page.pk', icon=icon_document_page_zoom_out, permissions=[PERMISSION_DOCUMENT_VIEW], conditional_disable=is_min_zoom) +document_page_rotate_right = Link(text=_(u'rotate right'), klass='no-parent-history', view='document_page_rotate_right', args='page.pk', icon=icon_document_page_rotate_right, permissions=[PERMISSION_DOCUMENT_VIEW]) +document_page_rotate_left = Link(text=_(u'rotate left'), klass='no-parent-history', view='document_page_rotate_left', args='page.pk', icon=icon_document_page_rotate_left, permissions=[PERMISSION_DOCUMENT_VIEW]) +document_page_view_reset = Link(text=_(u'reset view'), klass='no-parent-history', view='document_page_view_reset', args='page.pk', icon=icon_document_page_view_reset, permissions=[PERMISSION_DOCUMENT_VIEW]) # Document versions document_version_list = Link(text=_(u'versions'), view='document_version_list', args='object.pk', icon=icon_versions, permissions=[PERMISSION_DOCUMENT_VIEW]) @@ -95,16 +105,16 @@ document_version_text_compare = Link(text=_(u'compare (text)'), view='document_v icon_document_type_document_list # Document type related links document_type_list = Link(text=_(u'document type list'), view='document_type_list', icon=icon_document_types, permissions=[PERMISSION_DOCUMENT_TYPE_VIEW]) -document_type_setup = Link(text=_(u'document types'), view='document_type_list', sprite='layout', icon=icon_document_types, permissions=[PERMISSION_DOCUMENT_TYPE_VIEW], children_view_regex=[r'^document_type_']) +document_type_setup = Link(text=_(u'document types'), view='document_type_list', icon=icon_document_types, permissions=[PERMISSION_DOCUMENT_TYPE_VIEW], children_view_regex=[r'^document_type_']) document_type_document_list = Link(text=_(u'documents of this type'), view='document_type_document_list', args='document_type.id', icon=icon_document_type_document_list, permissions=[PERMISSION_DOCUMENT_TYPE_VIEW]) -document_type_edit = Link(text=_(u'edit'), view='document_type_edit', args='document_type.id', sprite='layout_edit', permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) -document_type_delete = Link(text=_(u'delete'), view='document_type_delete', args='document_type.id', sprite='layout_delete', permissions=[PERMISSION_DOCUMENT_TYPE_DELETE]) -document_type_create = Link(text=_(u'create document type'), view='document_type_create', sprite='layout_add', permissions=[PERMISSION_DOCUMENT_TYPE_CREATE]) +document_type_edit = Link(text=_(u'edit'), view='document_type_edit', args='document_type.id', icon=icon_document_type_edit, permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) +document_type_delete = Link(text=_(u'delete'), view='document_type_delete', args='document_type.id', icon=icon_document_type_delete, permissions=[PERMISSION_DOCUMENT_TYPE_DELETE]) +document_type_create = Link(text=_(u'create document type'), view='document_type_create', icon=icon_document_type_create, permissions=[PERMISSION_DOCUMENT_TYPE_CREATE]) -document_type_filename_list = Link(text=_(u'filenames'), view='document_type_filename_list', args='document_type.id', sprite='database', permissions=[PERMISSION_DOCUMENT_TYPE_VIEW]) -document_type_filename_create = Link(text=_(u'add filename to document type'), view='document_type_filename_create', args='document_type.id', sprite='database_add', permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) -document_type_filename_edit = Link(text=_(u'edit'), view='document_type_filename_edit', args='filename.id', sprite='database_edit', permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) -document_type_filename_delete = Link(text=_(u'delete'), view='document_type_filename_delete', args='filename.id', sprite='database_delete', permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) +document_type_filename_list = Link(text=_(u'filenames'), view='document_type_filename_list', args='document_type.id', icon=icon_document_type_filename_list, permissions=[PERMISSION_DOCUMENT_TYPE_VIEW]) +document_type_filename_create = Link(text=_(u'add filename to document type'), view='document_type_filename_create', args='document_type.id', icon=icon_document_type_filename_create, permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) +document_type_filename_edit = Link(text=_(u'edit'), view='document_type_filename_edit', args='filename.id', icon=icon_document_type_filename_edit, permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) +document_type_filename_delete = Link(text=_(u'delete'), view='document_type_filename_delete', args='filename.id', icon=icon_document_type_filename_delete, permissions=[PERMISSION_DOCUMENT_TYPE_EDIT]) # TODO: remove this document_type_views = ['setup_document_type_metadata', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete', 'document_type_create', 'document_type_filename_list', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_delete'] diff --git a/apps/dynamic_search/__init__.py b/apps/dynamic_search/__init__.py index 508ea775a3..566a4af6b2 100644 --- a/apps/dynamic_search/__init__.py +++ b/apps/dynamic_search/__init__.py @@ -11,7 +11,7 @@ from documents.models import Document from signaler.signals import post_update_index, pre_update_index from .models import IndexableObject -from .links import search, search_advanced, search_again +from .links import search#, search_advanced, search_again logger = logging.getLogger(__name__) @@ -27,7 +27,7 @@ def scheduler_shutdown_pre_update_index(sender, mayan_runtime, **kwargs): bind_links(['search', 'search_advanced', 'results'], [search], menu_name='form_header') -bind_links(['results'], [search_again], menu_name='sidebar') +#bind_links(['results'], [search_again], menu_name='sidebar') register_sidebar_template(['search'], 'search_help.html') register_sidebar_template(['search'], 'recent_searches.html') diff --git a/apps/dynamic_search/links.py b/apps/dynamic_search/links.py index 407769a460..ce51857cfa 100644 --- a/apps/dynamic_search/links.py +++ b/apps/dynamic_search/links.py @@ -8,5 +8,5 @@ from .icons import icon_search menu_link = Link(text=_(u'search'), view='search', icon=icon_search, children_url_regex=[r'^search/']) search = Link(text=_(u'search'), view='search', icon=icon_search) -search_advanced = Link(text=_(u'advanced search'), view='search_advanced', sprite='zoom_in') -search_again = Link(text=_(u'search again'), view='search_again', sprite='arrow_undo') +#search_advanced = Link(text=_(u'advanced search'), view='search_advanced', sprite='zoom_in') +#search_again = Link(text=_(u'search again'), view='search_again', sprite='arrow_undo') diff --git a/apps/icons/iconsets/fat_cow.py b/apps/icons/iconsets/fat_cow.py index cf368e6d0e..3b20247d2d 100644 --- a/apps/icons/iconsets/fat_cow.py +++ b/apps/icons/iconsets/fat_cow.py @@ -11,6 +11,8 @@ class IconSet(IconSetBase): dictionary={ ADD: 'add.png', APPLICATION_VIEW_ICONS: 'application_view_icons.png', + ARROW_TURN_RIGHT: 'arrow_turn_right.png', + ARROW_TURN_LEFT: 'arrow_turn_left.png', BIN_CLOSED: 'bin_closed.png', BIN: 'bin.png', BIN_EMPTY: 'bin_empty.png', @@ -29,6 +31,10 @@ class IconSet(IconSetBase): COMMENT_DELETE: 'comment_delete.png', COMPUTER_KEY: 'computer_key.png', CROSS: 'cross.png', + DATABASE: 'database.png', + DATABASE_ADD: 'database_add.png', + DATABASE_EDIT: 'database_edit.png', + DATABASE_DELETE: 'database_delete.png', DELETE: 'delete.png', DRAW_AIRBRUSH: 'draw_airbrush.png', DOCUMENT_SIGNATURE: 'document_signature.png', @@ -54,6 +60,9 @@ class IconSet(IconSetBase): KEY_DELETE: 'key_delete.png', KEYBOARD: 'keyboard.png', LAYOUT: 'layout.png', + LAYOUT_ADD: 'layout_add.png', + LAYOUT_DELETE: 'layout_delete.png', + LAYOUT_EDIT: 'layout_edit.png', LIGHTNING: 'lightning.png', LINK: 'link.png', LINK_ADD: 'link_add.png', @@ -61,27 +70,38 @@ class IconSet(IconSetBase): LINK_DELETE: 'link_delete.png', LOCK: 'lock.png', LOCK_EDIT: 'lock_edit.png', + LOCK_GO: 'lock_go.png', MAGNIFIER: 'magnifier.png', MEDAL_GOLD: 'medal_gold_1.png', MEDAL_GOLD_ADD: 'medal_gold_add.png', MEDAL_GOLD_DELETE: 'medal_gold_delete.png', + PACKAGE: 'package.png', PAGE: 'page.png', PAGE_COPY: 'page_copy.png', PAGE_GEAR:'page_gear.png', PAGE_GO: 'page_go.png', PAGE_DELETE: 'page_delete.png', PAGE_EDIT: 'page_edit.png', + PAGE_FIND: 'page_find.png', PAGE_LINK: 'page_link.png', PAGE_REFRESH: 'page_refresh.png', PAGE_SAVE: 'page_save.png', + PAGE_WHITE: 'page_white.png', PAGE_WHITE_COPY: 'page_white_copy.png', PAGE_WHITE_CSHARP: 'page_white_csharp.png', + PAGE_WHITE_EDIT: 'page_white_edit.png', + PAGE_WHITE_PICTURE: 'page_white_picture.png', + PAGE_WHITE_TEXT: 'page_white_text.png', PAGE_WORLD: 'page_world.png', PICTURES: 'pictures.png', PILL: 'pill.png', PLUGIN: 'plugin.png', PRINTER: 'printer.png', RAINBOW: 'rainbow.png', + RESULTSET_FIRST: 'resultset_first.png', + RESULTSET_LAST: 'resultset_last.png', + RESULTSET_NEXT: 'resultset_next.png', + RESULTSET_PREVIOUS: 'resultset_previous.png', ROUTING_TURNAROUND_RIGHT: 'routing_turnaround_right.png', SCRIPT: 'script.png', SERVER: 'server.png', @@ -114,4 +134,6 @@ class IconSet(IconSetBase): XHTML_ADD: 'xhtml_add.png', XHTML_DELETE: 'xhtml_delete.png', ZOOM: 'zoom.png', + ZOOM_IN: 'zoom_in.png', + ZOOM_OUT: 'zoom_out.png', } diff --git a/apps/icons/literals.py b/apps/icons/literals.py index 7518aab915..7c78c5f02a 100644 --- a/apps/icons/literals.py +++ b/apps/icons/literals.py @@ -5,6 +5,8 @@ DEFAULT_ICON_SET = 'fat_cow' ADD = 'add' APPLICATION_VIEW_ICONS = 'application_view_icons' +ARROW_TURN_RIGHT = 'arrow_turn_right' +ARROW_TURN_LEFT = 'arrow_turn_left' BIN_CLOSED = 'bin_closed' BIN = 'bin' BIN_EMPTY = 'bin_empty' @@ -23,6 +25,10 @@ COMMENT_ADD = 'comment_add' COMMENT_DELETE = 'comment_delete' COMPUTER_KEY = 'computer_key' CROSS = 'cross' +DATABASE = 'database' +DATABASE_ADD = 'database_add' +DATABASE_EDIT = 'database_edit' +DATABASE_DELETE = 'database_delete' DELETE = 'delete' DRAW_AIRBRUSH = 'draw_airbrush' DOCUMENT_SIGNATURE = 'document_signature' @@ -50,6 +56,9 @@ KEY_ADD = 'key_add' KEY_DELETE = 'key_delete' KEYBOARD = 'keyboard' LAYOUT = 'layout' +LAYOUT_ADD = 'layout_add' +LAYOUT_DELETE = 'layout_delete' +LAYOUT_EDIT = 'layout_edit' LIGHTNING = 'lightning' LINK = 'link' LINK_ADD = 'link_add' @@ -57,27 +66,38 @@ LINK_EDIT = 'link_edit' LINK_DELETE = 'link_delete' LOCK = 'lock' LOCK_EDIT = 'lock_edit' +LOCK_GO = 'lock_go' MAGNIFIER = 'magnifier' MEDAL_GOLD = 'medal_gold' MEDAL_GOLD_ADD = 'medal_gold_add' MEDAL_GOLD_DELETE = 'medal_gold_delete' +PACKAGE = 'package' PAGE = 'page' PAGE_COPY = 'page_copy' PAGE_DELETE = 'page_delete' PAGE_EDIT = 'page_edit' +PAGE_FIND = 'page_find' PAGE_GEAR = 'page_gear' PAGE_GO = 'page_go' PAGE_LINK = 'page_link' PAGE_REFRESH = 'page_refresh' PAGE_SAVE = 'page_save' +PAGE_WHITE = 'page_white' PAGE_WHITE_COPY = 'page_white_copy' PAGE_WHITE_CSHARP = 'page_white_csharp' +PAGE_WHITE_EDIT = 'page_white_edit' +PAGE_WHITE_PICTURE = 'page_white_picture' +PAGE_WHITE_TEXT = 'page_white_text' PAGE_WORLD = 'page_world' PICTURES = 'pictures' PILL = 'pill' PLUGIN = 'plugin' PRINTER = 'printer' RAINBOW = 'rainbow' +RESULTSET_FIRST = 'resultset_first' +RESULTSET_LAST = 'resultset_last' +RESULTSET_NEXT = 'resultset_next' +RESULTSET_PREVIOUS = 'resultset_previous' ROUTING_TURNAROUND_RIGHT = 'routing_turnaround_right' SCRIPT = 'script' SERVER = 'server' @@ -110,3 +130,5 @@ XHTML_GO = 'xhtml_go' XHTML_ADD = 'xhtml_add' XHTML_DELETE = 'xhtml_delete' ZOOM = 'zoom' +ZOOM_IN = 'zoom_in' +ZOOM_OUT = 'zoom_out' diff --git a/apps/metadata/links.py b/apps/metadata/links.py index 8ea4710e46..1ee124094a 100644 --- a/apps/metadata/links.py +++ b/apps/metadata/links.py @@ -30,7 +30,7 @@ setup_metadata_type_edit = Link(text=_(u'edit'), view='setup_metadata_type_edit' setup_metadata_type_delete = Link(text=_(u'delete'), view='setup_metadata_type_delete', args='object.pk', icon=icon_metadata_remove, permissions=[PERMISSION_METADATA_TYPE_DELETE]) setup_metadata_type_create = Link(text=_(u'create new'), view='setup_metadata_type_create', icon=icon_metadata_add, permissions=[PERMISSION_METADATA_TYPE_CREATE]) -setup_metadata_set_list = Link(text=_(u'metadata sets'), view='setup_metadata_set_list', sprite='table', icon=icon_metadata_sets, permissions=[PERMISSION_METADATA_SET_VIEW]) # children_view_regex=[r'setup_metadata_set']) +setup_metadata_set_list = Link(text=_(u'metadata sets'), view='setup_metadata_set_list', icon=icon_metadata_sets, permissions=[PERMISSION_METADATA_SET_VIEW]) # children_view_regex=[r'setup_metadata_set']) setup_metadata_set_edit = Link(text=_(u'edit'), view='setup_metadata_set_edit', args='object.pk', icon=icon_metadata_set_edit, permissions=[PERMISSION_METADATA_SET_EDIT]) setup_metadata_set_delete = Link(text=_(u'delete'), view='setup_metadata_set_delete', args='object.pk', icon=icon_metadata_set_delete, permissions=[PERMISSION_METADATA_SET_DELETE]) setup_metadata_set_create = Link(text=_(u'create new'), view='setup_metadata_set_create', icon=icon_metadata_set_create, permissions=[PERMISSION_METADATA_SET_CREATE]) diff --git a/apps/navigation/classes.py b/apps/navigation/classes.py index f577af4116..772d46757e 100644 --- a/apps/navigation/classes.py +++ b/apps/navigation/classes.py @@ -23,8 +23,8 @@ class ResolvedLink(object): class Link(object): - def __init__(self, text, view, klass=None, args=None, sprite=None, - icon=None, permissions=None, condition=None, conditional_disable=None, + def __init__(self, text, view, klass=None, args=None, icon=None, + permissions=None, condition=None, conditional_disable=None, description=None, dont_mark_active=False, children_view_regex=None, keep_query=False, children_classes=None, children_url_regex=None, children_views=None, conditional_highlight=None): @@ -33,7 +33,6 @@ class Link(object): self.view = view self.args = args or {} #self.kwargs = kwargs or {} - self.sprite = sprite self.icon = icon self.permissions = permissions or [] self.condition = condition @@ -72,7 +71,6 @@ class Link(object): if self.condition_result: resolved_link = ResolvedLink() resolved_link.text = self.text - resolved_link.sprite = self.sprite resolved_link.icon = self.icon resolved_link.permissions = self.permissions resolved_link.condition_result = self.condition_result