From f5e3470deb3b30f6a65b1b662bf3b4cb20428fc5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 28 Jun 2018 16:42:04 -0400 Subject: [PATCH] Update the OCR app to use the new Icon class. Signed-off-by: Roberto Rosario --- mayan/apps/ocr/apps.py | 4 ++-- mayan/apps/ocr/icons.py | 11 +++++++++++ mayan/apps/ocr/links.py | 26 +++++++++++++++++--------- 3 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 mayan/apps/ocr/icons.py diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index 7dfff12c2a..3f053ff39a 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/apps.py @@ -28,7 +28,7 @@ from .handlers import ( ) from .links import ( link_document_content, link_document_ocr_download, - link_document_ocr_erros_list, link_document_submit, + link_document_ocr_errors_list, link_document_submit, link_document_submit_multiple, link_document_type_ocr_settings, link_document_type_submit, link_entry_list ) @@ -143,7 +143,7 @@ class OCRApp(MayanAppConfig): ) menu_secondary.bind_links( links=( - link_document_content, link_document_ocr_erros_list, + link_document_content, link_document_ocr_errors_list, link_document_ocr_download ), sources=( diff --git a/mayan/apps/ocr/icons.py b/mayan/apps/ocr/icons.py new file mode 100644 index 0000000000..2eb0f13bc6 --- /dev/null +++ b/mayan/apps/ocr/icons.py @@ -0,0 +1,11 @@ +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_errors_list = Icon( + driver_name='fontawesome', symbol='file-alt' +) +icon_document_type_submit = Icon(driver_name='fontawesome', symbol='font') +icon_entry_list = Icon(driver_name='fontawesome', symbol='file-alt') diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py index 1892db2f10..fff0e796df 100644 --- a/mayan/apps/ocr/links.py +++ b/mayan/apps/ocr/links.py @@ -4,14 +4,20 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import ( + icon_document_content, icon_document_ocr_download, + icon_document_ocr_errors_list, icon_document_type_submit, + icon_entry_list +) from .permissions import ( permission_ocr_content_view, permission_ocr_document, permission_document_type_ocr_setup ) link_document_content = Link( - icon='fa fa-font', permissions=(permission_ocr_content_view,), - text=_('OCR'), view='ocr:document_content', args='resolved_object.id' + args='resolved_object.id', icon_class=icon_document_content, + permissions=(permission_ocr_content_view,), text=_('OCR'), + view='ocr:document_content', ) link_document_submit = Link( args='resolved_object.id', permissions=(permission_ocr_document,), @@ -21,24 +27,26 @@ link_document_submit_multiple = Link( text=_('Submit for OCR'), view='ocr:document_submit_multiple' ) link_document_type_ocr_settings = Link( + args='resolved_object.id', permissions=(permission_document_type_ocr_setup,), text=_('Setup OCR'), - view='ocr:document_type_ocr_settings', args='resolved_object.id' + view='ocr:document_type_ocr_settings', ) link_document_type_submit = Link( - icon='fa fa-font', permissions=(permission_ocr_document,), - text=_('OCR documents per type'), view='ocr:document_type_submit' + icon_class=icon_document_type_submit, + permissions=(permission_ocr_document,), text=_('OCR documents per type'), + view='ocr:document_type_submit' ) link_entry_list = Link( - icon='fa fa-file-alt', permissions=(permission_ocr_document,), + icon_class=icon_entry_list, permissions=(permission_ocr_document,), text=_('OCR errors'), view='ocr:entry_list' ) -link_document_ocr_erros_list = Link( - args='resolved_object.id', icon='fa fa-file-alt', +link_document_ocr_errors_list = Link( + args='resolved_object.id', icon_class=icon_document_ocr_errors_list, permissions=(permission_ocr_content_view,), text=_('OCR errors'), view='ocr:document_ocr_error_list' ) link_document_ocr_download = Link( - args='resolved_object.id', icon='fa fa-file-alt', + args='resolved_object.id', icon_class=icon_document_ocr_download, permissions=(permission_ocr_content_view,), text=_('Download OCR text'), view='ocr:document_ocr_download' )