Update the common, django_gpg, document_comments, document_indexing, document_parsing, document_signatures, document_states, event, linking, mailer, permissions, rest_api, smart_settings, sources and task manager apps to use the new Icon class.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

mayan/apps/common/icons.py

@@ -4,4 +4,34 @@ from appearance.classes import Icon
 
 icon_about = Icon(driver_name='fontawesome', symbol='info')
 icon_check_version = Icon(driver_name='fontawesome', symbol='sync')
+icon_code = Icon(driver_name='fontawesome', symbol='code-branch')
 icon_current_user_details = Icon(driver_name='fontawesome', symbol='user')
+icon_current_user_edit = Icon(driver_name='fontawesome', symbol='user')
+icon_current_user_locale_profile_details = Icon(
+    driver_name='fontawesome', symbol='globe'
+)
+icon_current_user_locale_profile_edit = Icon(
+    driver_name='fontawesome', symbol='globe'
+)
+icon_documentation = Icon(driver_name='fontawesome', symbol='book')
+icon_forum = Icon(
+    driver_name='fontawesome', symbol='life-ring'
+)
+icon_license = Icon(
+    driver_name='fontawesome', symbol='certificate'
+)
+icon_object_error_list_with_icon = Icon(
+    driver_name='fontawesome', symbol='lock'
+)
+icon_packages_licenses = Icon(
+    driver_name='fontawesome', symbol='certificate'
+)
+icon_setup = Icon(
+    driver_name='fontawesome', symbol='cog'
+)
+icon_support = Icon(
+    driver_name='fontawesome', symbol='phone'
+)
+icon_tools =  Icon(
+    driver_name='fontawesome', symbol='wrench'
+)

mayan/apps/common/links.py

@@ -6,7 +6,11 @@ from django.utils.translation import ugettext_lazy as _
 from navigation import Link
 
 from .icons import (
-    icon_about, icon_check_version, icon_current_user_details
+    icon_about, icon_check_version, icon_code, icon_current_user_details,
+    icon_current_user_edit, icon_current_user_locale_profile_details,
+    icon_current_user_locale_profile_edit, icon_documentation,
+    icon_forum, icon_license, icon_object_error_list_with_icon,
+    icon_packages_licenses, icon_setup, icon_support, icon_tools
 )
 from .permissions_runtime import permission_error_log_view
 
@@ -41,23 +45,26 @@ link_current_user_details = Link(
     view='common:current_user_details'
 )
 link_current_user_edit = Link(
-    icon='fa fa-user', text=_('Edit details'), view='common:current_user_edit'
+    icon_class=icon_current_user_edit, text=_('Edit details'),
+    view='common:current_user_edit'
 )
 link_current_user_locale_profile_details = Link(
-    icon='fa fa-globe', text=_('Locale profile'),
+    icon_class=icon_current_user_locale_profile_details,
+    text=_('Locale profile'),
     view='common:current_user_locale_profile_details'
 )
 link_current_user_locale_profile_edit = Link(
-    icon='fa fa-globe', text=_('Edit locale profile'),
+    icon_class=icon_current_user_locale_profile_edit,
+    text=_('Edit locale profile'),
     view='common:current_user_locale_profile_edit'
 )
 link_code = Link(
-    icon='fa fa-code-branch', tags='new_window', text=_('Source code'),
+    icon_class=icon_code, tags='new_window', text=_('Source code'),
     url='https://gitlab.com/mayan-edms/mayan-edms'
 )
 link_documentation = Link(
-    icon='fa fa-book', tags='new_window', text=_('Documentation'),
+    icon_class=icon_documentation, tags='new_window',
-    url='https://mayan.readthedocs.io/en/stable/'
+    text=_('Documentation'), url='https://mayan.readthedocs.io/en/stable/'
 )
 link_object_error_list = Link(
     kwargs=get_kwargs_factory('resolved_object'),
@@ -70,28 +77,29 @@ link_object_error_list_clear = Link(
     view='common:object_error_list_clear',
 )
 link_object_error_list_with_icon = Link(
-    kwargs=get_kwargs_factory('resolved_object'), icon='fa fa-lock',
+    kwargs=get_kwargs_factory('resolved_object'),
+    icon_class=icon_object_error_list_with_icon,
     permissions=(permission_error_log_view,), text=_('Errors'),
     view='common:error_list',
 )
 link_forum = Link(
-    icon='fa fa-life-ring', tags='new_window', text=_('Forum'),
+    icon_class=icon_forum, tags='new_window', text=_('Forum'),
     url='https://groups.google.com/forum/#!forum/mayan-edms'
 )
 link_license = Link(
-    icon='fa fa-certificate', text=_('License'), view='common:license_view'
+    icon_class=icon_license, text=_('License'), view='common:license_view'
 )
 link_packages_licenses = Link(
-    icon='fa fa-certificate', text=_('Other packages licenses'),
+    icon_class=icon_packages_licenses, text=_('Other packages licenses'),
     view='common:packages_licenses_view'
 )
 link_setup = Link(
-    icon='fa fa-cog', text=_('Setup'), view='common:setup_list'
+    icon_class=icon_setup, text=_('Setup'), view='common:setup_list'
 )
 link_support = Link(
-    icon='fa fa-phone', tags='new_window', text=_('Support'),
+    icon_class=icon_support, tags='new_window', text=_('Support'),
     url='http://www.mayan-edms.com/providers/'
 )
 link_tools = Link(
-    icon='fa fa-wrench', text=_('Tools'), view='common:tools_list'
+    icon_class=icon_tools, text=_('Tools'), view='common:tools_list'
 )

mayan/apps/django_gpg/icons.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_key_setup = Icon(driver_name='fontawesome', symbol='key')

mayan/apps/django_gpg/links.py

@@ -4,33 +4,35 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import icon_key_setup
 from .permissions import (
     permission_key_delete, permission_key_download, permission_key_receive,
     permission_key_view, permission_key_upload, permission_keyserver_query
 )
 
 link_key_delete = Link(
-    permissions=(permission_key_delete,), tags='dangerous', text=_('Delete'),
+    args=('resolved_object.pk',), permissions=(permission_key_delete,),
-    view='django_gpg:key_delete', args=('resolved_object.pk',)
+    tags='dangerous', text=_('Delete'), view='django_gpg:key_delete',
 )
 link_key_detail = Link(
-    permissions=(permission_key_view,), text=_('Details'),
+    args=('resolved_object.pk',), permissions=(permission_key_view,),
-    view='django_gpg:key_detail', args=('resolved_object.pk',)
+    text=_('Details'), view='django_gpg:key_detail',
 )
 link_key_download = Link(
-    permissions=(permission_key_download,), text=_('Download'),
+    args=('resolved_object.pk',), permissions=(permission_key_download,),
-    view='django_gpg:key_download', args=('resolved_object.pk',)
+    text=_('Download'), view='django_gpg:key_download',
 )
 link_key_query = Link(
     permissions=(permission_keyserver_query,), text=_('Query keyservers'),
     view='django_gpg:key_query'
 )
 link_key_receive = Link(
-    keep_query=True, permissions=(permission_key_receive,), text=_('Import'),
+    args='object.key_id', keep_query=True,
-    view='django_gpg:key_receive', args='object.key_id'
+    permissions=(permission_key_receive,), text=_('Import'),
+    view='django_gpg:key_receive',
 )
 link_key_setup = Link(
-    icon='fa fa-key', permissions=(permission_key_view,),
+    icon_class=icon_key_setup, permissions=(permission_key_view,),
     text=_('Key management'), view='django_gpg:key_public_list'
 )
 link_key_upload = Link(

mayan/apps/document_comments/icons.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_comments_for_document = Icon(driver_name='fontawesome', symbol='comment')

mayan/apps/document_comments/links.py

@@ -4,21 +4,22 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import icon_comments_for_document
 from .permissions import (
     permission_comment_create, permission_comment_delete,
     permission_comment_view
 )
 
 link_comment_add = Link(
-    permissions=(permission_comment_create,), text=_('Add comment'),
+    args='object.pk', permissions=(permission_comment_create,),
-    view='comments:comment_add', args='object.pk'
+    text=_('Add comment'), view='comments:comment_add',
 )
 link_comment_delete = Link(
-    permissions=(permission_comment_delete,), tags='dangerous',
+    args='object.pk', permissions=(permission_comment_delete,),
-    text=_('Delete'), view='comments:comment_delete', args='object.pk'
+    tags='dangerous', text=_('Delete'), view='comments:comment_delete',
 )
 link_comments_for_document = Link(
-    icon='fa fa-comment', permissions=(permission_comment_view,),
+    args='resolved_object.pk', icon_class=icon_comments_for_document,
-    text=_('Comments'), view='comments:comments_for_document',
+    permissions=(permission_comment_view,), text=_('Comments'),
-    args='resolved_object.pk'
+    view='comments:comments_for_document',
 )

mayan/apps/document_indexing/icons.py

@@ -0,0 +1,10 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_document_index_list = Icon(driver_name='fontawesome', symbol='list-ul')
+icon_index_main_menu = Icon(driver_name='fontawesome', symbol='list-ul')
+icon_index_setup = Icon(driver_name='fontawesome', symbol='list-ul')
+icon_rebuild_index_instances = Icon(
+    driver_name='fontawesome', symbol='list-ul'
+)

mayan/apps/document_indexing/links.py

@@ -4,6 +4,10 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import (
+    icon_document_index_list, icon_index_main_menu, icon_index_setup,
+    icon_rebuild_index_instances
+)
 from .permissions import (
     permission_document_indexing_create, permission_document_indexing_edit,
     permission_document_indexing_delete, permission_document_indexing_rebuild,
@@ -15,14 +19,16 @@ def is_not_root_node(context):
 
 
 link_document_index_list = Link(
-    icon='fa fa-list-ul', text=_('Indexes'),
+    args='resolved_object.pk', icon_class=icon_document_index_list,
-    view='indexing:document_index_list', args='resolved_object.pk'
+    text=_('Indexes'), view='indexing:document_index_list',
 )
 link_index_main_menu = Link(
-    icon='fa fa-list-ul', text=_('Indexes'), view='indexing:index_list'
+    icon_class=icon_index_main_menu, text=_('Indexes'),
+    view='indexing:index_list'
 )
 link_index_setup = Link(
-    icon='fa fa-list-ul', text=_('Indexes'), view='indexing:index_setup_list'
+    icon_class=icon_index_setup, text=_('Indexes'),
+    view='indexing:index_setup_list'
 )
 link_index_setup_list = Link(
     text=_('Indexes'), view='indexing:index_setup_list'
@@ -32,24 +38,27 @@ link_index_setup_create = Link(
     view='indexing:index_setup_create'
 )
 link_index_setup_edit = Link(
+    args='resolved_object.pk',
     permissions=(permission_document_indexing_edit,), text=_('Edit'),
-    view='indexing:index_setup_edit', args='resolved_object.pk'
+    view='indexing:index_setup_edit',
 )
 link_index_setup_delete = Link(
+    args='resolved_object.pk',
     permissions=(permission_document_indexing_delete,), tags='dangerous',
     text=_('Delete'), view='indexing:index_setup_delete',
-    args='resolved_object.pk'
 )
 link_index_setup_view = Link(
+    args='resolved_object.pk',
     permissions=(permission_document_indexing_edit,), text=_('Tree template'),
-    view='indexing:index_setup_view', args='resolved_object.pk'
+    view='indexing:index_setup_view',
 )
 link_index_setup_document_types = Link(
+    args='resolved_object.pk',
     permissions=(permission_document_indexing_edit,), text=_('Document types'),
-    view='indexing:index_setup_document_types', args='resolved_object.pk'
+    view='indexing:index_setup_document_types',
 )
 link_rebuild_index_instances = Link(
-    icon='fa fa-list-ul',
+    icon_class=icon_rebuild_index_instances,
     description=_(
         'Deletes and creates from scratch all the document indexes.'
     ),
@@ -57,14 +66,14 @@ link_rebuild_index_instances = Link(
     text=_('Rebuild indexes'), view='indexing:rebuild_index_instances'
 )
 link_template_node_create = Link(
-    text=_('New child node'), view='indexing:template_node_create',
+    args='resolved_object.pk', text=_('New child node'),
-    args='resolved_object.pk'
+    view='indexing:template_node_create',
 )
 link_template_node_edit = Link(
-    condition=is_not_root_node, text=_('Edit'),
+    args='resolved_object.pk', condition=is_not_root_node, text=_('Edit'),
-    view='indexing:template_node_edit', args='resolved_object.pk'
+    view='indexing:template_node_edit',
 )
 link_template_node_delete = Link(
-    condition=is_not_root_node, tags='dangerous', text=_('Delete'),
+    args='resolved_object.pk', condition=is_not_root_node, tags='dangerous',
-    view='indexing:template_node_delete', args='resolved_object.pk'
+    text=_('Delete'), view='indexing:template_node_delete',
 )

mayan/apps/document_parsing/icons.py

@@ -0,0 +1,17 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_document_content = Icon(driver_name='fontawesome', symbol='font')
+icon_document_parsing_errors_list = Icon(
+    driver_name='fontawesome', symbol='file-alt'
+)
+icon_document_content_download = Icon(
+    driver_name='fontawesome', symbol='file-alt'
+)
+icon_document_type_submit = Icon(
+    driver_name='fontawesome', symbol='crosshairs'
+)
+icon_link_error_list = Icon(
+    driver_name='fontawesome', symbol='file-alt'
+)

mayan/apps/document_parsing/links.py

@@ -4,23 +4,28 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import (
+    icon_document_content, icon_document_parsing_errors_list,
+    icon_document_content_download, icon_document_type_submit,
+    icon_link_error_list
+)
 from .permissions import (
     permission_content_view, permission_document_type_parsing_setup,
     permission_parse_document
 )
 
 link_document_content = Link(
-    args='resolved_object.id', icon='fa fa-font',
+    args='resolved_object.id', icon_class=icon_document_content,
     permissions=(permission_content_view,), text=_('Content'),
     view='document_parsing:document_content',
 )
 link_document_parsing_errors_list = Link(
-    args='resolved_object.id', icon='fa fa-file-alt',
+    args='resolved_object.id', icon_class=icon_document_parsing_errors_list,
     permissions=(permission_content_view,), text=_('Parsing errors'),
     view='document_parsing:document_parsing_error_list'
 )
 link_document_content_download = Link(
-    args='resolved_object.id', icon='fa fa-file-alt',
+    args='resolved_object.id', icon_class=icon_document_content_download,
     permissions=(permission_content_view,), text=_('Download content'),
     view='document_parsing:document_content_download'
 )
@@ -33,14 +38,16 @@ link_document_submit = Link(
     text=_('Submit for parsing'), view='document_parsing:document_submit'
 )
 link_document_type_parsing_settings = Link(
-    args='resolved_object.id', permissions=(permission_document_type_parsing_setup,),
+    args='resolved_object.id',
-    text=_('Setup parsing'), view='document_parsing:document_type_parsing_settings',
+    permissions=(permission_document_type_parsing_setup,),
+    text=_('Setup parsing'),
+    view='document_parsing:document_type_parsing_settings',
 )
 link_document_type_submit = Link(
-    icon='fa fa-crosshairs', text=_('Parse documents per type'),
+    icon_class=icon_document_type_submit, text=_('Parse documents per type'),
     view='document_parsing:document_type_submit'
 )
 link_error_list = Link(
-    icon='fa fa-file-alt', permissions=(permission_content_view,),
+    icon_class=icon_link_error_list, permissions=(permission_content_view,),
     text=_('Parsing errors'), view='document_parsing:error_list'
 )

mayan/apps/document_signatures/icons.py

@@ -0,0 +1,13 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_all_document_version_signature_verify = Icon(
+    driver_name='fontawesome', symbol='certificate'
+)
+icon_document_signature_list = Icon(
+    driver_name='fontawesome', symbol='certificate'
+)
+icon_document_version_signature_list = Icon(
+    driver_name='fontawesome', symbol='certificate'
+)

mayan/apps/document_signatures/links.py

@@ -5,6 +5,10 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import (
+    icon_all_document_version_signature_verify, icon_document_signature_list,
+    icon_document_version_signature_list
+)
 from .permissions import (
     permission_document_version_sign_detached,
     permission_document_version_sign_embedded,
@@ -27,17 +31,16 @@ def is_detached_signature(context):
 
 
 link_all_document_version_signature_verify = Link(
-    icon='fa fa-certificate',
+    icon_class=icon_all_document_version_signature_verify,
     permissions=(permission_document_version_signature_verify,),
     text=_('Verify all documents'),
     view='signatures:all_document_version_signature_verify',
 )
 link_document_signature_list = Link(
     args='resolved_object.latest_version.pk',
-    icon='fa fa-certificate',
+    icon_class=icon_document_signature_list,
     permissions=(permission_document_version_signature_view,),
-    text=_('Signatures'),
+    text=_('Signatures'), view='signatures:document_version_signature_list',
-    view='signatures:document_version_signature_list',
 )
 link_document_version_signature_delete = Link(
     args='resolved_object.pk', condition=is_detached_signature,
@@ -52,7 +55,8 @@ link_document_version_signature_details = Link(
     view='signatures:document_version_signature_details',
 )
 link_document_version_signature_list = Link(
-    args='resolved_object.pk', icon='fa fa-certificate',
+    args='resolved_object.pk',
+    icon_class=icon_document_version_signature_list,
     permissions=(permission_document_version_signature_view,),
     permissions_related='document', text=_('Signatures'),
     view='signatures:document_version_signature_list',

mayan/apps/document_states/icons.py

@@ -0,0 +1,14 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_document_workflow_instance_list = Icon(
+    driver_name='fontawesome', symbol='sitemap'
+)
+icon_setup_workflow_list = Icon(driver_name='fontawesome', symbol='sitemap')
+icon_tool_launch_all_workflows = Icon(
+    driver_name='fontawesome', symbol='sitemap'
+)
+icon_workflow_list = Icon(
+    driver_name='fontawesome', symbol='sitemap'
+)

mayan/apps/document_states/links.py

@@ -4,6 +4,10 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import (
+    icon_document_workflow_instance_list, icon_setup_workflow_list,
+    icon_tool_launch_all_workflows, icon_workflow_list
+)
 from .permissions import (
     permission_workflow_create, permission_workflow_delete,
     permission_workflow_edit, permission_workflow_tools,
@@ -11,32 +15,32 @@ from .permissions import (
 )
 
 link_document_workflow_instance_list = Link(
-    icon='fa fa-sitemap', permissions=(permission_workflow_view,),
+    args='resolved_object.pk', icon_class=icon_document_workflow_instance_list,
-    text=_('Workflows'),
+    permissions=(permission_workflow_view,), text=_('Workflows'),
     view='document_states:document_workflow_instance_list',
-    args='resolved_object.pk'
 )
 link_setup_workflow_create = Link(
     permissions=(permission_workflow_create,), text=_('Create workflow'),
     view='document_states:setup_workflow_create'
 )
 link_setup_workflow_delete = Link(
-    permissions=(permission_workflow_delete,), tags='dangerous',
+    args='resolved_object.pk', permissions=(permission_workflow_delete,),
-    text=_('Delete'), view='document_states:setup_workflow_delete',
+    tags='dangerous', text=_('Delete'),
-    args='resolved_object.pk'
+    view='document_states:setup_workflow_delete',
 )
 link_setup_workflow_document_types = Link(
+    args='resolved_object.pk',
     permissions=(permission_workflow_edit,), text=_('Document types'),
     view='document_states:setup_workflow_document_types',
-    args='resolved_object.pk'
 )
 link_setup_workflow_edit = Link(
-    permissions=(permission_workflow_edit,), text=_('Edit'),
+    args='resolved_object.pk', permissions=(permission_workflow_edit,),
-    view='document_states:setup_workflow_edit', args='resolved_object.pk'
+    text=_('Edit'), view='document_states:setup_workflow_edit',
 )
 link_setup_workflow_list = Link(
-    permissions=(permission_workflow_view,), icon='fa fa-sitemap',
+    icon_class=icon_setup_workflow_list,
-    text=_('Workflows'), view='document_states:setup_workflow_list'
+    permissions=(permission_workflow_view,), text=_('Workflows'),
+    view='document_states:setup_workflow_list'
 )
 link_setup_workflow_state_action_delete = Link(
     args='resolved_object.pk', permissions=(permission_workflow_edit,),
@@ -58,78 +62,73 @@ link_setup_workflow_state_action_selection = Link(
     view='document_states:setup_workflow_state_action_selection',
 )
 link_setup_workflow_state_create = Link(
-    permissions=(permission_workflow_edit,), text=_('Create state'),
+    args='resolved_object.pk', permissions=(permission_workflow_edit,),
+    text=_('Create state'),
     view='document_states:setup_workflow_state_create',
-    args='resolved_object.pk'
 )
 link_setup_workflow_state_delete = Link(
-    permissions=(permission_workflow_edit,), tags='dangerous',
+    args='object.pk', permissions=(permission_workflow_edit,),
-    text=_('Delete'), view='document_states:setup_workflow_state_delete',
+    tags='dangerous', text=_('Delete'),
-    args='object.pk'
+    view='document_states:setup_workflow_state_delete',
 )
 link_setup_workflow_state_edit = Link(
-    permissions=(permission_workflow_edit,), text=_('Edit'),
+    args='resolved_object.pk', permissions=(permission_workflow_edit,),
-    view='document_states:setup_workflow_state_edit',
+    text=_('Edit'), view='document_states:setup_workflow_state_edit',
-    args='resolved_object.pk'
 )
 link_setup_workflow_states = Link(
-    permissions=(permission_workflow_view,), text=_('States'),
+    args='resolved_object.pk', permissions=(permission_workflow_view,),
-    view='document_states:setup_workflow_state_list',
+    text=_('States'), view='document_states:setup_workflow_state_list',
-    args='resolved_object.pk'
 )
 link_setup_workflow_transition_create = Link(
-    permissions=(permission_workflow_edit,), text=_('Create transition'),
+    args='resolved_object.pk', permissions=(permission_workflow_edit,),
+    text=_('Create transition'),
     view='document_states:setup_workflow_transition_create',
-    args='resolved_object.pk'
 )
 link_setup_workflow_transition_delete = Link(
-    permissions=(permission_workflow_edit,), tags='dangerous',
+    args='resolved_object.pk', permissions=(permission_workflow_edit,),
-    text=_('Delete'), view='document_states:setup_workflow_transition_delete',
+    tags='dangerous', text=_('Delete'),
-    args='resolved_object.pk'
+    view='document_states:setup_workflow_transition_delete',
 )
 link_setup_workflow_transition_edit = Link(
-    permissions=(permission_workflow_edit,), text=_('Edit'),
+    args='resolved_object.pk', permissions=(permission_workflow_edit,),
-    view='document_states:setup_workflow_transition_edit',
+    text=_('Edit'), view='document_states:setup_workflow_transition_edit',
-    args='resolved_object.pk'
 )
 link_setup_workflow_transitions = Link(
-    permissions=(permission_workflow_view,), text=_('Transitions'),
+    args='resolved_object.pk', permissions=(permission_workflow_view,),
+    text=_('Transitions'),
     view='document_states:setup_workflow_transition_list',
-    args='resolved_object.pk'
 )
 link_tool_launch_all_workflows = Link(
-    icon='fa fa-sitemap',
+    icon_class=icon_tool_launch_all_workflows,
     permissions=(permission_workflow_tools,),
     text=_('Launch all workflows'),
     view='document_states:tool_launch_all_workflows'
 )
 link_workflow_instance_detail = Link(
-    permissions=(permission_workflow_view,), text=_('Detail'),
+    args='resolved_object.pk', permissions=(permission_workflow_view,),
-    view='document_states:workflow_instance_detail', args='resolved_object.pk'
+    text=_('Detail'), view='document_states:workflow_instance_detail',
 )
 link_workflow_instance_transition = Link(
-    text=_('Transition'),
+    args='resolved_object.pk', text=_('Transition'),
     view='document_states:workflow_instance_transition',
-    args='resolved_object.pk'
 )
 link_workflow_document_list = Link(
-    permissions=(permission_workflow_view,), text=_('Workflow documents'),
+    args='resolved_object.pk', permissions=(permission_workflow_view,),
-    view='document_states:workflow_document_list', args='resolved_object.pk'
+    text=_('Workflow documents'),
+    view='document_states:workflow_document_list',
 )
 link_workflow_list = Link(
-    permissions=(permission_workflow_view,), icon='fa fa-sitemap',
+    icon_class=icon_workflow_list, permissions=(permission_workflow_view,),
     text=_('Workflows'), view='document_states:workflow_list'
 )
 link_workflow_state_document_list = Link(
-    permissions=(permission_workflow_view,),
+    args='resolved_object.pk', permissions=(permission_workflow_view,),
     text=_('State documents'),
     view='document_states:workflow_state_document_list',
-    args='resolved_object.pk'
 )
 link_workflow_state_list = Link(
-    permissions=(permission_workflow_view,),
+    args='resolved_object.pk', permissions=(permission_workflow_view,),
     text=_('States'), view='document_states:workflow_state_list',
-    args='resolved_object.pk'
 )
 link_workflow_instance_transition_events = Link(
     args='resolved_object.pk', permissions=(permission_workflow_edit,),

mayan/apps/events/icons.py

@@ -0,0 +1,15 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_events_list = Icon(driver_name='fontawesome', symbol='list-ol')
+icon_events_for_object = Icon(driver_name='fontawesome', symbol='list-ol')
+icon_event_types_subscriptions_list = Icon(
+    driver_name='fontawesome', symbol='list-ol'
+)
+icon_object_event_types_user_subcriptions_list_with_icon = Icon(
+    driver_name='fontawesome', symbol='rss'
+)
+icon_user_notifications_list = Icon(
+    driver_name='fontawesome', symbol='bell'
+)

mayan/apps/events/links.py

@@ -5,6 +5,12 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import (
+    icon_events_list, icon_events_for_object,
+    icon_event_types_subscriptions_list,
+    icon_object_event_types_user_subcriptions_list_with_icon,
+    icon_user_notifications_list
+)
 from .permissions import permission_events_view
 
 
@@ -31,19 +37,21 @@ def get_notification_count(context):
 
 
 link_events_list = Link(
-    icon='fa fa-list-ol', permissions=(permission_events_view,),
+    icon_class=icon_events_list, permissions=(permission_events_view,),
     text=_('Events'), view='events:events_list'
 )
 link_events_details = Link(
     text=_('Events'), view='events:events_list'
 )
 link_events_for_object = Link(
-    icon='fa fa-list-ol', permissions=(permission_events_view,),
+    icon_class=icon_events_for_object,
-    text=_('Events'), view='events:events_for_object',
+    kwargs=get_kwargs_factory('resolved_object'),
-    kwargs=get_kwargs_factory('resolved_object')
+    permissions=(permission_events_view,), text=_('Events'),
+    view='events:events_for_object',
 )
 link_event_types_subscriptions_list = Link(
-    icon='fa fa-list-ol', text=_('Event subscriptions'),
+    icon_class=icon_event_types_subscriptions_list,
+    text=_('Event subscriptions'),
     view='events:event_types_user_subcriptions_list'
 )
 link_notification_mark_read = Link(
@@ -59,7 +67,8 @@ link_object_event_types_user_subcriptions_list = Link(
     view='events:object_event_types_user_subcriptions_list',
 )
 link_object_event_types_user_subcriptions_list_with_icon = Link(
-    kwargs=get_kwargs_factory('resolved_object'), icon='fa fa-rss',
+    icon_class=icon_object_event_types_user_subcriptions_list_with_icon,
+    kwargs=get_kwargs_factory('resolved_object'),
     permissions=(permission_events_view,), text=_('Subscriptions'),
     view='events:object_event_types_user_subcriptions_list',
 )
@@ -72,5 +81,6 @@ link_user_notifications_list = Link(
         'apw-attribute': 'count', 'apw-interval': '5000',
         'apw-url': '/api/notifications/?read=False',
         'apw-callback': 'App.mayanNotificationBadge'
-    }, icon='fa fa-bell', text='', view='events:user_notifications_list'
+    }, icon_class=icon_user_notifications_list, text='',
+    view='events:user_notifications_list'
 )

mayan/apps/linking/icons.py

@@ -0,0 +1,8 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_smart_link_instances_for_document = Icon(
+    driver_name='fontawesome', symbol='link'
+)
+icon_smart_link_setup = Icon(driver_name='fontawesome', symbol='link')

mayan/apps/linking/links.py

@@ -5,60 +5,64 @@ from django.utils.translation import ugettext_lazy as _
 from documents.permissions import permission_document_view
 from navigation import Link
 
+from .icons import (
+    icon_smart_link_instances_for_document, icon_smart_link_setup
+)
 from .permissions import (
     permission_smart_link_create, permission_smart_link_delete,
     permission_smart_link_edit, permission_smart_link_view
 )
 
 link_smart_link_condition_create = Link(
-    permissions=(permission_smart_link_edit,), text=_('Create condition'),
+    args='object.pk', permissions=(permission_smart_link_edit,),
-    view='linking:smart_link_condition_create', args='object.pk'
+    text=_('Create condition'), view='linking:smart_link_condition_create',
 )
 link_smart_link_condition_delete = Link(
-    permissions=(permission_smart_link_edit,), tags='dangerous',
+    args='resolved_object.pk', permissions=(permission_smart_link_edit,),
-    text=_('Delete'), view='linking:smart_link_condition_delete',
+    tags='dangerous', text=_('Delete'),
-    args='resolved_object.pk'
+    view='linking:smart_link_condition_delete',
 )
 link_smart_link_condition_edit = Link(
-    permissions=(permission_smart_link_edit,), text=_('Edit'),
+    args='resolved_object.pk', permissions=(permission_smart_link_edit,),
-    view='linking:smart_link_condition_edit', args='resolved_object.pk'
+    text=_('Edit'), view='linking:smart_link_condition_edit',
 )
 link_smart_link_condition_list = Link(
-    permissions=(permission_smart_link_edit,), text=_('Conditions'),
+    args='object.pk', permissions=(permission_smart_link_edit,),
-    view='linking:smart_link_condition_list', args='object.pk'
+    text=_('Conditions'), view='linking:smart_link_condition_list',
 )
 link_smart_link_create = Link(
     permissions=(permission_smart_link_create,),
     text=_('Create new smart link'), view='linking:smart_link_create'
 )
 link_smart_link_delete = Link(
-    permissions=(permission_smart_link_delete,), tags='dangerous',
+    args='object.pk', permissions=(permission_smart_link_delete,),
-    text=_('Delete'), view='linking:smart_link_delete', args='object.pk'
+    tags='dangerous', text=_('Delete'), view='linking:smart_link_delete',
 )
 link_smart_link_document_types = Link(
-    permissions=(permission_smart_link_edit,), text=_('Document types'),
+    args='object.pk', permissions=(permission_smart_link_edit,),
-    view='linking:smart_link_document_types', args='object.pk'
+    text=_('Document types'), view='linking:smart_link_document_types',
 )
 link_smart_link_edit = Link(
-    permissions=(permission_smart_link_edit,), text=_('Edit'),
+    args='object.pk', permissions=(permission_smart_link_edit,),
-    view='linking:smart_link_edit', args='object.pk'
+    text=_('Edit'), view='linking:smart_link_edit',
 )
 link_smart_link_instance_view = Link(
+    args=('document.pk', 'object.pk',),
     permissions=(permission_smart_link_view,), text=_('Documents'),
-    view='linking:smart_link_instance_view', args=(
+    view='linking:smart_link_instance_view',
-        'document.pk', 'object.pk',
-    )
 )
 link_smart_link_instances_for_document = Link(
-    icon='fa fa-link', permissions=(permission_document_view,),
+    args='resolved_object.pk',
-    text=_('Smart links'), view='linking:smart_link_instances_for_document',
+    icon_class=icon_smart_link_instances_for_document,
-    args='resolved_object.pk'
+    permissions=(permission_document_view,), text=_('Smart links'),
+    view='linking:smart_link_instances_for_document',
 )
 link_smart_link_list = Link(
     permissions=(permission_smart_link_create,), text=_('Smart links'),
     view='linking:smart_link_list'
 )
 link_smart_link_setup = Link(
-    icon='fa fa-link', permissions=(permission_smart_link_create,),
+    icon_class=icon_smart_link_setup,
-    text=_('Smart links'), view='linking:smart_link_list'
+    permissions=(permission_smart_link_create,), text=_('Smart links'),
+    view='linking:smart_link_list'
 )

mayan/apps/mailer/icons.py

@@ -0,0 +1,10 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_system_mailer_error_log = Icon(
+    driver_name='fontawesome', symbol='envelope'
+)
+icon_user_mailer_create = Icon(driver_name='fontawesome', symbol='envelope')
+icon_user_mailer_list = Icon(driver_name='fontawesome', symbol='envelope')
+icon_user_mailer_setup = Icon(driver_name='fontawesome', symbol='envelope')

mayan/apps/mailer/links.py

@@ -4,6 +4,10 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import (
+    icon_system_mailer_error_log, icon_user_mailer_create,
+    icon_user_mailer_list, icon_user_mailer_setup
+)
 from .permissions import (
     permission_mailing_link, permission_mailing_send_document,
     permission_user_mailer_create, permission_user_mailer_delete,
@@ -26,11 +30,13 @@ link_send_multiple_document_link = Link(
     text=_('Email link'), view='mailer:send_multiple_document_link'
 )
 link_system_mailer_error_log = Link(
-    icon='fa fa-envelope', permissions=(permission_view_error_log,),
+    icon_class=icon_system_mailer_error_log,
+    permissions=(permission_view_error_log,),
     text=_('System mailer error log'), view='mailer:system_mailer_error_log',
 )
 link_user_mailer_create = Link(
-    icon='fa fa-envelope', permissions=(permission_user_mailer_create,),
+    icon_class=icon_user_mailer_create,
+    permissions=(permission_user_mailer_create,),
     text=_('User mailer create'), view='mailer:user_mailer_backend_selection',
 )
 link_user_mailer_delete = Link(
@@ -46,11 +52,13 @@ link_user_mailer_log_list = Link(
     text=_('Log'), view='mailer:user_mailer_log',
 )
 link_user_mailer_list = Link(
-    icon='fa fa-envelope', permissions=(permission_user_mailer_view,),
+    icon_class=icon_user_mailer_list,
+    permissions=(permission_user_mailer_view,),
     text=_('Mailing profiles list'), view='mailer:user_mailer_list',
 )
 link_user_mailer_setup = Link(
-    icon='fa fa-envelope', permissions=(permission_user_mailer_view,),
+    icon_class=icon_user_mailer_setup,
+    permissions=(permission_user_mailer_view,),
     text=_('Mailing profiles'), view='mailer:user_mailer_list',
 )
 link_user_mailer_test = Link(

mayan/apps/permissions/icons.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_role_list = Icon(driver_name='fontawesome', symbol='user-secret')

mayan/apps/permissions/links.py

@@ -5,6 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from navigation import Link
 from user_management.permissions import permission_group_edit
 
+from .icons import icon_role_list
 from .permissions import (
     permission_permission_grant, permission_permission_revoke,
     permission_role_create, permission_role_delete, permission_role_edit,
@@ -12,8 +13,8 @@ from .permissions import (
 )
 
 link_group_roles = Link(
-    permissions=(permission_group_edit,), text=_('Roles'),
+    args='object.id', permissions=(permission_group_edit,), text=_('Roles'),
-    view='permissions:group_roles', args='object.id'
+    view='permissions:group_roles',
 )
 link_permission_grant = Link(
     permissions=(permission_permission_grant,), text=_('Grant'),
@@ -28,23 +29,23 @@ link_role_create = Link(
     view='permissions:role_create'
 )
 link_role_delete = Link(
-    permissions=(permission_role_delete,), tags='dangerous', text=_('Delete'),
+    args='object.id', permissions=(permission_role_delete,), tags='dangerous',
-    view='permissions:role_delete', args='object.id'
+    text=_('Delete'), view='permissions:role_delete',
 )
 link_role_edit = Link(
-    permissions=(permission_role_edit,), text=_('Edit'),
+    args='object.id', permissions=(permission_role_edit,), text=_('Edit'),
-    view='permissions:role_edit', args='object.id'
+    view='permissions:role_edit',
 )
 link_role_list = Link(
-    icon='fa fa-user-secret', permissions=(permission_role_view,),
+    icon_class=icon_role_list, permissions=(permission_role_view,),
     text=_('Roles'), view='permissions:role_list'
 )
 link_role_groups = Link(
-    permissions=(permission_role_edit,), text=_('Groups'),
+    args='object.id', permissions=(permission_role_edit,), text=_('Groups'),
-    view='permissions:role_groups', args='object.id'
+    view='permissions:role_groups',
 )
 link_role_permissions = Link(
+    args='object.id',
     permissions=(permission_permission_grant, permission_permission_revoke),
     text=_('Role permissions'), view='permissions:role_permissions',
-    args='object.id'
 )

mayan/apps/rest_api/icons.py

@@ -0,0 +1,7 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_api = Icon(driver_name='fontawesome', symbol='plug')
+icon_api_documentation = Icon(driver_name='fontawesome', symbol='book')
+icon_api_documentation_redoc = Icon(driver_name='fontawesome', symbol='book')

mayan/apps/rest_api/links.py

@@ -4,16 +4,21 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import (
+    icon_api, icon_api_documentation, icon_api_documentation_redoc
+)
+
+
 link_api = Link(
-    icon='fa fa-plug', tags='new_window', text=_('REST API'),
+    icon_class=icon_api, tags='new_window', text=_('REST API'),
     view='rest_api:api_root'
 )
 link_api_documentation = Link(
-    icon='fa fa-book', tags='new_window', text=_('API Documentation (Swagger)'),
+    icon_class=icon_api_documentation, tags='new_window',
-    view='schema-swagger-ui'
+    text=_('API Documentation (Swagger)'), view='schema-swagger-ui'
 )
 
 link_api_documentation_redoc = Link(
-    icon='fa fa-book', tags='new_window', text=_('API Documentation (ReDoc)'),
+    icon_class=icon_api_documentation_redoc, tags='new_window',
-    view='schema-redoc'
+    text=_('API Documentation (ReDoc)'), view='schema-redoc'
 )

mayan/apps/smart_settings/icons.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_namespace_list = Icon(driver_name='fontawesome', symbol='sliders-h')

mayan/apps/smart_settings/links.py

@@ -4,13 +4,14 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import icon_namespace_list
 from .permissions import permission_settings_view
 
 link_namespace_list = Link(
-    icon='fa fa-sliders-h', permissions=(permission_settings_view,),
+    icon_class=icon_namespace_list, permissions=(permission_settings_view,),
     text=_('Settings'), view='settings:namespace_list'
 )
 link_namespace_detail = Link(
-    permissions=(permission_settings_view,), text=_('Settings'),
+    args='resolved_object.name', permissions=(permission_settings_view,),
-    view='settings:namespace_detail', args='resolved_object.name'
+    text=_('Settings'), view='settings:namespace_detail',
 )

mayan/apps/sources/icons.py

@@ -0,0 +1,8 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_document_create_multiple = Icon(
+    driver_name='fontawesome', symbol='upload'
+)
+icon_setup_sources = Icon(driver_name='fontawesome', symbol='upload')

mayan/apps/sources/links.py

@@ -8,6 +8,7 @@ from documents.permissions import (
 )
 from navigation import Link
 
+from .icons import icon_document_create_multiple, icon_setup_sources
 from .literals import (
     SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_EMAIL_IMAP, SOURCE_CHOICE_EMAIL_POP3,
     SOURCE_CHOICE_SANE_SCANNER, SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WATCH
@@ -44,61 +45,63 @@ def document_new_version_not_blocked(context):
 
 
 link_document_create_multiple = Link(
-    condition=condition_check_document_creation_acls, icon='fa fa-upload',
+    condition=condition_check_document_creation_acls,
-    text=_('New document'), view='sources:document_create_multiple'
+    icon_class=icon_document_create_multiple, text=_('New document'),
+    view='sources:document_create_multiple'
 )
 link_setup_sources = Link(
-    icon='fa fa-upload', permissions=(permission_sources_setup_view,),
+    icon_class=icon_setup_sources,
-    text=_('Sources'), view='sources:setup_source_list'
+    permissions=(permission_sources_setup_view,), text=_('Sources'),
+    view='sources:setup_source_list'
 )
 link_setup_source_create_imap_email = Link(
+    args='"%s"' % SOURCE_CHOICE_EMAIL_IMAP,
     permissions=(permission_sources_setup_create,),
     text=_('Add new IMAP email'), view='sources:setup_source_create',
-    args='"%s"' % SOURCE_CHOICE_EMAIL_IMAP
 )
 link_setup_source_create_pop3_email = Link(
+    args='"%s"' % SOURCE_CHOICE_EMAIL_POP3,
     permissions=(permission_sources_setup_create,),
     text=_('Add new POP3 email'), view='sources:setup_source_create',
-    args='"%s"' % SOURCE_CHOICE_EMAIL_POP3
 )
 link_setup_source_create_staging_folder = Link(
+    args='"%s"' % SOURCE_CHOICE_STAGING,
     permissions=(permission_sources_setup_create,),
     text=_('Add new staging folder'), view='sources:setup_source_create',
-    args='"%s"' % SOURCE_CHOICE_STAGING
 )
 link_setup_source_create_watch_folder = Link(
+    args='"%s"' % SOURCE_CHOICE_WATCH,
     permissions=(permission_sources_setup_create,),
     text=_('Add new watch folder'), view='sources:setup_source_create',
-    args='"%s"' % SOURCE_CHOICE_WATCH
 )
 link_setup_source_create_webform = Link(
+    args='"%s"' % SOURCE_CHOICE_WEB_FORM,
     permissions=(permission_sources_setup_create,),
     text=_('Add new webform source'), view='sources:setup_source_create',
-    args='"%s"' % SOURCE_CHOICE_WEB_FORM
 )
 link_setup_source_create_sane_scanner = Link(
+    args='"%s"' % SOURCE_CHOICE_SANE_SCANNER,
     permissions=(permission_sources_setup_create,),
     text=_('Add new SANE scanner'), view='sources:setup_source_create',
-    args='"%s"' % SOURCE_CHOICE_SANE_SCANNER
 )
 link_setup_source_delete = Link(
+    args=('resolved_object.pk',),
     permissions=(permission_sources_setup_delete,), tags='dangerous',
     text=_('Delete'), view='sources:setup_source_delete',
-    args=('resolved_object.pk',)
 )
 link_setup_source_edit = Link(
-    text=_('Edit'), view='sources:setup_source_edit',
+    args=('resolved_object.pk',),
-    args=('resolved_object.pk',), permissions=(permission_sources_setup_edit,)
+    permissions=(permission_sources_setup_edit,), text=_('Edit'),
+    view='sources:setup_source_edit',
 )
 link_source_list = Link(
     permissions=(permission_sources_setup_view,), text=_('Document sources'),
     view='sources:setup_web_form_list'
 )
 link_staging_file_delete = Link(
-    keep_query=True,
+    args=('source.pk', 'object.encoded_filename',), keep_query=True,
     permissions=(permission_document_new_version, permission_document_create),
     tags='dangerous', text=_('Delete'), view='sources:staging_file_delete',
-    args=('source.pk', 'object.encoded_filename',)
 )
 link_upload_version = Link(
     args='resolved_object.pk', condition=document_new_version_not_blocked,
@@ -106,10 +109,12 @@ link_upload_version = Link(
     text=_('Upload new version'), view='sources:upload_version',
 )
 link_setup_source_logs = Link(
-    text=_('Logs'), view='sources:setup_source_logs',
+    args=('resolved_object.pk',),
-    args=('resolved_object.pk',), permissions=(permission_sources_setup_view,)
+    permissions=(permission_sources_setup_view,), text=_('Logs'),
+    view='sources:setup_source_logs',
 )
 link_setup_source_check_now = Link(
-    text=_('Check now'), view='sources:setup_source_check',
+    args=('resolved_object.pk',),
-    args=('resolved_object.pk',), permissions=(permission_sources_setup_view,)
+    permissions=(permission_sources_setup_view,), text=_('Check now'),
+    view='sources:setup_source_check',
 )

mayan/apps/task_manager/icons.py

@@ -0,0 +1,6 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_task_manager = Icon(driver_name='fontawesome', symbol='braille')
+icon_queue_list = Icon(driver_name='fontawesome', symbol='braille')

mayan/apps/task_manager/links.py

@@ -4,14 +4,15 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+from .icons import icon_task_manager, icon_queue_list
 from .permissions import permission_task_view
 
 link_task_manager = Link(
-    icon='fa fa-braille', permissions=(permission_task_view,),
+    icon_class=icon_task_manager, permissions=(permission_task_view,),
     text=_('Task manager'), view='task_manager:queue_list'
 )
 link_queue_list = Link(
-    icon='fa fa-braille', permissions=(permission_task_view,),
+    icon_class=icon_queue_list, permissions=(permission_task_view,),
     text=_('Background task queues'), view='task_manager:queue_list'
 )
 link_queue_active_task_list = Link(