diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-08 18:13:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-08 18:13:35 +0200 |
| commit | f54d386b714f3a1abef103006e36972776d2028e (patch) | |
| tree | 2cba33588e42ec214b3d30b4825e36e7c4e47b40 /ishtar_common/templates/ishtar/blocks/window_field.html | |
| parent | 316dc98ccdee59d6d4709f2a9e253cc258b2037e (diff) | |
| parent | aef35a14f4bd3f3f87c1e19188d57cc66e6694b6 (diff) | |
| download | Ishtar-f54d386b714f3a1abef103006e36972776d2028e.tar.bz2 Ishtar-f54d386b714f3a1abef103006e36972776d2028e.zip | |
Merge branch 'master-warehouse'
Diffstat (limited to 'ishtar_common/templates/ishtar/blocks/window_field.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_field.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_field.html b/ishtar_common/templates/ishtar/blocks/window_field.html index 14cf1c21e..969f32dbb 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'>{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe}}</span></p>{% endif%} +{% load i18n %}{% if data %}{% if li %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}{% trans ":"%}</label> +<span class='value'>{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe}}</span>{% if li %}</li>{% else %}</p>{% endif %} +{% endif %} |