summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar/blocks/window_field_multiple.html
diff options
context:
space:
mode:
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
commitf54d386b714f3a1abef103006e36972776d2028e (patch)
tree2cba33588e42ec214b3d30b4825e36e7c4e47b40 /ishtar_common/templates/ishtar/blocks/window_field_multiple.html
parent316dc98ccdee59d6d4709f2a9e253cc258b2037e (diff)
parentaef35a14f4bd3f3f87c1e19188d57cc66e6694b6 (diff)
downloadIshtar-f54d386b714f3a1abef103006e36972776d2028e.tar.bz2
Ishtar-f54d386b714f3a1abef103006e36972776d2028e.zip
Merge branch 'master-warehouse'
Diffstat (limited to 'ishtar_common/templates/ishtar/blocks/window_field_multiple.html')
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_field_multiple.html6
1 files changed, 2 insertions, 4 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html
index 30903b0d5..d1ee25c7b 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html
@@ -1,8 +1,6 @@
-{% load i18n %}
-{% if data.count %}<p><label>{% trans caption %}{% trans ":"%}</label>
+{% load i18n %}{% if data.count %}{% if li %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}{% trans ":"%}</label>
<span class='value'>{% for d in data.all %}
{% if forloop.counter0 %}, {% endif %}{{ d }}
{% endfor %}</span>
-</p>
+{% if li %}</li>{% else %}</p>{% endif %}
{% endif %}
-