From fe2d57e2f3aa1532645a572e548a5d38c34de2b6 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 29 Sep 2012 01:11:25 -0400 Subject: [PATCH] Swtich to composed icons --- apps/permissions/icons.py | 3 ++- apps/permissions/links.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/permissions/icons.py b/apps/permissions/icons.py index 3475b9b2e1..86582c8b99 100644 --- a/apps/permissions/icons.py +++ b/apps/permissions/icons.py @@ -1,11 +1,12 @@ from __future__ import absolute_import from icons.literals import (MEDAL_GOLD, MEDAL_GOLD_ADD, MEDAL_GOLD_DELETE, - GROUP_KEY, KEY_GO, KEY_ADD, KEY_DELETE) + MEDAL_GOLD_EDIT, GROUP_KEY, KEY_GO, KEY_ADD, KEY_DELETE) from icons import Icon icon_role = Icon(MEDAL_GOLD) icon_role_add = Icon(MEDAL_GOLD_ADD) +icon_role_edit = Icon(MEDAL_GOLD_EDIT) icon_role_delete = Icon(MEDAL_GOLD_DELETE) icon_role_members = Icon(GROUP_KEY) diff --git a/apps/permissions/links.py b/apps/permissions/links.py index 5a7ed45c87..2346ab9ddb 100644 --- a/apps/permissions/links.py +++ b/apps/permissions/links.py @@ -7,12 +7,12 @@ from navigation import Link from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE) -from .icons import (icon_role, icon_role_add, icon_role_delete, icon_permissions, - icon_permission_grant, icon_permission_revoke, icon_role_members) +from .icons import (icon_role, icon_role_add, icon_role_delete, icon_role_edit, + icon_permissions, icon_permission_grant, icon_permission_revoke, icon_role_members) role_list = Link(text=_(u'roles'), view='role_list', icon=icon_role, permissions=[PERMISSION_ROLE_VIEW])#, 'children_view_regex': [r'^permission_', r'^role_']) role_create = Link(text=_(u'create new role'), view='role_create', icon=icon_role_add, permissions=[PERMISSION_ROLE_CREATE]) -role_edit = Link(text=_(u'edit'), view='role_edit', args='object.id', icon=icon_role, permissions=[PERMISSION_ROLE_EDIT]) +role_edit = Link(text=_(u'edit'), view='role_edit', args='object.id', icon=icon_role_edit, permissions=[PERMISSION_ROLE_EDIT]) role_members = Link(text=_(u'members'), view='role_members', args='object.id', icon=icon_role_members, permissions=[PERMISSION_ROLE_EDIT]) role_permissions = Link(text=_(u'role permissions'), view='role_permissions', args='object.id', icon=icon_permissions, permissions=[PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]) role_delete = Link(text=_(u'delete'), view='role_delete', args='object.id', icon=icon_role_delete, permissions=[PERMISSION_ROLE_DELETE])