diff --git a/HISTORY.rst b/HISTORY.rst index 8958e3a09f..94c476b6f4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -11,6 +11,9 @@ - Deselect the update checkbox for optional metadata by default. - Silence all Django 1.8 model import warnings. - Implement per document type document creation permission. Closes GitLab issue #232. +- Add icons to the document face menu links. +- Increase icon size by 10%. +- Increase icon to text spacing to 3px. 2.0.2 (2016-02-09) ================== diff --git a/mayan/apps/appearance/static/appearance/css/base.css b/mayan/apps/appearance/static/appearance/css/base.css index 75bc2456fd..d3b7a596bb 100644 --- a/mayan/apps/appearance/static/appearance/css/base.css +++ b/mayan/apps/appearance/static/appearance/css/base.css @@ -134,3 +134,15 @@ hr { .radio ul li { list-style-type:none; } + +a i { + padding-right: 3px; +} + +.fa { + font-size: 110%; +} + +.fa-2x { + font-size: 200%; +} diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py index db4cd628ae..23dfa6c805 100644 --- a/mayan/apps/checkouts/links.py +++ b/mayan/apps/checkouts/links.py @@ -42,7 +42,7 @@ link_checkin_document = Link( args='object.pk' ) link_checkout_info = Link( - permissions=( + icon='fa fa-shopping-cart', permissions=( permission_document_checkin, permission_document_checkin_override, permission_document_checkout ), text=_('Check in/out'), view='checkouts:checkout_info', args='object.pk' diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py index ed93ed017c..bf53b39a56 100644 --- a/mayan/apps/document_comments/links.py +++ b/mayan/apps/document_comments/links.py @@ -18,6 +18,6 @@ link_comment_delete = Link( text=_('Delete'), view='comments:comment_delete', args='object.pk' ) link_comments_for_document = Link( - permissions=(permission_comment_view,), text=_('Comments'), - view='comments:comments_for_document', args='object.pk' + icon='fa fa-comment', permissions=(permission_comment_view,), + text=_('Comments'), view='comments:comments_for_document', args='object.pk' ) diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py index 3c70b22705..d5b622393f 100644 --- a/mayan/apps/document_indexing/links.py +++ b/mayan/apps/document_indexing/links.py @@ -18,8 +18,8 @@ def is_not_root_node(context): link_document_index_list = Link( - permissions=(permission_document_view,), text=_('Indexes'), - view='indexing:document_index_list', args='object.pk' + icon='fa fa-list-ul', permissions=(permission_document_view,), + text=_('Indexes'), view='indexing:document_index_list', args='object.pk' ) link_index_list = Link( permissions=(permission_document_indexing_view,), text=_('Index list'), diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py index 3a2436ca1e..955d7eb266 100644 --- a/mayan/apps/document_signatures/links.py +++ b/mayan/apps/document_signatures/links.py @@ -50,6 +50,6 @@ link_document_signature_upload = Link( view='signatures:document_signature_upload', args='object.pk' ) link_document_verify = Link( - permissions=(permission_document_verify,), text=_('Signatures'), - view='signatures:document_verify', args='object.pk' + icon='fa fa-certificate', permissions=(permission_document_verify,), + text=_('Signatures'), view='signatures:document_verify', args='object.pk' ) diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py index 534c24f800..be928ac56d 100644 --- a/mayan/apps/document_states/links.py +++ b/mayan/apps/document_states/links.py @@ -11,7 +11,8 @@ from .permissions import ( ) link_document_workflow_instance_list = Link( - permissions=(permission_workflow_view,), text=_('Workflows'), + icon='fa fa-sitemap', permissions=(permission_workflow_view,), + text=_('Workflows'), view='document_states:document_workflow_instance_list', args='object.pk' ) link_setup_workflow_create = Link( diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index c206e302f0..a46aa8caf7 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -39,20 +39,22 @@ def is_min_zoom(context): # Facet link_document_preview = Link( - permissions=(permission_document_view,), text=_('Preview'), - view='documents:document_preview', args='object.id' + icon='fa fa-eye', permissions=(permission_document_view,), + text=_('Preview'), view='documents:document_preview', args='object.id' ) link_document_properties = Link( - permissions=(permission_document_view,), text=_('Properties'), - view='documents:document_properties', args='object.id' + icon='fa fa-info', permissions=(permission_document_view,), + text=_('Properties'), view='documents:document_properties', + args='object.id' ) link_document_version_list = Link( - permissions=(permission_document_view,), text=_('Versions'), - view='documents:document_version_list', args='object.pk' + icon='fa fa-code-fork', permissions=(permission_document_view,), + text=_('Versions'), view='documents:document_version_list', + args='object.pk' ) link_document_pages = Link( - permissions=(permission_document_view,), text=_('Pages'), - view='documents:document_pages', args='resolved_object.pk' + icon='fa fa-files-o', permissions=(permission_document_view,), + text=_('Pages'), view='documents:document_pages', args='resolved_object.pk' ) # Actions diff --git a/mayan/apps/events/links.py b/mayan/apps/events/links.py index 93ad5dcbab..d85e733b0b 100644 --- a/mayan/apps/events/links.py +++ b/mayan/apps/events/links.py @@ -27,7 +27,7 @@ link_events_list = Link( text=_('Events'), view='events:events_list' ) link_events_for_object = Link( - permissions=(permission_events_view,), text=_('Events'), - view='events:events_for_object', + icon='fa fa-list-ol', permissions=(permission_events_view,), + text=_('Events'), view='events:events_for_object', kwargs=get_kwargs_factory('resolved_object') ) diff --git a/mayan/apps/folders/links.py b/mayan/apps/folders/links.py index d6bd5bee82..ab8a3f95f6 100644 --- a/mayan/apps/folders/links.py +++ b/mayan/apps/folders/links.py @@ -12,8 +12,8 @@ from .permissions import ( ) link_document_folder_list = Link( - permissions=(permission_document_view,), text=_('Folders'), - view='folders:document_folder_list', args='object.pk' + icon='fa fa-folder', permissions=(permission_document_view,), + text=_('Folders'), view='folders:document_folder_list', args='object.pk' ) link_folder_add_document = Link( permissions=(permission_folder_add_document,), text=_('Add to a folder'), diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py index 1c4807c8c7..2071f6b151 100644 --- a/mayan/apps/linking/links.py +++ b/mayan/apps/linking/links.py @@ -50,8 +50,9 @@ link_smart_link_instance_view = Link( ) ) link_smart_link_instances_for_document = Link( - permissions=(permission_document_view,), text=_('Smart links'), - view='linking:smart_link_instances_for_document', args='object.pk' + icon='fa fa-link', permissions=(permission_document_view,), + text=_('Smart links'), view='linking:smart_link_instances_for_document', + args='object.pk' ) link_smart_link_list = Link( permissions=(permission_smart_link_create,), text=_('Smart links'), diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py index 3606df9fa4..39412bbfcb 100644 --- a/mayan/apps/metadata/links.py +++ b/mayan/apps/metadata/links.py @@ -35,8 +35,8 @@ link_metadata_remove = Link( args='object.pk' ) link_metadata_view = Link( - permissions=(permission_metadata_document_view,), text=_('Metadata'), - view='metadata:metadata_view', args='object.pk' + icon='fa fa-pencil', permissions=(permission_metadata_document_view,), + text=_('Metadata'), view='metadata:metadata_view', args='object.pk' ) link_setup_document_type_metadata = Link( permissions=(permission_document_type_edit,), text=_('Optional metadata'), diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py index 85b3abcdab..bc4a935d81 100644 --- a/mayan/apps/ocr/links.py +++ b/mayan/apps/ocr/links.py @@ -10,8 +10,8 @@ from .permissions import ( ) link_document_content = Link( - permissions=(permission_ocr_content_view,), text=_('OCR'), - view='ocr:document_content', args='resolved_object.id' + icon='fa fa-font', permissions=(permission_ocr_content_view,), + text=_('OCR'), view='ocr:document_content', args='resolved_object.id' ) link_document_submit = Link( permissions=(permission_ocr_document,), text=_('Submit for OCR'), diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py index cd59a9df13..8627cca4d3 100644 --- a/mayan/apps/tags/links.py +++ b/mayan/apps/tags/links.py @@ -37,7 +37,7 @@ link_tag_edit = Link( args='object.id' ) link_tag_document_list = Link( - permissions=(permission_tag_view,), text=_('Tags'), + icon='fa fa-tag', permissions=(permission_tag_view,), text=_('Tags'), view='tags:document_tags', args='object.pk' ) link_tag_list = Link(icon='fa fa-tag', text=_('Tags'), view='tags:tag_list')