diff --git a/apps/history/__init__.py b/apps/history/__init__.py index 06fb301735..8c17336f0e 100644 --- a/apps/history/__init__.py +++ b/apps/history/__init__.py @@ -2,8 +2,8 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ -from app_registry.models import App -from app_registry.classes import ModelBackup +#from app_registry.models import App +#from app_registry.classes import ModelBackup from common.utils import encapsulate from navigation.api import bind_links, register_model_list_columns from project_tools.api import register_tool @@ -31,10 +31,10 @@ register_model_list_columns(History, [ bind_links([History], [history_details]) -try: - app = App.register('history', _(u'History')) -except App.UnableToRegister: - pass -else: - app.set_backup([ModelBackup()]) - app.set_dependencies(['app_registry']) +#try: +# app = App.register('history', _(u'History')) +#except App.UnableToRegister: +# pass +#else: +# app.set_backup([ModelBackup()]) +# app.set_dependencies(['app_registry']) diff --git a/apps/history/icons.py b/apps/history/icons.py new file mode 100644 index 0000000000..7cf3e0a799 --- /dev/null +++ b/apps/history/icons.py @@ -0,0 +1,8 @@ +from __future__ import absolute_import + +from icons.literals import BOOK_OPEN, BOOK +from icons import Icon + +icon_history_list = Icon(BOOK) +icon_history_details = Icon(BOOK_OPEN) + diff --git a/apps/history/links.py b/apps/history/links.py index 7cb5dc6997..6e7ee1664d 100644 --- a/apps/history/links.py +++ b/apps/history/links.py @@ -5,6 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import Link from .permissions import PERMISSION_HISTORY_VIEW +from .icons import icon_history_list, icon_history_details -history_list = Link(text=_(u'history'), view='history_list', sprite='book', icon='book.png', permissions=[PERMISSION_HISTORY_VIEW], children_view_regex=[r'history_[l,v]']) -history_details = Link(text=_(u'details'), view='history_view', sprite='book_open', args='object.pk', permissions=[PERMISSION_HISTORY_VIEW]) +history_list = Link(text=_(u'history'), view='history_list', icon=icon_history_list, permissions=[PERMISSION_HISTORY_VIEW], children_view_regex=[r'history_[l,v]']) +history_details = Link(text=_(u'details'), view='history_view', icon=icon_history_details, args='object.pk', permissions=[PERMISSION_HISTORY_VIEW]) diff --git a/apps/icons/literals.py b/apps/icons/literals.py index 66106c4e94..bd77238c04 100644 --- a/apps/icons/literals.py +++ b/apps/icons/literals.py @@ -6,6 +6,8 @@ DEFAULT_ICON_SET = 'fat_cow' APPLICATION_VIEW_ICONS = 'application_view_icons' BLACKBOARD_SUM = 'blackboard_sum' +BOOK = 'book' +BOOK_OPEN = 'book_open' CD_BURN = 'cd_burn' COG = 'cog' COMPUTER_KEY = 'computer_key' diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py index 0f65a4cb21..d9738e32f2 100644 --- a/apps/icons/sets/fat_cow.py +++ b/apps/icons/sets/fat_cow.py @@ -9,6 +9,8 @@ LABEL = _(u'Fat cow') DICTIONARY = { APPLICATION_VIEW_ICONS: 'application_view_icons.png', BLACKBOARD_SUM: 'blackboard_sum.png', + BOOK: 'book.png', + BOOK_OPEN: 'book_open.png', CD_BURN: 'cd_burn.png', COG: 'cog.png', COMPUTER_KEY: 'computer_key.png',