From 7ccb3cc152ca47d4bc03aaab984d55205b97b111 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 29 Sep 2012 01:04:52 -0400 Subject: [PATCH] Switch trash app to composed icon method, changed 'can' wording to 'bin' --- apps/trash/icons.py | 8 ++++---- apps/trash/links.py | 2 +- apps/trash/registry.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/trash/icons.py b/apps/trash/icons.py index 4f0da24e70..49da086eb6 100644 --- a/apps/trash/icons.py +++ b/apps/trash/icons.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from icons.literals import BIN_CLOSED, BIN, BIN_EMPTY, DELETE +from icons.literals import BIN_MULTIPLE, BIN, BIN_EMPTY, BIN_RECYCLE, BIN_EMPTY_OUT from icons import Icon -icon_trash_cans = Icon(BIN_CLOSED) +icon_trash_cans = Icon(BIN_MULTIPLE) icon_trash_can_items = Icon(BIN) -icon_trash_can_item_restore = Icon(BIN_EMPTY) -icon_trash_can_item_delete = Icon(DELETE) +icon_trash_can_item_restore = Icon(BIN_RECYCLE) +icon_trash_can_item_delete = Icon(BIN_EMPTY_OUT) diff --git a/apps/trash/links.py b/apps/trash/links.py index 82a2af302e..dba896a8bd 100644 --- a/apps/trash/links.py +++ b/apps/trash/links.py @@ -7,7 +7,7 @@ from navigation import Link from .icons import (icon_trash_cans, icon_trash_can_items, icon_trash_can_item_restore, icon_trash_can_item_delete) -trash_can_list = Link(text=_(u'trash cans'), view='trash_can_list', icon=icon_trash_cans) +trash_can_list = Link(text=_(u'trash bins'), view='trash_can_list', icon=icon_trash_cans) trash_can_items = Link(text=_(u'items'), view='trash_can_items', args='trash_can.pk', icon=icon_trash_can_items) trash_can_item_restore = Link(text=_(u'restore'), view='trash_can_item_restore', args='trash_can_item.pk', icon=icon_trash_can_item_restore) trash_can_item_delete = Link(text=_(u'delete'), view='trash_can_item_delete', args='trash_can_item.pk', icon=icon_trash_can_item_delete) diff --git a/apps/trash/registry.py b/apps/trash/registry.py index 4af898d78d..635d53fe44 100644 --- a/apps/trash/registry.py +++ b/apps/trash/registry.py @@ -6,7 +6,7 @@ from .icons import icon_trash_cans from .links import trash_can_list label = _(u'Trash manager') -description = _(u'Provides a generic and reusable trash can.') +description = _(u'Provides a generic and reusable trash bin.') icon = icon_trash_cans dependencies = ['app_registry', 'icons', 'documents', 'permissions', 'navigation', 'documents', 'tags', 'folders'] tool_links = [trash_can_list]