Add more icons to links.

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

mayan/apps/acls/links.py

@@ -33,10 +33,6 @@ link_acl_delete = Link(
     view='acls:acl_delete',
 )
 link_acl_list = Link(
-    kwargs=get_kwargs_factory('resolved_object'),
-    permissions=(permission_acl_view,), text=_('ACLs'), view='acls:acl_list'
-)
-link_acl_list_with_icon = Link(
     icon_class=icon_acl_list, kwargs=get_kwargs_factory('resolved_object'),
     permissions=(permission_acl_view,), text=_('ACLs'), view='acls:acl_list'
 )

mayan/apps/document_parsing/icons.py

@@ -9,6 +9,9 @@ icon_document_parsing_errors_list = Icon(
 icon_document_content_download = Icon(
     driver_name='fontawesome', symbol='file-alt'
 )
+icon_document_type_parsing_settings = Icon(
+    driver_name='fontawesome', symbol='font'
+)
 icon_document_type_submit = Icon(
     driver_name='fontawesome', symbol='crosshairs'
 )

mayan/apps/document_parsing/links.py

@@ -6,8 +6,8 @@ from navigation import Link, get_cascade_condition
 
 from .icons import (
     icon_document_content, icon_document_parsing_errors_list,
-    icon_document_content_download, icon_document_type_submit,
+    icon_document_content_download, icon_document_type_parsing_settings,
-    icon_link_error_list
+    icon_document_type_submit, icon_link_error_list
 )
 from .permissions import (
     permission_content_view, permission_document_type_parsing_setup,
@@ -39,6 +39,7 @@ link_document_submit = Link(
 )
 link_document_type_parsing_settings = Link(
     args='resolved_object.id',
+    icon_class=icon_document_type_parsing_settings,
     permissions=(permission_document_type_parsing_setup,),
     text=_('Setup parsing'),
     view='document_parsing:document_type_parsing_settings',

mayan/apps/documents/apps.py

@@ -8,7 +8,7 @@ from django.db.models.signals import post_delete
 from django.utils.translation import ugettext_lazy as _
 
 from acls import ModelPermission
-from acls.links import link_acl_list, link_acl_list_with_icon
+from acls.links import link_acl_list
 from acls.permissions import permission_acl_edit, permission_acl_view
 from common import (
     MayanAppConfig, MissingItem, menu_facet, menu_main, menu_object,
@@ -27,7 +27,6 @@ from converter.permissions import (
 from events import ModelEventType
 from events.links import (
     link_events_for_object, link_object_event_types_user_subcriptions_list,
-    link_object_event_types_user_subcriptions_list_with_icon
 )
 from events.permissions import permission_events_view
 from mayan.celery import app
@@ -496,7 +495,7 @@ class DocumentsApp(MayanAppConfig):
 
         # Document facet links
         menu_facet.bind_links(
-            links=(link_document_duplicates_list, link_acl_list_with_icon,),
+            links=(link_document_duplicates_list, link_acl_list,),
             sources=(Document,)
         )
         menu_facet.bind_links(
@@ -508,7 +507,7 @@ class DocumentsApp(MayanAppConfig):
         menu_facet.bind_links(
             links=(
                 link_events_for_object,
-                link_object_event_types_user_subcriptions_list_with_icon,
+                link_object_event_types_user_subcriptions_list,
                 link_document_version_list,
             ), sources=(Document,), position=2
         )

mayan/apps/documents/icons.py

@@ -60,6 +60,8 @@ icon_document_pages = Icon(driver_name='fontawesome', symbol='copy')
 icon_document_preview = Icon(driver_name='fontawesome', symbol='eye')
 icon_document_properties = Icon(driver_name='fontawesome', symbol='info')
 icon_document_type_create = Icon(driver_name='fontawesome', symbol='plus')
+icon_document_type_delete = Icon(driver_name='fontawesome', symbol='times')
+icon_document_type_edit = Icon(driver_name='fontawesome', symbol='pencil-alt')
 icon_document_type_setup = Icon(driver_name='fontawesome', symbol='file')
 icon_document_type_filename = Icon(
     driver_name='fontawesome', symbol='keyboard'

mayan/apps/documents/links.py

@@ -17,6 +17,7 @@ from .icons import (
     icon_document_page_rotate_right, icon_document_page_zoom_in,
     icon_document_page_zoom_out, icon_document_pages, icon_document_preview,
     icon_document_properties, icon_document_type_create,
+    icon_document_type_delete, icon_document_type_edit,
     icon_document_type_filename_create, icon_document_type_setup,
     icon_document_version_list, icon_document_version_return_document,
     icon_document_version_return_list, icon_duplicated_document_list,
@@ -319,12 +320,14 @@ link_document_type_create = Link(
     text=_('Create document type'), view='documents:document_type_create'
 )
 link_document_type_delete = Link(
-    args='resolved_object.id', permissions=(permission_document_type_delete,),
+    args='resolved_object.id', icon_class=icon_document_type_delete,
-    tags='dangerous', text=_('Delete'), view='documents:document_type_delete',
+    permissions=(permission_document_type_delete,), tags='dangerous',
+    text=_('Delete'), view='documents:document_type_delete',
 )
 link_document_type_edit = Link(
-    args='resolved_object.id', permissions=(permission_document_type_edit,),
+    args='resolved_object.id', icon_class=icon_document_type_edit,
-    text=_('Edit'), view='documents:document_type_edit',
+    permissions=(permission_document_type_edit,), text=_('Edit'),
+    view='documents:document_type_edit',
 )
 link_document_type_filename_create = Link(
     args='document_type.id', icon_class=icon_document_type_filename_create,

mayan/apps/events/icons.py

@@ -7,8 +7,8 @@ icon_event_types_subscriptions_list = Icon(
 )
 icon_events_list = Icon(driver_name='fontawesome', symbol='list-ol')
 icon_events_for_object = Icon(driver_name='fontawesome', symbol='list-ol')
-icon_events_user_list = Icon(driver_name='fontawesome', symbol='user')
+icon_events_user_list = Icon(driver_name='fontawesome', symbol='rss')
-icon_object_event_types_user_subcriptions_list_with_icon = Icon(
+icon_object_event_types_user_subcriptions_list = Icon(
     driver_name='fontawesome', symbol='rss'
 )
 icon_user_notifications_list = Icon(

mayan/apps/events/links.py

@@ -8,7 +8,7 @@ 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_object_event_types_user_subcriptions_list,
     icon_user_notifications_list
 )
 from .permissions import permission_events_view
@@ -62,12 +62,7 @@ link_notification_mark_read_all = Link(
     text=_('Mark all as seen'), view='events:notification_mark_read_all'
 )
 link_object_event_types_user_subcriptions_list = Link(
-    kwargs=get_kwargs_factory('resolved_object'),
+    icon_class=icon_object_event_types_user_subcriptions_list,
-    permissions=(permission_events_view,), text=_('Subscriptions'),
-    view='events:object_event_types_user_subcriptions_list',
-)
-link_object_event_types_user_subcriptions_list_with_icon = Link(
-    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',

mayan/apps/ocr/icons.py

@@ -3,9 +3,14 @@ from __future__ import absolute_import, unicode_literals
 from appearance.classes import Icon
 
 icon_document_content = Icon(driver_name='fontawesome', symbol='font')
-icon_document_ocr_download = Icon(driver_name='fontawesome', symbol='file-alt')
+icon_document_ocr_download = Icon(
+    driver_name='fontawesome', symbol='file-alt'
+)
 icon_document_ocr_errors_list = Icon(
     driver_name='fontawesome', symbol='file-alt'
 )
+icon_document_type_ocr_settings = Icon(
+    driver_name='fontawesome', symbol='font'
+)
 icon_document_type_submit = Icon(driver_name='fontawesome', symbol='font')
 icon_entry_list = Icon(driver_name='fontawesome', symbol='file-alt')

mayan/apps/ocr/links.py

@@ -6,8 +6,8 @@ from navigation import Link
 
 from .icons import (
     icon_document_content, icon_document_ocr_download,
-    icon_document_ocr_errors_list, icon_document_type_submit,
+    icon_document_ocr_errors_list, icon_document_type_ocr_settings,
-    icon_entry_list
+    icon_document_type_submit, icon_entry_list
 )
 from .permissions import (
     permission_ocr_content_view, permission_ocr_document,
@@ -32,7 +32,7 @@ link_document_submit_multiple = Link(
     text=_('Submit for OCR'), view='ocr:document_submit_multiple'
 )
 link_document_type_ocr_settings = Link(
-    args='resolved_object.id',
+    args='resolved_object.id', icon_class=icon_document_type_ocr_settings,
     permissions=(permission_document_type_ocr_setup,), text=_('Setup OCR'),
     view='ocr:document_type_ocr_settings',
 )