From 8f0ad91d96e6874fdd3164be0796818e53a83f36 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 28 Jun 2018 16:47:34 -0400 Subject: [PATCH] Update the tags app to use the Icon class. Signed-off-by: Roberto Rosario --- mayan/apps/tags/icons.py | 7 +++++++ mayan/apps/tags/links.py | 32 +++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 mayan/apps/tags/icons.py diff --git a/mayan/apps/tags/icons.py b/mayan/apps/tags/icons.py new file mode 100644 index 0000000000..c7da5ece0c --- /dev/null +++ b/mayan/apps/tags/icons.py @@ -0,0 +1,7 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_tag_create = Icon(driver_name='fontawesome', symbol='plus') +icon_tag_document_list = Icon(driver_name='fontawesome', symbol='tag') +icon_tag_list = Icon(driver_name='fontawesome', symbol='tag') diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py index 2b2d0561ff..7c1e621880 100644 --- a/mayan/apps/tags/links.py +++ b/mayan/apps/tags/links.py @@ -4,6 +4,9 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import ( + icon_tag_create, icon_tag_document_list, icon_tag_list +) from .permissions import ( permission_tag_attach, permission_tag_create, permission_tag_delete, permission_tag_edit, permission_tag_remove, permission_tag_view @@ -17,34 +20,37 @@ link_multiple_documents_attach_tag = Link( text=_('Attach tags'), view='tags:multiple_documents_tag_attach' ) link_single_document_multiple_tag_remove = Link( - permissions=(permission_tag_remove,), text=_('Remove tags'), - view='tags:single_document_multiple_tag_remove', args='object.id' + args='object.id', permissions=(permission_tag_remove,), + text=_('Remove tags'), view='tags:single_document_multiple_tag_remove', ) link_tag_attach = Link( - permissions=(permission_tag_attach,), text=_('Attach tags'), - view='tags:tag_attach', args='object.pk' + args='object.pk', permissions=(permission_tag_attach,), + text=_('Attach tags'), view='tags:tag_attach', ) link_tag_create = Link( - icon='fa fa-plus', permissions=(permission_tag_create,), + icon_class=icon_tag_create, permissions=(permission_tag_create,), text=_('Create new tag'), view='tags:tag_create' ) link_tag_delete = Link( - permissions=(permission_tag_delete,), tags='dangerous', text=_('Delete'), - view='tags:tag_delete', args='object.id' + args='object.id', permissions=(permission_tag_delete,), tags='dangerous', + text=_('Delete'), view='tags:tag_delete', ) link_tag_edit = Link( - permissions=(permission_tag_edit,), text=_('Edit'), view='tags:tag_edit', - args='object.id' + args='object.id', permissions=(permission_tag_edit,), text=_('Edit'), + view='tags:tag_edit', ) link_tag_document_list = Link( - icon='fa fa-tag', permissions=(permission_tag_view,), text=_('Tags'), - view='tags:document_tags', args='resolved_object.pk' + args='resolved_object.pk', icon_class=icon_tag_document_list, + permissions=(permission_tag_view,), text=_('Tags'), + view='tags:document_tags', +) +link_tag_list = Link( + icon_class=icon_tag_list, text=_('All'), view='tags:tag_list' ) -link_tag_list = Link(icon='fa fa-tag', text=_('All'), view='tags:tag_list') link_tag_multiple_delete = Link( permissions=(permission_tag_delete,), text=_('Delete'), view='tags:tag_multiple_delete' ) link_tag_tagged_item_list = Link( - text=('Documents'), view='tags:tag_tagged_item_list', args='object.id' + args='object.id', text=('Documents'), view='tags:tag_tagged_item_list', )