From e9cba726a6da96859fc916c3545f6ea8c9d9a0e0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 11 Sep 2012 04:26:20 -0400 Subject: [PATCH] Add group members icon --- apps/icons/literals.py | 1 + apps/icons/sets/fat_cow.py | 1 + apps/user_management/icons.py | 3 ++- apps/user_management/links.py | 5 +++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/icons/literals.py b/apps/icons/literals.py index 5cfecfc939..309a23e5ff 100644 --- a/apps/icons/literals.py +++ b/apps/icons/literals.py @@ -25,6 +25,7 @@ GROUP_ADD = 'group_add' GROUP_EDIT = 'group_edit' GROUP_DELETE = 'group_delete' GROUP_KEY = 'group_key' +GROUP_LINK = 'group_link' INFORMATION = 'information' KEY = 'key' KEY_GO = 'key_go' diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py index ef7943670e..ed664c4d5a 100644 --- a/apps/icons/sets/fat_cow.py +++ b/apps/icons/sets/fat_cow.py @@ -24,6 +24,7 @@ DICTIONARY = { GROUP_EDIT: 'group_edit.png', GROUP_DELETE: 'group_delete.png', GROUP_KEY: 'group_key.png', + GROUP_LINK: 'group_link.png', INFORMATION: 'information.png', KEY: 'key.png', KEY_GO: 'key_go.png', diff --git a/apps/user_management/icons.py b/apps/user_management/icons.py index bf72997f8f..e4d01edf53 100644 --- a/apps/user_management/icons.py +++ b/apps/user_management/icons.py @@ -1,7 +1,7 @@ from __future__ import absolute_import from icons.literals import (USER, USER_ADD, USER_EDIT, USER_DELETE, - GROUP, GROUP_ADD, GROUP_EDIT, GROUP_DELETE, LOCK_EDIT) + GROUP, GROUP_ADD, GROUP_EDIT, GROUP_DELETE, LOCK_EDIT, GROUP_LINK) from icons import Icon icon_user = Icon(USER) @@ -14,3 +14,4 @@ icon_group = Icon(GROUP) icon_group_add = Icon(GROUP_ADD) icon_group_edit = Icon(GROUP_EDIT) icon_group_delete = Icon(GROUP_DELETE) +icon_group_members = Icon(GROUP_LINK) diff --git a/apps/user_management/links.py b/apps/user_management/links.py index acfc5b30d6..4bb31d669c 100644 --- a/apps/user_management/links.py +++ b/apps/user_management/links.py @@ -8,7 +8,8 @@ from .permissions import (PERMISSION_GROUP_CREATE, PERMISSION_GROUP_EDIT, PERMISSION_GROUP_VIEW, PERMISSION_GROUP_DELETE, PERMISSION_GROUP_CREATE, PERMISSION_GROUP_EDIT, PERMISSION_GROUP_VIEW, PERMISSION_GROUP_DELETE) from .icons import (icon_user, icon_user_add, icon_user_edit, icon_user_delete, - icon_group, icon_group_add, icon_group_edit, icon_group_delete, icon_set_password) + icon_group, icon_group_add, icon_group_edit, icon_group_delete, icon_set_password, + icon_group_members) user_list = Link(text=_(u'user list'), view='user_list', icon=icon_user, permissions=[PERMISSION_GROUP_VIEW]) user_setup = Link(text=_(u'users'), view='user_list', icon=icon_user, permissions=[PERMISSION_GROUP_VIEW], children_view_regex=[r'^user_']) @@ -25,4 +26,4 @@ group_add = Link(text=_(u'create new group'), view='group_add', icon=icon_group_ group_edit = Link(text=_(u'edit'), view='group_edit', args='object.id', icon=icon_group_edit, permissions=[PERMISSION_GROUP_EDIT]) group_delete = Link(text=_('delete'), view='group_delete', args='object.id', icon=icon_group_delete, permissions=[PERMISSION_GROUP_DELETE]) group_multiple_delete = Link(text=_('delete'), view='group_multiple_delete', icon=icon_group_delete, permissions=[PERMISSION_GROUP_DELETE]) -group_members = Link(text=_(u'members'), view='group_members', args='object.id', sprite='group_link', permissions=[PERMISSION_GROUP_EDIT]) +group_members = Link(text=_(u'members'), view='group_members', args='object.id', icon=icon_group_members, permissions=[PERMISSION_GROUP_EDIT])