From d48665c595354afcbcf74824fe28704b517fc76e Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 23 Apr 2019 04:29:56 -0400 Subject: [PATCH] Update ACL icons, remove sidebar menu Signed-off-by: Roberto Rosario --- mayan/apps/acls/apps.py | 4 ++-- mayan/apps/acls/icons.py | 6 +++++- mayan/apps/acls/links.py | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py index 99c013b24e..eeb60bfcda 100644 --- a/mayan/apps/acls/apps.py +++ b/mayan/apps/acls/apps.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.apps import MayanAppConfig -from mayan.apps.common.menus import menu_object, menu_sidebar +from mayan.apps.common.menus import menu_object, menu_secondary from mayan.apps.navigation import SourceColumn from .links import link_acl_create, link_acl_delete, link_acl_permissions @@ -34,6 +34,6 @@ class ACLsApp(MayanAppConfig): links=(link_acl_permissions, link_acl_delete), sources=(AccessControlList,) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_acl_create,), sources=('acls:acl_list',) ) diff --git a/mayan/apps/acls/icons.py b/mayan/apps/acls/icons.py index 1a1c73ef30..1ecd7f5bdb 100644 --- a/mayan/apps/acls/icons.py +++ b/mayan/apps/acls/icons.py @@ -2,5 +2,9 @@ from __future__ import absolute_import, unicode_literals from mayan.apps.appearance.classes import Icon +icon_acl_delete = Icon(driver_name='fontawesome', symbol='times') icon_acl_list = Icon(driver_name='fontawesome', symbol='lock') -icon_acl_new = Icon(driver_name='fontawesome', symbol='plus') +icon_acl_new = Icon( + driver_name='fontawesome-dual', primary_symbol='lock', + secondary_symbol='plus' +) diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py index 8a12258448..e005235646 100644 --- a/mayan/apps/acls/links.py +++ b/mayan/apps/acls/links.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link -from .icons import icon_acl_list, icon_acl_new +from .icons import icon_acl_delete, icon_acl_list, icon_acl_new from .permissions import permission_acl_view, permission_acl_edit @@ -28,9 +28,9 @@ def get_kwargs_factory(variable_name): link_acl_delete = Link( - args='resolved_object.pk', permissions=(permission_acl_edit,), - permissions_related='content_object', tags='dangerous', text=_('Delete'), - view='acls:acl_delete', + args='resolved_object.pk', icon_class=icon_acl_delete, + permissions=(permission_acl_edit,), permissions_related='content_object', + tags='dangerous', text=_('Delete'), view='acls:acl_delete', ) link_acl_list = Link( icon_class=icon_acl_list, kwargs=get_kwargs_factory('resolved_object'),