From 81a663faf6a1cd71172e8262485c0a5ca8f8a12a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 24 Oct 2015 15:00:57 +0200 Subject: Templates: Optional pre et post data string for window_field templatetag --- ishtar_common/templates/ishtar/blocks/window_field.html | 2 +- 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 %}

-{{data}}

{% endif%} +{{pre_data|safe}}{{data}}{{post_data|safe}}

{% 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') -- cgit v1.2.3