diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 4a0917e..14c91e5 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -1105,6 +1105,10 @@ table .buttons { } } +img.preview { + height: 100px; +} + /** maps ***/ .leaflet-container { width: 100%; diff --git a/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html b/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html index 6d99bc6..ae92183 100644 --- a/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/duplicate-diff-inc.html @@ -23,11 +23,21 @@ {% for e in object.get_items_comparison %}

{% event_field_verbose_name e.key %}

{% if e.similar %} -
Identique : {% field_to_html e.values e.key %}
+
+ {% if e.key == "image" %}{% if object.get_duplicated.0.local_image %}{% endif %}{% endif %} +

Identique : {% field_to_html e.values e.key %}

+
{% else %}
{% for i in e.values %} -
{{ forloop.counter0|int_to_abc }}
{% field_to_html i e.key %}
+
+ {% if e.key == "image" %} + {% with object.get_duplicated|index:forloop.counter0 as event %} + {% if event.local_image %}
{% endif %} + {% endwith %} + {% endif %} +
{{ forloop.counter0|int_to_abc }}
{% field_to_html i e.key %} +
{% endfor %}
{% endif %} diff --git a/src/agenda_culturel/templatetags/utils_extra.py b/src/agenda_culturel/templatetags/utils_extra.py index d3c80a7..88a5109 100644 --- a/src/agenda_culturel/templatetags/utils_extra.py +++ b/src/agenda_culturel/templatetags/utils_extra.py @@ -122,4 +122,8 @@ def remove_id_prefix(value): @register.filter def tocoords(c): - return str(c.coords[1]) + ", " + str(c.coords[0]) \ No newline at end of file + return str(c.coords[1]) + ", " + str(c.coords[0]) + +@register.filter +def index(indexable, i): + return indexable[i] \ No newline at end of file