From 9eafd7d3e119c6958b155373a87ccda241e3e0d2 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 5 Sep 2012 14:09:50 -0400 Subject: [PATCH] Update acl to new icon app --- apps/acls/icons.py | 14 ++++++++++++++ apps/acls/links.py | 5 +++-- apps/permissions/icons.py | 8 ++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 apps/acls/icons.py create mode 100644 apps/permissions/icons.py diff --git a/apps/acls/icons.py b/apps/acls/icons.py new file mode 100644 index 0000000000..a3020412a4 --- /dev/null +++ b/apps/acls/icons.py @@ -0,0 +1,14 @@ +from __future__ import absolute_import + +from icons.literals import LOCK +from icons import Icon + +icon_acl = Icon(LOCK) +#icon_acl_detail = Icon(USER_ADD) +#icon_acl_grant = Icon(USER_EDIT) +#icon_acl_revoke = Icon(USER_DELETE) + +#icon_group = Icon(GROUP) +#icon_group_add = Icon(GROUP_ADD) +##icon_group_edit = Icon(GROUP_EDIT) +#icon_group_delete = Icon(GROUP_DELETE) diff --git a/apps/acls/links.py b/apps/acls/links.py index 9c18c6f82d..fa7b612b36 100644 --- a/apps/acls/links.py +++ b/apps/acls/links.py @@ -6,14 +6,15 @@ from navigation.api import Link from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL, ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL) +from .icons import icon_acl -acl_list = Link(text=_(u'ACLs'), view='acl_list', sprite='lock', permissions=[ACLS_VIEW_ACL]) +acl_list = Link(text=_(u'ACLs'), view='acl_list', icon=icon_acl, permissions=[ACLS_VIEW_ACL]) acl_detail = Link(text=_(u'details'), view='acl_detail', args=['access_object.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_VIEW_ACL]) acl_grant = Link(text=_(u'grant'), view='acl_multiple_grant', sprite='key_add', permissions=[ACLS_EDIT_ACL]) acl_revoke = Link(text=_(u'revoke'), view='acl_multiple_revoke', sprite='key_delete', permissions=[ACLS_EDIT_ACL]) acl_holder_new = Link(text=_(u'New holder'), view='acl_holder_new', args='access_object.gid', sprite='user', permissions=[ACLS_EDIT_ACL]) -acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon='lock.png', permissions=[ACLS_CLASS_VIEW_ACL]) # 'children_view_regex=[r'^acl_class', r'^acl_setup']} +acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon=icon_acl, permissions=[ACLS_CLASS_VIEW_ACL]) # 'children_view_regex=[r'^acl_class', r'^acl_setup']} acl_class_list = Link(text=_(u'List of classes'), view='acl_setup_valid_classes', sprite='package', permissions=[ACLS_CLASS_VIEW_ACL]) acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', sprite='lock_go', permissions=[ACLS_CLASS_VIEW_ACL]) acl_class_acl_detail = Link(text=_(u'details'), view='acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_CLASS_VIEW_ACL]) diff --git a/apps/permissions/icons.py b/apps/permissions/icons.py new file mode 100644 index 0000000000..8799c26410 --- /dev/null +++ b/apps/permissions/icons.py @@ -0,0 +1,8 @@ +from __future__ import absolute_import + +from icons.literals import MEDAL_GOLD, MEDAL_GOLD_ADD, MEDAL_GOLD_DELETE +from icons import Icon + +icon_role = Icon(MEDAL_GOLD) +icon_role_add = Icon(MEDAL_GOLD_ADD) +icon_role_delete = Icon(MEDAL_GOLD_DELETE)