From ac1ad7a81b045254a49aab785bc45b3464591419 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 12 Dec 2019 20:42:35 -0400 Subject: [PATCH] Add missing icons Signed-off-by: Roberto Rosario --- .../templates/appearance/generic_confirm.html | 14 +++++- .../appearance/generic_form_subtemplate.html | 2 - .../generic_multiform_subtemplate.html | 4 +- mayan/apps/django_gpg/icons.py | 11 ++++ mayan/apps/django_gpg/links.py | 31 +++++++----- mayan/apps/django_gpg/views.py | 9 ++-- mayan/apps/document_signatures/icons.py | 4 +- mayan/apps/document_signatures/links.py | 50 ++++++++++--------- mayan/apps/documents/views/document_views.py | 9 ++-- mayan/apps/mailer/icons.py | 6 ++- mayan/apps/metadata/icons.py | 5 +- mayan/apps/sources/icons.py | 5 +- mayan/apps/user_management/icons.py | 10 +++- 13 files changed, 105 insertions(+), 55 deletions(-) diff --git a/mayan/apps/appearance/templates/appearance/generic_confirm.html b/mayan/apps/appearance/templates/appearance/generic_confirm.html index 20a3956ee4..51aa385a60 100644 --- a/mayan/apps/appearance/templates/appearance/generic_confirm.html +++ b/mayan/apps/appearance/templates/appearance/generic_confirm.html @@ -30,12 +30,22 @@ {% endif %} {% if previous %} - {{ cancel_icon_class.render }} {% trans 'No' %} + + {% if cancel_icon_class %} + {{ cancel_icon_class.render }} + {% else %} + + {% endif %} + {% trans 'No' %} {% endif %} diff --git a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html index 50a9a90699..2ab60e6e7a 100644 --- a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html +++ b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html @@ -77,8 +77,6 @@ + {% endif %} {% if previous %}   - {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %} + {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %} {% endif %} diff --git a/mayan/apps/django_gpg/icons.py b/mayan/apps/django_gpg/icons.py index a1d08dc42e..7e015b1e45 100644 --- a/mayan/apps/django_gpg/icons.py +++ b/mayan/apps/django_gpg/icons.py @@ -2,6 +2,17 @@ from __future__ import absolute_import, unicode_literals from mayan.apps.appearance.classes import Icon +icon_key_delete = Icon(driver_name='fontawesome', symbol='times') +icon_key_detail = Icon(driver_name='fontawesome', symbol='key') +icon_key_download = Icon(driver_name='fontawesome', symbol='download') icon_key_setup = Icon(driver_name='fontawesome', symbol='key') icon_key_upload = Icon(driver_name='fontawesome', symbol='upload') icon_keyserver_search = Icon(driver_name='fontawesome', symbol='search') +icon_private_keys = Icon( + driver_name='fontawesome-dual', primary_symbol='key', + secondary_symbol='eye-slash' +) +icon_public_keys = Icon( + driver_name='fontawesome-dual', primary_symbol='key', + secondary_symbol='eye' +) diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py index 1c842bf720..d0d0c8621f 100644 --- a/mayan/apps/django_gpg/links.py +++ b/mayan/apps/django_gpg/links.py @@ -4,23 +4,30 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation.classes import Link -from .icons import icon_key_setup, icon_key_upload, icon_keyserver_search +from .icons import ( + icon_key_delete, icon_key_detail, icon_key_download, icon_key_setup, + icon_key_upload, icon_keyserver_search, icon_private_keys, + icon_public_keys +) 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( - args=('resolved_object.pk',), permissions=(permission_key_delete,), - tags='dangerous', text=_('Delete'), view='django_gpg:key_delete', + args=('resolved_object.pk',), icon_class=icon_key_delete, + permissions=(permission_key_delete,), tags='dangerous', text=_('Delete'), + view='django_gpg:key_delete' ) link_key_detail = Link( - args=('resolved_object.pk',), permissions=(permission_key_view,), - text=_('Details'), view='django_gpg:key_detail', + args=('resolved_object.pk',), icon_class=icon_key_detail, + permissions=(permission_key_view,), text=_('Details'), + view='django_gpg:key_detail' ) link_key_download = Link( - args=('resolved_object.pk',), permissions=(permission_key_download,), - text=_('Download'), view='django_gpg:key_download', + args=('resolved_object.pk',), icon_class=icon_key_download, + permissions=(permission_key_download,), text=_('Download'), + view='django_gpg:key_download' ) link_key_query = Link( icon_class=icon_keyserver_search, @@ -30,7 +37,7 @@ link_key_query = Link( link_key_receive = Link( args='object.key_id', keep_query=True, permissions=(permission_key_receive,), text=_('Import'), - view='django_gpg:key_receive', + view='django_gpg:key_receive' ) link_key_setup = Link( icon_class=icon_key_setup, permissions=(permission_key_view,), @@ -41,10 +48,10 @@ link_key_upload = Link( text=_('Upload key'), view='django_gpg:key_upload' ) link_private_keys = Link( - permissions=(permission_key_view,), text=_('Private keys'), - view='django_gpg:key_private_list' + icon_class=icon_private_keys, permissions=(permission_key_view,), + text=_('Private keys'), view='django_gpg:key_private_list' ) link_public_keys = Link( - permissions=(permission_key_view,), text=_('Public keys'), - view='django_gpg:key_public_list' + icon_class=icon_public_keys, permissions=(permission_key_view,), + text=_('Public keys'), view='django_gpg:key_public_list' ) diff --git a/mayan/apps/django_gpg/views.py b/mayan/apps/django_gpg/views.py index fb6032d72c..599c97fb24 100644 --- a/mayan/apps/django_gpg/views.py +++ b/mayan/apps/django_gpg/views.py @@ -14,7 +14,10 @@ from mayan.apps.common.generics import ( ) from .forms import KeyDetailForm, KeySearchForm -from .icons import icon_key_setup, icon_keyserver_search +from .icons import ( + icon_key_setup, icon_keyserver_search, icon_private_keys, + icon_public_keys +) from .links import link_key_query, link_key_upload from .literals import KEY_TYPE_PUBLIC from .models import Key @@ -161,7 +164,7 @@ class PrivateKeyListView(SingleObjectListView): def get_extra_context(self): return { 'hide_object': True, - 'no_results_icon': icon_key_setup, + 'no_results_icon': icon_private_keys, 'no_results_main_link': link_key_upload.resolve( context=RequestContext(request=self.request) ), @@ -184,7 +187,7 @@ class PublicKeyListView(SingleObjectListView): def get_extra_context(self): return { 'hide_object': True, - 'no_results_icon': icon_key_setup, + 'no_results_icon': icon_public_keys, 'no_results_main_link': link_key_upload.resolve( context=RequestContext(request=self.request) ), diff --git a/mayan/apps/document_signatures/icons.py b/mayan/apps/document_signatures/icons.py index 2cd7dc87ff..3da2d2701c 100644 --- a/mayan/apps/document_signatures/icons.py +++ b/mayan/apps/document_signatures/icons.py @@ -18,10 +18,12 @@ icon_document_version_signature_delete = Icon( icon_document_version_signature_details = Icon( driver_name='fontawesome', symbol='file-signature' ) - icon_document_version_signature_detached_create = Icon( driver_name='fontawesome', symbol='file-signature' ) +icon_document_version_signature_download = Icon( + driver_name='fontawesome', symbol='download' +) icon_document_version_signature_embedded_create = Icon( driver_name='fontawesome', symbol='file-signature' ) diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py index 78d7054b10..8a6a356084 100644 --- a/mayan/apps/document_signatures/links.py +++ b/mayan/apps/document_signatures/links.py @@ -45,30 +45,6 @@ link_document_version_signature_delete = Link( tags='dangerous', text=_('Delete'), view='signatures:document_version_signature_delete', ) -link_document_version_signature_details = Link( - args='resolved_object.pk', - icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_details', - permissions=(permission_document_version_signature_view,), - text=_('Details'), view='signatures:document_version_signature_details', -) -link_document_version_signature_list = Link( - args='resolved_object.pk', - icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_list', - permissions=(permission_document_version_signature_view,), - text=_('Signatures'), view='signatures:document_version_signature_list' -) -link_document_version_signature_download = Link( - args='resolved_object.pk', condition=is_detached_signature, - permissions=(permission_document_version_signature_download,), - text=_('Download'), view='signatures:document_version_signature_download' -) -link_document_version_signature_upload = Link( - args='resolved_object.pk', - icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_upload', - permissions=(permission_document_version_signature_upload,), - text=_('Upload signature'), - view='signatures:document_version_signature_upload' -) link_document_version_signature_detached_create = Link( args='resolved_object.pk', icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_detached_create', @@ -76,6 +52,19 @@ link_document_version_signature_detached_create = Link( text=_('Sign detached'), view='signatures:document_version_signature_detached_create' ) +link_document_version_signature_details = Link( + args='resolved_object.pk', + icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_details', + permissions=(permission_document_version_signature_view,), + text=_('Details'), view='signatures:document_version_signature_details', +) +link_document_version_signature_download = Link( + args='resolved_object.pk', + icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_download', + condition=is_detached_signature, + permissions=(permission_document_version_signature_download,), + text=_('Download'), view='signatures:document_version_signature_download' +) link_document_version_signature_embedded_create = Link( args='resolved_object.pk', icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_embedded_create', @@ -83,3 +72,16 @@ link_document_version_signature_embedded_create = Link( text=_('Sign embedded'), view='signatures:document_version_signature_embedded_create' ) +link_document_version_signature_list = Link( + args='resolved_object.pk', + icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_list', + permissions=(permission_document_version_signature_view,), + text=_('Signatures'), view='signatures:document_version_signature_list' +) +link_document_version_signature_upload = Link( + args='resolved_object.pk', + icon_class_path='mayan.apps.document_signatures.icons.icon_document_version_signature_upload', + permissions=(permission_document_version_signature_upload,), + text=_('Upload signature'), + view='signatures:document_version_signature_upload' +) diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py index f56be5a86e..fc9f4cb0ed 100644 --- a/mayan/apps/documents/views/document_views.py +++ b/mayan/apps/documents/views/document_views.py @@ -32,8 +32,8 @@ from ..forms import ( DocumentTypeFilteredSelectForm, ) from ..icons import ( - icon_document_list, icon_document_list_recent_access, - icon_recent_added_document_list + icon_document_download, icon_document_list, + icon_document_list_recent_access, icon_recent_added_document_list ) from ..literals import PAGE_RANGE_RANGE, DEFAULT_ZIP_FILENAME from ..models import Document, RecentDocument @@ -193,15 +193,16 @@ class DocumentDownloadFormView(MultipleObjectFormActionView): 'context': { 'object_list': self.queryset, 'hide_links': True, - 'hide_multi_item_actions': True, + 'hide_multi_item_actions': True } } ] context = { + 'submit_icon_class': icon_document_download, 'submit_label': _('Download'), 'subtemplates_list': subtemplates_list, - 'title': _('Download documents'), + 'title': _('Download documents') } if self.queryset.count() == 1: diff --git a/mayan/apps/mailer/icons.py b/mayan/apps/mailer/icons.py index 7cdedd1532..84aa4edef8 100644 --- a/mayan/apps/mailer/icons.py +++ b/mayan/apps/mailer/icons.py @@ -20,7 +20,11 @@ icon_mail_document_submit = Icon( icon_system_mailer_error_log = Icon( driver_name='fontawesome', symbol='envelope' ) -icon_user_mailer_create = Icon(driver_name='fontawesome', symbol='plus') +icon_user_mailer_create = Icon( + driver_name='fontawesome-dual', primary_symbol='envelope', + secondary_symbol='plus' +) + icon_user_mailer_delete = Icon(driver_name='fontawesome', symbol='times') icon_user_mailer_edit = Icon(driver_name='fontawesome', symbol='pencil-alt') icon_user_mailer_list = Icon(driver_name='fontawesome', symbol='envelope') diff --git a/mayan/apps/metadata/icons.py b/mayan/apps/metadata/icons.py index 96f28c2a8f..74def469d3 100644 --- a/mayan/apps/metadata/icons.py +++ b/mayan/apps/metadata/icons.py @@ -34,7 +34,10 @@ icon_document_type_metadata_type_list = Icon( driver_name='fontawesome', symbol='database' ) icon_metadata = Icon(driver_name='fontawesome', symbol='database') -icon_metadata_type_create = Icon(driver_name='fontawesome', symbol='plus') +icon_metadata_type_create = Icon( + driver_name='fontawesome-dual', primary_symbol='database', + secondary_symbol='plus' +) icon_metadata_type_delete = Icon(driver_name='fontawesome', symbol='times') icon_metadata_type_edit = Icon(driver_name='fontawesome', symbol='pencil-alt') icon_metadata_type_list = Icon(driver_name='fontawesome', symbol='database') diff --git a/mayan/apps/sources/icons.py b/mayan/apps/sources/icons.py index 1274fa69d2..d44d4398d5 100644 --- a/mayan/apps/sources/icons.py +++ b/mayan/apps/sources/icons.py @@ -13,7 +13,10 @@ icon_setup_sources = Icon(driver_name='fontawesome', symbol='upload') icon_setup_source_check_now = Icon(driver_name='fontawesome', symbol='check') icon_setup_source_delete = Icon(driver_name='fontawesome', symbol='times') icon_setup_source_edit = Icon(driver_name='fontawesome', symbol='pencil-alt') -icon_source_create = Icon(driver_name='fontawesome', symbol='plus') +icon_source_create = Icon( + driver_name='fontawesome-dual', primary_symbol='upload', + secondary_symbol='plus' +) icon_source_list = Icon(driver_name='fontawesome', symbol='upload') icon_staging_folder = Icon(driver_name='fontawesome', symbol='folder') icon_staging_folder_file = Icon(driver_name='fontawesome', symbol='file') diff --git a/mayan/apps/user_management/icons.py b/mayan/apps/user_management/icons.py index 0ef467700c..09b7f8d061 100644 --- a/mayan/apps/user_management/icons.py +++ b/mayan/apps/user_management/icons.py @@ -5,13 +5,19 @@ from mayan.apps.appearance.classes import Icon icon_current_user_details = Icon(driver_name='fontawesome', symbol='user') icon_current_user_edit = Icon(driver_name='fontawesome', symbol='user') icon_group = Icon(driver_name='fontawesome', symbol='users') -icon_group_create = Icon(driver_name='fontawesome', symbol='plus') +icon_group_create = Icon( + driver_name='fontawesome-dual', primary_symbol='users', + secondary_symbol='plus' +) icon_group_delete = Icon(driver_name='fontawesome', symbol='times') icon_group_edit = Icon(driver_name='fontawesome', symbol='pencil-alt') icon_group_list = Icon(driver_name='fontawesome', symbol='users') icon_group_user_list = Icon(driver_name='fontawesome', symbol='user') icon_group_setup = Icon(driver_name='fontawesome', symbol='users') -icon_user_create = Icon(driver_name='fontawesome', symbol='plus') +icon_user_create = Icon( + driver_name='fontawesome-dual', primary_symbol='user', + secondary_symbol='plus' +) icon_user_delete = Icon(driver_name='fontawesome', symbol='times') icon_user_edit = Icon(driver_name='fontawesome', symbol='pencil-alt') icon_user_group_list = icon_group