diff --git a/mayan/apps/django_gpg/icons.py b/mayan/apps/django_gpg/icons.py index e68484532f..0d3a8b52c7 100644 --- a/mayan/apps/django_gpg/icons.py +++ b/mayan/apps/django_gpg/icons.py @@ -3,4 +3,6 @@ from __future__ import absolute_import, unicode_literals from appearance.classes import Icon 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') + diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py index 707a1bbb12..8b35b579d3 100644 --- a/mayan/apps/django_gpg/links.py +++ b/mayan/apps/django_gpg/links.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link -from .icons import icon_key_setup +from .icons import icon_key_setup, icon_key_upload, icon_keyserver_search from .permissions import ( permission_key_delete, permission_key_download, permission_key_receive, permission_key_view, permission_key_upload, permission_keyserver_query @@ -23,6 +23,7 @@ link_key_download = Link( text=_('Download'), view='django_gpg:key_download', ) link_key_query = Link( + icon_class=icon_keyserver_search, permissions=(permission_keyserver_query,), text=_('Query keyservers'), view='django_gpg:key_query' ) @@ -36,8 +37,8 @@ link_key_setup = Link( text=_('Key management'), view='django_gpg:key_public_list' ) link_key_upload = Link( - permissions=(permission_key_upload,), text=_('Upload key'), - view='django_gpg:key_upload' + icon_class=icon_key_upload, permissions=(permission_key_upload,), + text=_('Upload key'), view='django_gpg:key_upload' ) link_private_keys = Link( permissions=(permission_key_view,), text=_('Private keys'), diff --git a/mayan/apps/django_gpg/views.py b/mayan/apps/django_gpg/views.py index 498647f1a8..bff1d56635 100644 --- a/mayan/apps/django_gpg/views.py +++ b/mayan/apps/django_gpg/views.py @@ -4,6 +4,7 @@ import logging from django.contrib import messages from django.core.files.base import ContentFile +from django.template import RequestContext from django.urls import reverse, reverse_lazy from django.utils.translation import ugettext_lazy as _ @@ -14,7 +15,8 @@ from common.generics import ( ) from .forms import KeyDetailForm, KeySearchForm -from .icons import icon_keyserver_search +from .icons import icon_key_setup, icon_keyserver_search +from .links import link_key_query, link_key_upload from .literals import KEY_TYPE_PUBLIC from .models import Key from .permissions import ( @@ -117,6 +119,17 @@ class KeyQueryResultView(SingleObjectListView): def get_extra_context(self): return { 'hide_object': True, + 'no_results_icon': icon_key_setup, + 'no_results_main_link': link_key_query.resolve( + context=RequestContext(request=self.request) + ), + 'no_results_text': _( + 'Use names, last names, key ids or emails to search ' + 'public keys to import from the keyserver.' + ), + 'no_results_title': _( + 'No results returned' + ), 'title': _('Key query results'), } @@ -147,6 +160,19 @@ class PublicKeyListView(SingleObjectListView): def get_extra_context(self): return { 'hide_object': True, + 'no_results_icon': icon_key_setup, + 'no_results_main_link': link_key_upload.resolve( + context=RequestContext(request=self.request) + ), + 'no_results_text': _( + 'Public keys are used to verify signed documents. ' + 'Public keys can be uploaded by the user or downloaded ' + 'from keyservers. The view to upload private and public ' + 'keys is the same.' + ), + 'no_results_title': _( + 'There no public keys' + ), 'title': _('Public keys') } @@ -158,5 +184,17 @@ class PrivateKeyListView(SingleObjectListView): def get_extra_context(self): return { 'hide_object': True, + 'no_results_icon': icon_key_setup, + 'no_results_main_link': link_key_upload.resolve( + context=RequestContext(request=self.request) + ), + 'no_results_text': _( + 'Private keys are used to signed documents. ' + 'Private keys can only be uploaded by the user.' + 'The view to upload private and public keys is the same.' + ), + 'no_results_title': _( + 'There no private keys' + ), 'title': _('Private keys') } diff --git a/mayan/apps/document_states/icons.py b/mayan/apps/document_states/icons.py index 209ef11e75..bb94d68948 100644 --- a/mayan/apps/document_states/icons.py +++ b/mayan/apps/document_states/icons.py @@ -9,6 +9,9 @@ icon_setup_workflow_list = Icon(driver_name='fontawesome', symbol='sitemap') icon_tool_launch_all_workflows = Icon( driver_name='fontawesome', symbol='sitemap' ) +icon_workflow_create = Icon( + driver_name='fontawesome', symbol='plus' +) icon_workflow_list = Icon( driver_name='fontawesome', symbol='sitemap' ) diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py index be55901d8c..f134c47a92 100644 --- a/mayan/apps/document_states/links.py +++ b/mayan/apps/document_states/links.py @@ -6,7 +6,7 @@ from navigation import Link from .icons import ( icon_document_workflow_instance_list, icon_setup_workflow_list, - icon_tool_launch_all_workflows, icon_workflow_list, + icon_tool_launch_all_workflows, icon_workflow_create, icon_workflow_list, icon_workflow_state, icon_workflow_state_action, icon_workflow_transition ) from .permissions import ( @@ -21,7 +21,7 @@ link_document_workflow_instance_list = Link( view='document_states:document_workflow_instance_list', ) link_setup_workflow_create = Link( - icon_class=icon_workflow_list, permissions=(permission_workflow_create,), + icon_class=icon_workflow_create, permissions=(permission_workflow_create,), text=_('Create workflow'), view='document_states:setup_workflow_create' ) link_setup_workflow_delete = Link( diff --git a/mayan/apps/metadata/icons.py b/mayan/apps/metadata/icons.py index a561ae09fb..0b6f02ba09 100644 --- a/mayan/apps/metadata/icons.py +++ b/mayan/apps/metadata/icons.py @@ -12,4 +12,5 @@ icon_document_metadata_remove = Icon( driver_name='fontawesome', symbol='minus' ) icon_metadata = Icon(driver_name='fontawesome', symbol='pencil-alt') +icon_metadata_type_create = Icon(driver_name='fontawesome', symbol='plus') icon_metadata_view = Icon(driver_name='fontawesome', symbol='pencil-alt') diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py index 5e38e3082c..edea2b4950 100644 --- a/mayan/apps/metadata/links.py +++ b/mayan/apps/metadata/links.py @@ -5,7 +5,9 @@ from django.utils.translation import ugettext_lazy as _ from documents.permissions import permission_document_type_edit from navigation import Link -from .icons import icon_document_metadata_add, icon_metadata_view +from .icons import ( + icon_document_metadata_add, icon_metadata_view, icon_metadata_type_create +) from .permissions import ( permission_metadata_document_add, permission_metadata_document_edit, permission_metadata_document_remove, permission_metadata_document_view, @@ -49,6 +51,7 @@ link_setup_metadata_type_document_types = Link( text=_('Document types'), view='metadata:setup_metadata_type_document_types', ) link_setup_metadata_type_create = Link( + icon_class=icon_metadata_type_create, permissions=(permission_metadata_type_create,), text=_('Create new'), view='metadata:setup_metadata_type_create' )