Update to Font Awesome 5. Add experimental Icon class. Simplify document loading icon.

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

mayan/apps/documents/icons.py

@@ -0,0 +1,8 @@
+from __future__ import absolute_import, unicode_literals
+
+from appearance.classes import Icon
+
+icon_document_preview = Icon(symbol='eye')
+icon_document_properties = Icon(symbol='info')
+icon_document_version_list = Icon(symbol='code-branch')
+icon_document_pages = Icon(symbol='copy')

mayan/apps/documents/links.py

@@ -7,6 +7,10 @@ from converter.permissions import (
 )
 from navigation import Link
 
+from .icons import (
+    icon_document_preview, icon_document_properties,
+    icon_document_version_list, icon_document_pages
+)
 from .permissions import (
     permission_document_delete, permission_document_download,
     permission_document_properties_edit, permission_document_print,
@@ -49,22 +53,22 @@ def is_min_zoom(context):
 
 # Facet
 link_document_preview = Link(
-    icon='fa fa-eye', permissions=(permission_document_view,),
+    icon_class=icon_document_preview, permissions=(permission_document_view,),
     text=_('Preview'), view='documents:document_preview',
     args='resolved_object.id'
 )
 link_document_properties = Link(
-    icon='fa fa-info', permissions=(permission_document_view,),
+    icon_class=icon_document_properties, permissions=(permission_document_view,),
     text=_('Properties'), view='documents:document_properties',
     args='resolved_object.id'
 )
 link_document_version_list = Link(
-    icon='fa fa-code-fork', permissions=(permission_document_version_view,),
+    icon_class=icon_document_version_list, permissions=(permission_document_version_view,),
     text=_('Versions'), view='documents:document_version_list',
     args='resolved_object.pk'
 )
 link_document_pages = Link(
-    icon='fa fa-files-o', permissions=(permission_document_view,),
+    icon_class=icon_document_pages, permissions=(permission_document_view,),
     text=_('Pages'), view='documents:document_pages', args='resolved_object.pk'
 )
 
@@ -154,7 +158,7 @@ link_document_version_return_document = Link(
     args='resolved_object.document.pk'
 )
 link_document_version_return_list = Link(
-    icon='fa fa-code-fork', permissions=(permission_document_version_view,),
+    icon='fa fa-code-branch', permissions=(permission_document_version_view,),
     text=_('Versions'), view='documents:document_version_list',
     args='resolved_object.document.pk'
 )
@@ -168,7 +172,7 @@ link_document_list = Link(
     icon='fa fa-file', text=_('All documents'), view='documents:document_list'
 )
 link_document_list_recent = Link(
-    icon='fa fa-clock-o', text=_('Recent documents'),
+    icon='fa fa-clock', text=_('Recent documents'),
     view='documents:document_list_recent'
 )
 link_document_list_deleted = Link(
@@ -178,7 +182,7 @@ link_document_list_deleted = Link(
 
 # Tools
 link_clear_image_cache = Link(
-    icon='fa fa-file-image-o',
+    icon='fa fa-file-image',
     description=_(
         'Clear the graphics representations used to speed up the documents\' '
         'display and interactive transformations results.'

mayan/apps/documents/templates/documents/invalid_document.html

@@ -0,0 +1,6 @@
+<div class="fa-3x">
+    <span class="fa-layers fa-fw">
+        <i class="far fa-file"></i>
+        <i class="fa-inverse fas fa-question text-danger" data-fa-transform="shrink-6"></i>
+    </span>
+</div>

mayan/apps/documents/widgets.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 from django import forms
+from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.html import strip_tags
@@ -95,8 +96,7 @@ class InstanceImageWidget(object):
     disable_title_link = False
     fancybox_class = 'fancybox'
     gallery_name = None
-    # TODO: update this to load a disk template
-    invalid_image_template = '<p>Invalid image</p>'
+    invalid_image_template = 'documents/invalid_document.html'
     preview_view_name = None
     preview_query_dict = {}
     image_class = 'lazy-load'
@@ -190,7 +190,11 @@ class InstanceImageWidget(object):
         result.append('<div class="instance-image-widget">')
 
         if not self.is_valid(instance=instance):
-            result.append(self.invalid_image_template)
+            result.append(
+                render_to_string(
+                    self.invalid_image_template
+                )
+            )
         else:
             if self.gallery_name:
                 gallery_markup = 'rel="%s"' % self.gallery_name
@@ -204,7 +208,7 @@ class InstanceImageWidget(object):
 
                 if title:
                     if not self.disable_title_link:
-                        title_markup = 'data-caption="<a class=\'a-caption\' href=\'{url}\'>{title} <i class=\'fa fa-external-link\'></i></a>"'.format(
+                        title_markup = 'data-caption="<a class=\'a-caption\' href=\'{url}\'>{title} <i class=\'fa fa-external-link-alt\'></i></a>"'.format(
                             title=strip_tags(title), url=self.get_destination_url(instance=instance) or '#'
                         )
                     else:
@@ -226,10 +230,7 @@ class InstanceImageWidget(object):
 
             result.append(
                 '<div class="spinner-container text-primary" style="height: {height}px;">'
-                '<span class="spinner-icon fa-stack fa-lg">'
-                '<i class="fa fa-file-o fa-stack-2x"></i>'
-                '<i class="fa fa-clock-o fa-stack-1x"></i>'
-                '</span>'
+                '<i class="far fa-clock fa-2x"></i>'
                 '</div>'
                 '<img class="thin_border {image_class} pull-left" style="width: {width};"'
                 'data-url="{preview_full_url}" src="#" '
@@ -256,9 +257,6 @@ class BaseDocumentThumbnailWidget(InstanceImageWidget):
         'size': setting_preview_size.value
     }
     gallery_name = 'document_list'
-    invalid_image_template = """
-        <span class="fa-stack fa-lg"><i class="fa fa-file-o fa-stack-2x"></i><i class="fa fa-question fa-stack-1x text-danger"></i></span>
-    """
     preview_view_name = 'rest_api:documentpage-image'
     preview_view_query_dict = {
         'size': setting_thumbnail_size.value