From 86f2ed56e02f49eec22d4bcd01bae67a60230d25 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 8 Sep 2012 02:54:08 -0400 Subject: [PATCH] Update the diagnostics, maintenance and statistics apps icons --- apps/diagnostics/icons.py | 8 ++++++++ apps/diagnostics/links.py | 6 ++++-- apps/icons/literals.py | 5 +++++ apps/icons/sets/fat_cow.py | 5 +++++ apps/maintenance/icons.py | 8 ++++++++ apps/maintenance/links.py | 6 ++++-- apps/statistics/icons.py | 7 +++++++ apps/statistics/links.py | 4 +++- 8 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 apps/diagnostics/icons.py create mode 100644 apps/maintenance/icons.py create mode 100644 apps/statistics/icons.py diff --git a/apps/diagnostics/icons.py b/apps/diagnostics/icons.py new file mode 100644 index 0000000000..52a4f1beee --- /dev/null +++ b/apps/diagnostics/icons.py @@ -0,0 +1,8 @@ +from __future__ import absolute_import + +from icons.literals import PILL, LIGHTNING +from icons import Icon + +icon_diagnostic = Icon(PILL) +icon_diagnostic_execute = Icon(LIGHTNING) + diff --git a/apps/diagnostics/links.py b/apps/diagnostics/links.py index 1d947fddff..cc622edd94 100644 --- a/apps/diagnostics/links.py +++ b/apps/diagnostics/links.py @@ -4,5 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import Link -diagnostic_list = Link(text=_(u'diagnostics'), view='diagnostic_list', icon='pill.png', sprite='pill') -diagnostic_execute = Link(text=_(u'execute'), view='diagnostic_execute', args='object.id', sprite='lightning') +from .icons import icon_diagnostic, icon_diagnostic_execute + +diagnostic_list = Link(text=_(u'diagnostics'), view='diagnostic_list', icon=icon_diagnostic) +diagnostic_execute = Link(text=_(u'execute'), view='diagnostic_execute', args='object.id', icon=icon_diagnostic_execute) diff --git a/apps/icons/literals.py b/apps/icons/literals.py index cb0d5c0908..66106c4e94 100644 --- a/apps/icons/literals.py +++ b/apps/icons/literals.py @@ -5,6 +5,7 @@ DEFAULT_ICON_SET = 'fat_cow' APPLICATION_VIEW_ICONS = 'application_view_icons' +BLACKBOARD_SUM = 'blackboard_sum' CD_BURN = 'cd_burn' COG = 'cog' COMPUTER_KEY = 'computer_key' @@ -22,13 +23,17 @@ KEY_GO = 'key_go' KEY_ADD = 'key_add' KEY_DELETE = 'key_delete' KEYBOARD = 'keyboard' +LIGHTNING = 'lightning' LOCK = 'lock' MEDAL_GOLD = 'medal_gold' MEDAL_GOLD_ADD = 'medal_gold_add' MEDAL_GOLD_DELETE = 'medal_gold_delete' PICTURES = 'pictures' +PILL = 'pill' PLUGIN = 'plugin' +RAINBOW = 'rainbow' SCRIPT = 'script' +TABLE = 'table' TICK = 'tick' USER = 'user' USER_ADD = 'user_add' diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py index b4bd59ed17..0f65a4cb21 100644 --- a/apps/icons/sets/fat_cow.py +++ b/apps/icons/sets/fat_cow.py @@ -8,6 +8,7 @@ LABEL = _(u'Fat cow') DICTIONARY = { APPLICATION_VIEW_ICONS: 'application_view_icons.png', + BLACKBOARD_SUM: 'blackboard_sum.png', CD_BURN: 'cd_burn.png', COG: 'cog.png', COMPUTER_KEY: 'computer_key.png', @@ -25,12 +26,16 @@ DICTIONARY = { KEY_ADD: 'key_add.png', KEY_DELETE: 'key_delete.png', KEYBOARD: 'keyboard.png', + LIGHTNING: 'lightning.png', MEDAL_GOLD: 'medal_gold_1.png', MEDAL_GOLD_ADD: 'medal_gold_add.png', MEDAL_GOLD_DELETE: 'medal_gold_delete.png', PICTURES: 'pictures.png', + PILL: 'pill.png', PLUGIN: 'plugin.png', + RAINBOW: 'rainbow.png', SCRIPT: 'script.png', + TABLE: 'table.png', TICK: 'tick.png', USER: 'user.png', USER_ADD:'user_add.png', diff --git a/apps/maintenance/icons.py b/apps/maintenance/icons.py new file mode 100644 index 0000000000..74b751c039 --- /dev/null +++ b/apps/maintenance/icons.py @@ -0,0 +1,8 @@ +from __future__ import absolute_import + +from icons.literals import RAINBOW, LIGHTNING +from icons import Icon + +icon_maintenance_menu = Icon(RAINBOW) +icon_maintenance_execute = Icon(LIGHTNING) + diff --git a/apps/maintenance/links.py b/apps/maintenance/links.py index faa90660ea..386861f558 100644 --- a/apps/maintenance/links.py +++ b/apps/maintenance/links.py @@ -4,5 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import Link -maintenance_menu = Link(text=_(u'maintenance tools'), view='maintenance_menu', icon='rainbow.png', sprite='rainbow') -maintenance_execute = Link(text=_(u'execute'), view='maintenance_execute', args='object.id', sprite='lightning') +from .icons import icon_maintenance_menu, icon_maintenance_execute + +maintenance_menu = Link(text=_(u'maintenance tools'), view='maintenance_menu', icon=icon_maintenance_menu) +maintenance_execute = Link(text=_(u'execute'), view='maintenance_execute', args='object.id', icon=icon_maintenance_execute) diff --git a/apps/statistics/icons.py b/apps/statistics/icons.py new file mode 100644 index 0000000000..21603fa764 --- /dev/null +++ b/apps/statistics/icons.py @@ -0,0 +1,7 @@ +from __future__ import absolute_import + +from icons.literals import BLACKBOARD_SUM +from icons import Icon + +icon_statistics = Icon(BLACKBOARD_SUM) + diff --git a/apps/statistics/links.py b/apps/statistics/links.py index b18372d914..453f476209 100644 --- a/apps/statistics/links.py +++ b/apps/statistics/links.py @@ -4,9 +4,11 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import Link +from .icons import icon_statistics + def is_superuser(context): return context['request'].user.is_staff or context['request'].user.is_superuser -statistics_link = Link(text=_(u'statistics'), view='statistics', sprite='table', icon='blackboard_sum.png', condition=is_superuser, children_view_regex=[r'statistics']) +statistics_link = Link(text=_(u'statistics'), view='statistics', icon=icon_statistics, condition=is_superuser, children_view_regex=[r'statistics'])