diff --git a/mayan/apps/cabinets/icons.py b/mayan/apps/cabinets/icons.py index bdcf84e25c..34e2b7160b 100644 --- a/mayan/apps/cabinets/icons.py +++ b/mayan/apps/cabinets/icons.py @@ -3,5 +3,6 @@ from __future__ import absolute_import, unicode_literals from appearance.classes import Icon icon_cabinet = Icon(driver_name='fontawesome', symbol='columns') +icon_cabinet_add = Icon(driver_name='fontawesome', symbol='plus') icon_cabinet_create = Icon(driver_name='fontawesome', symbol='plus') icon_cabinet_list = Icon(driver_name='fontawesome', symbol='columns') diff --git a/mayan/apps/cabinets/links.py b/mayan/apps/cabinets/links.py index f08e3ef3c8..ba5cfa6694 100644 --- a/mayan/apps/cabinets/links.py +++ b/mayan/apps/cabinets/links.py @@ -8,7 +8,7 @@ from acls.links import link_acl_list from documents.permissions import permission_document_view from navigation import Link, get_cascade_condition -from .icons import icon_cabinet_create, icon_cabinet_list +from .icons import icon_cabinet_add, icon_cabinet_create, icon_cabinet_list from .permissions import ( permission_cabinet_add_document, permission_cabinet_create, permission_cabinet_delete, permission_cabinet_edit, @@ -28,8 +28,9 @@ link_document_cabinet_remove = Link( text=_('Remove from cabinets'), view='cabinets:document_cabinet_remove' ) link_cabinet_add_document = Link( - args='object.pk', permissions=(permission_cabinet_add_document,), - text=_('Add to cabinets'), view='cabinets:cabinet_add_document', + args='object.pk', icon_class=icon_cabinet_add, + permissions=(permission_cabinet_add_document,), text=_('Add to cabinets'), + view='cabinets:cabinet_add_document', ) link_cabinet_add_multiple_documents = Link( text=_('Add to cabinets'), view='cabinets:cabinet_add_multiple_documents' diff --git a/mayan/apps/document_comments/icons.py b/mayan/apps/document_comments/icons.py index 74ef3c6388..c0c4fbdc6e 100644 --- a/mayan/apps/document_comments/icons.py +++ b/mayan/apps/document_comments/icons.py @@ -3,3 +3,4 @@ from __future__ import absolute_import, unicode_literals from appearance.classes import Icon icon_comments_for_document = Icon(driver_name='fontawesome', symbol='comment') +icon_comment_add = Icon(driver_name='fontawesome', symbol='plus') diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py index 38cc86a296..5cf30707ba 100644 --- a/mayan/apps/document_comments/links.py +++ b/mayan/apps/document_comments/links.py @@ -4,15 +4,16 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link -from .icons import icon_comments_for_document +from .icons import icon_comment_add, icon_comments_for_document from .permissions import ( permission_comment_create, permission_comment_delete, permission_comment_view ) link_comment_add = Link( - args='object.pk', permissions=(permission_comment_create,), - text=_('Add comment'), view='comments:comment_add', + args='object.pk', icon_class=icon_comment_add, + permissions=(permission_comment_create,), text=_('Add comment'), + view='comments:comment_add', ) link_comment_delete = Link( args='object.pk', permissions=(permission_comment_delete,), diff --git a/mayan/apps/metadata/icons.py b/mayan/apps/metadata/icons.py index 653b9ea401..a561ae09fb 100644 --- a/mayan/apps/metadata/icons.py +++ b/mayan/apps/metadata/icons.py @@ -2,13 +2,13 @@ from __future__ import absolute_import, unicode_literals from appearance.classes import Icon -icon_document_metadata_add_submit = Icon( +icon_document_metadata_add = Icon( driver_name='fontawesome', symbol='plus' ) -icon_document_metadata_edit_submit = Icon( +icon_document_metadata_edit = Icon( driver_name='fontawesome', symbol='pencil-alt' ) -icon_document_metadata_remove_submit = Icon( +icon_document_metadata_remove = Icon( driver_name='fontawesome', symbol='minus' ) icon_metadata = Icon(driver_name='fontawesome', symbol='pencil-alt') diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py index 88f717287c..5e38e3082c 100644 --- a/mayan/apps/metadata/links.py +++ b/mayan/apps/metadata/links.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from documents.permissions import permission_document_type_edit from navigation import Link -from .icons import icon_metadata_view +from .icons import icon_document_metadata_add, icon_metadata_view from .permissions import ( permission_metadata_document_add, permission_metadata_document_edit, permission_metadata_document_remove, permission_metadata_document_view, @@ -14,8 +14,9 @@ from .permissions import ( ) link_metadata_add = Link( - args='object.pk', permissions=(permission_metadata_document_add,), - text=_('Add metadata'), view='metadata:metadata_add', + args='object.pk', icon_class=icon_document_metadata_add, + permissions=(permission_metadata_document_add,), text=_('Add metadata'), + view='metadata:metadata_add', ) link_metadata_edit = Link( args='object.pk', permissions=(permission_metadata_document_edit,), diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 465999d530..f3f46aa10c 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -28,8 +28,8 @@ from .forms import ( DocumentTypeMetadataTypeRelationshipFormSet, MetadataTypeForm ) from .icons import ( - icon_document_metadata_add_submit, icon_document_metadata_edit_submit, - icon_document_metadata_remove_submit, icon_metadata + icon_document_metadata_add, icon_document_metadata_edit, + icon_document_metadata_remove, icon_metadata ) from .links import ( link_metadata_add, link_metadata_multiple_add, @@ -103,7 +103,7 @@ class DocumentMetadataAddView(MultipleObjectFormActionView): queryset = self.get_queryset() result = { - 'submit_icon_class': icon_document_metadata_add_submit, + 'submit_icon_class': icon_document_metadata_add, 'submit_label': _('Add'), 'title': ungettext( 'Add metadata types to document', @@ -297,7 +297,7 @@ class DocumentMetadataEditView(MultipleObjectFormActionView): 'and assign them corresponding values.' ), 'no_results_title': _('There is no metadata to edit'), - 'submit_icon_class': icon_document_metadata_edit_submit, + 'submit_icon_class': icon_document_metadata_edit, 'submit_label': _('Edit'), 'title': ungettext( 'Edit document metadata', @@ -486,7 +486,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView): result = { 'form_display_mode_table': True, - 'submit_icon_class': icon_document_metadata_remove_submit, + 'submit_icon_class': icon_document_metadata_remove, 'submit_label': _('Remove'), 'title': ungettext( 'Remove metadata types from the document', diff --git a/mayan/apps/tags/icons.py b/mayan/apps/tags/icons.py index ae83c6feb7..600f49be8c 100644 --- a/mayan/apps/tags/icons.py +++ b/mayan/apps/tags/icons.py @@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals from appearance.classes import Icon icon_menu_tags = Icon(driver_name='fontawesome', symbol='tag') +icon_tag_attach = Icon(driver_name='fontawesome', symbol='plus') icon_tag_create = Icon(driver_name='fontawesome', symbol='plus') icon_tag_delete_submit = Icon(driver_name='fontawesome', symbol='times') icon_tag_document_list = Icon(driver_name='fontawesome', symbol='tag') diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py index ded8547702..4571c60586 100644 --- a/mayan/apps/tags/links.py +++ b/mayan/apps/tags/links.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link, get_cascade_condition from .icons import ( - icon_tag_create, icon_tag_document_list, icon_tag_list + icon_tag_attach, icon_tag_create, icon_tag_document_list, icon_tag_list ) from .permissions import ( permission_tag_attach, permission_tag_create, permission_tag_delete, @@ -24,8 +24,9 @@ link_single_document_multiple_tag_remove = Link( text=_('Remove tags'), view='tags:single_document_multiple_tag_remove', ) link_tag_attach = Link( - args='object.pk', permissions=(permission_tag_attach,), - text=_('Attach tags'), view='tags:tag_attach', + args='object.pk', icon_class=icon_tag_attach, + permissions=(permission_tag_attach,), text=_('Attach tags'), + view='tags:tag_attach', ) link_tag_create = Link( icon_class=icon_tag_create, permissions=(permission_tag_create,),