diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-10-24 15:00:57 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-10-24 15:00:57 +0200 |
| commit | 81a663faf6a1cd71172e8262485c0a5ca8f8a12a (patch) | |
| tree | 636355895ee5b1d7168b28132407b44a14055cf0 | |
| parent | c842c1644d29ebfc73218deb06e585cb2d519972 (diff) | |
| download | Ishtar-81a663faf6a1cd71172e8262485c0a5ca8f8a12a.tar.bz2 Ishtar-81a663faf6a1cd71172e8262485c0a5ca8f8a12a.zip | |
Templates: Optional pre et post data string for window_field templatetag
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_field.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templatetags/window_field.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_field.html b/ishtar_common/templates/ishtar/blocks/window_field.html index 9b2bc6540..bca32225c 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field.html +++ b/ishtar_common/templates/ishtar/blocks/window_field.html @@ -1,3 +1,3 @@ {% load i18n %} {% if data %}<p><label>{% trans caption %}{% trans ":"%}</label> -<span class='value'>{{data}}</span></p>{% endif%} +<span class='value'>{{pre_data|safe}}{{data}}{{post_data|safe}}</span></p>{% endif%} diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py index 65825ccf8..4a764166a 100644 --- a/ishtar_common/templatetags/window_field.py +++ b/ishtar_common/templatetags/window_field.py @@ -4,8 +4,9 @@ register = template.Library() @register.inclusion_tag('ishtar/blocks/window_field.html') -def field(caption, data): - return {'caption': caption, 'data': data} +def field(caption, data, pre_data='', post_data=''): + return {'caption': caption, 'data': data, "pre_data": pre_data, + 'post_data': post_data} @register.inclusion_tag('ishtar/blocks/window_field_multiple.html') |