From 47a8355c795b82f0d0f299258bb3f0390da3c6f4 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 23 Apr 2019 19:28:44 -0400 Subject: [PATCH] Update coverter link and icon names Signed-off-by: Roberto Rosario --- mayan/apps/converter/icons.py | 4 +++- mayan/apps/converter/links.py | 13 ++++++++----- mayan/apps/converter/views.py | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mayan/apps/converter/icons.py b/mayan/apps/converter/icons.py index 61803fddc0..f91d1a9d13 100644 --- a/mayan/apps/converter/icons.py +++ b/mayan/apps/converter/icons.py @@ -2,10 +2,12 @@ from __future__ import absolute_import, unicode_literals from mayan.apps.appearance.classes import Icon -icon_transformation = Icon(driver_name='fontawesome', symbol='crop') +icon_transformations = Icon(driver_name='fontawesome', symbol='crop') + icon_transformation_create = Icon( driver_name='fontawesome-dual', primary_symbol='crop', secondary_symbol='plus' ) icon_transformation_delete = Icon(driver_name='fontawesome', symbol='times') icon_transformation_edit = Icon(driver_name='fontawesome', symbol='pencil-alt') +icon_transformation_list = icon_transformations diff --git a/mayan/apps/converter/links.py b/mayan/apps/converter/links.py index 85dc35778c..aece7fd6f2 100644 --- a/mayan/apps/converter/links.py +++ b/mayan/apps/converter/links.py @@ -5,7 +5,6 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link -from .icons import icon_transformation, icon_transformation_create from .permissions import ( permission_transformation_create, permission_transformation_delete, permission_transformation_edit, permission_transformation_view @@ -31,21 +30,25 @@ def get_kwargs_factory(variable_name): link_transformation_create = Link( - icon_class=icon_transformation_create, + icon_class_path='mayan.apps.converter.icons.icon_transformation_create', kwargs=get_kwargs_factory('content_object'), permissions=(permission_transformation_create,), text=_('Create new transformation'), view='converter:transformation_create' ) link_transformation_delete = Link( - args='resolved_object.pk', permissions=(permission_transformation_delete,), + args='resolved_object.pk', + icon_class_path='mayan.apps.converter.icons.icon_transformation_delete', + permissions=(permission_transformation_delete,), tags='dangerous', text=_('Delete'), view='converter:transformation_delete' ) link_transformation_edit = Link( - args='resolved_object.pk', permissions=(permission_transformation_edit,), + args='resolved_object.pk', + icon_class_path='mayan.apps.converter.icons.icon_transformation_edit', + permissions=(permission_transformation_edit,), text=_('Edit'), view='converter:transformation_edit' ) link_transformation_list = Link( - icon_class=icon_transformation, + icon_class_path='mayan.apps.converter.icons.icon_transformation_list', kwargs=get_kwargs_factory('resolved_object'), permissions=(permission_transformation_view,), text=_('Transformations'), view='converter:transformation_list' diff --git a/mayan/apps/converter/views.py b/mayan/apps/converter/views.py index d9fd8c8dfc..75d097f38b 100644 --- a/mayan/apps/converter/views.py +++ b/mayan/apps/converter/views.py @@ -16,7 +16,7 @@ from mayan.apps.common.views import ( ) from .forms import TransformationForm -from .icons import icon_transformation +from .icons import icon_transformation_list from .links import link_transformation_create from .models import Transformation from .permissions import ( @@ -215,7 +215,7 @@ class TransformationListView(SingleObjectListView): 'hide_link': True, 'hide_object': True, 'navigation_object_list': ('content_object',), - 'no_results_icon': icon_transformation, + 'no_results_icon': icon_transformation_list, 'no_results_main_link': link_transformation_create.resolve( context=RequestContext( self.request, {'content_object': self.content_object}