diff --git a/apps/common/icons.py b/apps/common/icons.py index 5b2f89cd13..90f824cccb 100644 --- a/apps/common/icons.py +++ b/apps/common/icons.py @@ -1,11 +1,12 @@ from __future__ import absolute_import from icons.literals import (CROSS, TICK, COMPUTER_KEY, VCARD, VCARD_EDIT, - INFORMATION, SCRIPT, KEYBOARD, ADD, DELETE) + INFORMATION, SCRIPT, KEYBOARD, ADD, DELETE, RESULTSET_PREVIOUS) from icons import Icon icon_cross = Icon(CROSS) icon_tick = Icon(TICK) +icon_resultset_previous = Icon(RESULTSET_PREVIOUS) icon_password_change = Icon(COMPUTER_KEY) icon_current_user_details = Icon(VCARD) diff --git a/apps/common/templates/generic_form_subtemplate.html b/apps/common/templates/generic_form_subtemplate.html index df7a788f50..8cf4257e14 100644 --- a/apps/common/templates/generic_form_subtemplate.html +++ b/apps/common/templates/generic_form_subtemplate.html @@ -79,7 +79,7 @@ {% if submit_icon %} {{ submit_icon.display_small }} {% else %} - {{ submit_icon_default.display_small }} + {{ icon_submit_default.display_small }} {% endif %} {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}{% endif %} @@ -90,7 +90,7 @@ {% if cancel_icon %} {{ cancel_icon.display_small }} {% else %} - {{ cancel_icon_default.display_small }} + {{ icon_cancel_default.display_small }} {% endif %} {% if cancel_label %}{{ cancel_label }}{% else %}{% trans "Cancel" %}{% endif %} diff --git a/apps/common/templatetags/default_icons.py b/apps/common/templatetags/default_icons.py index 6af97388bb..008ba7ffa7 100644 --- a/apps/common/templatetags/default_icons.py +++ b/apps/common/templatetags/default_icons.py @@ -1,12 +1,13 @@ from django.template import Library -from common.icons import icon_tick, icon_cross +from common.icons import icon_tick, icon_cross, icon_resultset_previous register = Library() @register.simple_tag(takes_context=True) def default_icons(context): - context['submit_icon_default'] = icon_tick - context['cancel_icon_default'] = icon_cross + context['icon_submit_default'] = icon_tick + context['icon_cancel_default'] = icon_cross + context['icon_current_link'] = icon_resultset_previous return u''