From 395b8564d4f128203ccee2da222011f24dcc8644 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 11 Sep 2012 04:23:06 -0400 Subject: [PATCH] Add password reset icon --- apps/icons/literals.py | 1 + apps/icons/sets/fat_cow.py | 1 + apps/user_management/icons.py | 3 ++- apps/user_management/links.py | 6 +++--- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/icons/literals.py b/apps/icons/literals.py index 8dbd921041..5cfecfc939 100644 --- a/apps/icons/literals.py +++ b/apps/icons/literals.py @@ -34,6 +34,7 @@ KEYBOARD = 'keyboard' LAYOUT = 'layout' LIGHTNING = 'lightning' LOCK = 'lock' +LOCK_EDIT = 'lock_edit' MAGNIFIER = 'magnifier' MEDAL_GOLD = 'medal_gold' MEDAL_GOLD_ADD = 'medal_gold_add' diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py index bc8fd9b4e6..ef7943670e 100644 --- a/apps/icons/sets/fat_cow.py +++ b/apps/icons/sets/fat_cow.py @@ -33,6 +33,7 @@ DICTIONARY = { LAYOUT: 'layout.png', LIGHTNING: 'lightning.png', LOCK: 'lock.png', + LOCK_EDIT: 'lock_edit.png', MAGNIFIER: 'magnifier.png', MEDAL_GOLD: 'medal_gold_1.png', MEDAL_GOLD_ADD: 'medal_gold_add.png', diff --git a/apps/user_management/icons.py b/apps/user_management/icons.py index f002dcc820..bf72997f8f 100644 --- a/apps/user_management/icons.py +++ b/apps/user_management/icons.py @@ -1,13 +1,14 @@ from __future__ import absolute_import from icons.literals import (USER, USER_ADD, USER_EDIT, USER_DELETE, - GROUP, GROUP_ADD, GROUP_EDIT, GROUP_DELETE) + GROUP, GROUP_ADD, GROUP_EDIT, GROUP_DELETE, LOCK_EDIT) from icons import Icon icon_user = Icon(USER) icon_user_add = Icon(USER_ADD) icon_user_edit = Icon(USER_EDIT) icon_user_delete = Icon(USER_DELETE) +icon_set_password = Icon(LOCK_EDIT) icon_group = Icon(GROUP) icon_group_add = Icon(GROUP_ADD) diff --git a/apps/user_management/links.py b/apps/user_management/links.py index 7db70ae3a2..acfc5b30d6 100644 --- a/apps/user_management/links.py +++ b/apps/user_management/links.py @@ -8,7 +8,7 @@ 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_group, icon_group_add, icon_group_edit, icon_group_delete, icon_set_password) 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_']) @@ -16,8 +16,8 @@ user_add = Link(text=_(u'create new user'), view='user_add', icon=icon_user_add, user_edit = Link(text=_(u'edit'), view='user_edit', args='object.id', icon=icon_user_edit, permissions=[PERMISSION_GROUP_EDIT]) user_delete = Link(text=_('delete'), view='user_delete', args='object.id', icon=icon_user_delete, permissions=[PERMISSION_GROUP_DELETE]) user_multiple_delete = Link(text=_('delete'), view='user_multiple_delete', icon=icon_user_delete, permissions=[PERMISSION_GROUP_DELETE]) -user_set_password = Link(text=_('reset password'), view='user_set_password', args='object.id', sprite='lock_edit', permissions=[PERMISSION_GROUP_EDIT]) -user_multiple_set_password = Link(text=_('reset password'), view='user_multiple_set_password', sprite='lock_edit', permissions=[PERMISSION_GROUP_EDIT]) +user_set_password = Link(text=_('reset password'), view='user_set_password', args='object.id', icon=icon_set_password, permissions=[PERMISSION_GROUP_EDIT]) +user_multiple_set_password = Link(text=_('reset password'), view='user_multiple_set_password', icon=icon_set_password, permissions=[PERMISSION_GROUP_EDIT]) group_list = Link(text=_(u'group list'), view='group_list', icon=icon_group, permissions=[PERMISSION_GROUP_VIEW]) group_setup = Link(text=_(u'groups'), view='group_list', icon=icon_group, permissions=[PERMISSION_GROUP_VIEW], children_view_regex=[r'^group_'])