matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert current selected link to new icon system

Browse Source
This commit is contained in:
Roberto Rosario
2012-09-24 17:36:35 -04:00
parent 5982c1b2ee
commit b74245979e
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/common/icons.py
+2 -1
View File
@@ -1,11 +1,12 @@
from __future__ import absolute_import from __future__ import absolute_import
from icons.literals import (CROSS, TICK, COMPUTER_KEY, VCARD, VCARD_EDIT, 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 from icons import Icon
icon_cross = Icon(CROSS) icon_cross = Icon(CROSS)
icon_tick = Icon(TICK) icon_tick = Icon(TICK)
icon_resultset_previous = Icon(RESULTSET_PREVIOUS)
icon_password_change = Icon(COMPUTER_KEY) icon_password_change = Icon(COMPUTER_KEY)
icon_current_user_details = Icon(VCARD) icon_current_user_details = Icon(VCARD)
apps/common/templates/generic_form_subtemplate.html
+2 -2
View File
@@ -79,7 +79,7 @@
{% if submit_icon %} {% if submit_icon %}
{{ submit_icon.display_small }} {{ submit_icon.display_small }}
{% else %} {% else %}
{{ submit_icon_default.display_small }} {{ icon_submit_default.display_small }}
{% endif %} {% endif %}
{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}{% endif %} {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}{% endif %}
@@ -90,7 +90,7 @@
{% if cancel_icon %} {% if cancel_icon %}
{{ cancel_icon.display_small }} {{ cancel_icon.display_small }}
{% else %} {% else %}
{{ cancel_icon_default.display_small }} {{ icon_cancel_default.display_small }}
{% endif %} {% endif %}
{% if cancel_label %}{{ cancel_label }}{% else %}{% trans "Cancel" %}{% endif %} {% if cancel_label %}{{ cancel_label }}{% else %}{% trans "Cancel" %}{% endif %}
apps/common/templatetags/default_icons.py
+4 -3
View File
@@ -1,12 +1,13 @@
from django.template import Library 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 = Library()
@register.simple_tag(takes_context=True) @register.simple_tag(takes_context=True)
def default_icons(context): def default_icons(context):
context['submit_icon_default'] = icon_tick context['icon_submit_default'] = icon_tick
context['cancel_icon_default'] = icon_cross context['icon_cancel_default'] = icon_cross
context['icon_current_link'] = icon_resultset_previous
return u'' return u''