diff --git a/templates/web/common/dialog_export.twig b/templates/web/common/dialog_export.twig index b8ac0a0b45..af6d714524 100644 --- a/templates/web/common/dialog_export.twig +++ b/templates/web/common/dialog_export.twig @@ -121,7 +121,7 @@ {% endif %} @@ -188,7 +188,7 @@ {% endif %} @@ -349,7 +349,7 @@ {% endif %} @@ -409,7 +409,7 @@ {% endif %} diff --git a/templates/web/common/preview.html b/templates/web/common/preview.html index cadcdec94f..03ab13df08 100644 --- a/templates/web/common/preview.html +++ b/templates/web/common/preview.html @@ -18,4 +18,4 @@ {% set width = preview_obj.get_width() %} {% set height = preview_obj.get_height() %} -{{ thumbnail.format(preview_obj, preview_obj.get_width(), preview_obj.get_height(), '', session, wrap) }} +{{ thumbnail.format(preview_obj, preview_obj.get_width(), preview_obj.get_height(), '', session, wrap, false) }} diff --git a/templates/web/common/thumbnail.html b/templates/web/common/thumbnail.html index f02eb15ffa..abad445978 100644 --- a/templates/web/common/thumbnail.html +++ b/templates/web/common/thumbnail.html @@ -1,4 +1,4 @@ -{% macro format(thumbnail, b_w, b_h, extraclass, session, wrap)%} +{% macro format(thumbnail, b_w, b_h, extraclass, session, wrap, lazyload)%} {% set record_type = thumbnail.get_type() %} @@ -94,7 +94,7 @@ {% set url = url ~ '?tag=' ~ thumbnail.getEtag() %} + src="{% if lazyload %}/skins/grey.gif{% else %}{{ url }}{% endif %}" data-original="{{ url }}" ondragstart="return false;"> {% endif %} diff --git a/templates/web/lightbox/IE6/feed.twig b/templates/web/lightbox/IE6/feed.twig index 25c56cb03d..4f607f4713 100644 --- a/templates/web/lightbox/IE6/feed.twig +++ b/templates/web/lightbox/IE6/feed.twig @@ -43,7 +43,7 @@
{% if first_item %} {% set preview = first_item.get_record().get_preview() %} - {{thumbnail.format(preview, preview.get_width(), preview.get_height(),'',session, false)}} + {{thumbnail.format(preview, preview.get_width(), preview.get_height(),'',session, false, false)}} {% endif %}
diff --git a/templates/web/lightbox/IE6/feed_container.twig b/templates/web/lightbox/IE6/feed_container.twig index 13b2e2347c..12406556d0 100644 --- a/templates/web/lightbox/IE6/feed_container.twig +++ b/templates/web/lightbox/IE6/feed_container.twig @@ -6,7 +6,7 @@
{{element.get_ord()}}
- {{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', session, true)}} + {{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', session, true, false)}} diff --git a/templates/web/lightbox/IE6/index.twig b/templates/web/lightbox/IE6/index.twig index 387e2d6f45..a00e281396 100644 --- a/templates/web/lightbox/IE6/index.twig +++ b/templates/web/lightbox/IE6/index.twig @@ -41,7 +41,7 @@ {% if basket_length > 0%} - {{thumbnail.format(basket.getELements().first().getRecord().get_thumbnail, 170, 170, '', session, true)}} + {{thumbnail.format(basket.getELements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {% endif %} @@ -106,7 +106,7 @@ {% if basket_length > 0%} - {{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true)}} + {{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {% endif %} diff --git a/templates/web/lightbox/IE6/sc_container.twig b/templates/web/lightbox/IE6/sc_container.twig index d9a827daaf..6c63f7a94c 100644 --- a/templates/web/lightbox/IE6/sc_container.twig +++ b/templates/web/lightbox/IE6/sc_container.twig @@ -14,7 +14,7 @@ class="disagree_button {%if element.getUserValidationDatas(user).getAgreement() == true or element.getUserValidationDatas(user).getAgreement() is null %}not_decided{%endif%} disagree_{{element.getId()}}" />
{% endif %} - {{thumbnail.format(element.getRecord().get_thumbnail,114,85, '', session, true)}} + {{thumbnail.format(element.getRecord().get_thumbnail,114,85, '', session, true, false)}} diff --git a/templates/web/lightbox/IE6/validate.twig b/templates/web/lightbox/IE6/validate.twig index 18b449485e..6523eb960d 100644 --- a/templates/web/lightbox/IE6/validate.twig +++ b/templates/web/lightbox/IE6/validate.twig @@ -50,7 +50,7 @@ {% set width = bask_prev.get_width() %} {% set height = bask_prev.get_height() %} - {{ thumbnail.format(bask_prev, width,height, '', session, false) }} + {{ thumbnail.format(bask_prev, width,height, '', session, false, false) }} {% endif %} {% include 'lightbox/selector_box.twig' %} diff --git a/templates/web/lightbox/basket_content_report.twig b/templates/web/lightbox/basket_content_report.twig index eb598a7b3a..0957a20362 100644 --- a/templates/web/lightbox/basket_content_report.twig +++ b/templates/web/lightbox/basket_content_report.twig @@ -14,7 +14,7 @@
{{basket_element.getOrd()}}
- {{thumbnail.format(record.get_thumbnail(),165, 125, '', session, true)}} + {{thumbnail.format(record.get_thumbnail(),165, 125, '', session, true, false)}} diff --git a/templates/web/lightbox/feed.twig b/templates/web/lightbox/feed.twig index 4e99cced53..e9d38641dc 100644 --- a/templates/web/lightbox/feed.twig +++ b/templates/web/lightbox/feed.twig @@ -46,7 +46,7 @@
{% if first_item %} {% set bask_prev = first_item.get_record().get_preview() %} - {{thumbnail.format(bask_prev,bask_prev.get_width(),bask_prev.get_height(),'',session, false)}} + {{thumbnail.format(bask_prev,bask_prev.get_width(),bask_prev.get_height(),'',session, false, false)}} {% endif %}
diff --git a/templates/web/lightbox/feed_container.twig b/templates/web/lightbox/feed_container.twig index 13b2e2347c..12406556d0 100644 --- a/templates/web/lightbox/feed_container.twig +++ b/templates/web/lightbox/feed_container.twig @@ -6,7 +6,7 @@
{{element.get_ord()}}
- {{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', session, true)}} + {{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', session, true, false)}} diff --git a/templates/web/lightbox/index.twig b/templates/web/lightbox/index.twig index 35568a3cac..443a57043a 100644 --- a/templates/web/lightbox/index.twig +++ b/templates/web/lightbox/index.twig @@ -42,7 +42,7 @@ {% if basket_length > 0%} - {{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true)}} + {{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {% endif %} @@ -107,7 +107,7 @@ {% if basket_length > 0%} - {{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true)}} + {{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {% endif %} diff --git a/templates/web/lightbox/sc_container.twig b/templates/web/lightbox/sc_container.twig index 6baf0cc0e8..07b71ba313 100644 --- a/templates/web/lightbox/sc_container.twig +++ b/templates/web/lightbox/sc_container.twig @@ -15,7 +15,7 @@ class="disagree_button {%if element.getUserValidationDatas(user).getAgreement() == true or element.getUserValidationDatas(user).getAgreement() is null %}not_decided{%endif%} disagree_{{element.getId()}}" />
{% endif %} - {{thumbnail.format(element.getRecord().get_thumbnail,114,85, '', session, true)}} + {{thumbnail.format(element.getRecord().get_thumbnail,114,85, '', session, true, false)}} diff --git a/templates/web/lightbox/validate.twig b/templates/web/lightbox/validate.twig index 0f2d931f5e..8912d53c99 100644 --- a/templates/web/lightbox/validate.twig +++ b/templates/web/lightbox/validate.twig @@ -58,7 +58,7 @@ {% set width = bask_prev.get_width() %} {% set height = bask_prev.get_height() %} - {{ thumbnail.format(bask_prev, width,height, '', session, false) }} + {{ thumbnail.format(bask_prev, width,height, '', session, false, false) }} {% endif %} {% include 'lightbox/selector_box.twig' %} diff --git a/templates/web/overview.twig b/templates/web/overview.twig index 6a5d704520..bde04631f5 100644 --- a/templates/web/overview.twig +++ b/templates/web/overview.twig @@ -83,7 +83,7 @@ {% import 'common/thumbnail.html' as thumbnail %} {% set subdef = record.get_subdef(subdef_name) %} - {{ thumbnail.format(subdef, subdef.get_width(), subdef.get_height(), '', session, true) }} + {{ thumbnail.format(subdef, subdef.get_width(), subdef.get_height(), '', session, true, false) }}
{% include 'common/caption.html' %} diff --git a/templates/web/prod/Baskets/Reorder.html.twig b/templates/web/prod/Baskets/Reorder.html.twig index f685bce94c..4784ddfe84 100644 --- a/templates/web/prod/Baskets/Reorder.html.twig +++ b/templates/web/prod/Baskets/Reorder.html.twig @@ -21,7 +21,7 @@
{{ element.getRecord().get_title() }} - {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80, '', session) }} + {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80, '', session, false, false) }}
diff --git a/templates/web/prod/Story/Reorder.html.twig b/templates/web/prod/Story/Reorder.html.twig index 3fc4541027..bc3a092c25 100644 --- a/templates/web/prod/Story/Reorder.html.twig +++ b/templates/web/prod/Story/Reorder.html.twig @@ -15,7 +15,7 @@
{{ element.get_title() }} - {{ thumbnail.format(element.get_thumbnail(), 80, 80, '', session) }} + {{ thumbnail.format(element.get_thumbnail(), 80, 80, '', session, false, false) }} diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig index cdf3405a90..1ccb535f2c 100644 --- a/templates/web/prod/Tooltip/Basket.html.twig +++ b/templates/web/prod/Tooltip/Basket.html.twig @@ -23,7 +23,7 @@ {% for element in basket.getElements() %} {% if loop.index <= 9 %}
- {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session) }} + {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session, false, false) }}
{% endif %} {% endfor %} diff --git a/templates/web/prod/Tooltip/Story.html.twig b/templates/web/prod/Tooltip/Story.html.twig index be3328070f..246c6c6ef9 100644 --- a/templates/web/prod/Tooltip/Story.html.twig +++ b/templates/web/prod/Tooltip/Story.html.twig @@ -20,7 +20,7 @@ {% for element in Story.get_children().get_elements() %} {% if loop.index <= 9 %}
- {{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', session) }} + {{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', session, false, false) }}
{% endif %} {% endfor %} diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig index 0eb974da4f..95f08b6213 100644 --- a/templates/web/prod/WorkZone/Browser/Basket.html.twig +++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig @@ -106,7 +106,7 @@ {{record.get_original_name()}}
- {{thumbnail.format(record.get_thumbnail,140,140, '', session, true)}} + {{thumbnail.format(record.get_thumbnail,140,140, '', session, true, false)}}
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index b74a89dce8..8d1b314cd2 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -40,7 +40,7 @@ {% set BasketElement = Basket.getElements().first() %} {% if BasketElement %} - {{thumbnail.format(BasketElement.getRecord().get_thumbnail(), 80, 80, '', session, true)}} + {{thumbnail.format(BasketElement.getRecord().get_thumbnail(), 80, 80, '', session, true, false)}} {% endif %}
{{ Basket.getElements().count() }} diff --git a/templates/web/prod/WorkZone/Macros.twig b/templates/web/prod/WorkZone/Macros.twig index e5f095da68..ae104bd443 100644 --- a/templates/web/prod/WorkZone/Macros.twig +++ b/templates/web/prod/WorkZone/Macros.twig @@ -267,7 +267,7 @@
{{record.get_number()}}
- {{thumbnail.format(record.get_thumbnail,82,82, '', session, true)}} + {{thumbnail.format(record.get_thumbnail,82,82, '', session, true, false)}}
diff --git a/templates/web/prod/actions/Bridge/records_list.twig b/templates/web/prod/actions/Bridge/records_list.twig index cdc272697e..0ac8fada71 100644 --- a/templates/web/prod/actions/Bridge/records_list.twig +++ b/templates/web/prod/actions/Bridge/records_list.twig @@ -60,7 +60,7 @@
- {{thumb.format(element.get_record().get_thumbnail, 40, 40, "", session, true)}} + {{thumb.format(element.get_record().get_thumbnail, 40, 40, "", session, true, false)}}
diff --git a/templates/web/prod/actions/publish/publish.html b/templates/web/prod/actions/publish/publish.html index 5cbcebc62a..f524adc11d 100644 --- a/templates/web/prod/actions/publish/publish.html +++ b/templates/web/prod/actions/publish/publish.html @@ -1,7 +1,7 @@ {% macro format_diapo(record, session) %} {% import 'common/thumbnail.html' as thumbnail %}
- {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}} + {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true, false)}}
{% endmacro %} diff --git a/templates/web/prod/actions/publish/publish_edit.html b/templates/web/prod/actions/publish/publish_edit.html index 3342358a02..77a857ba7d 100644 --- a/templates/web/prod/actions/publish/publish_edit.html +++ b/templates/web/prod/actions/publish/publish_edit.html @@ -2,7 +2,7 @@ {% macro format_diapo(record, session) %} {% import 'common/thumbnail.html' as thumbnail %}
- {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}} + {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true, false)}}
{% endmacro %} diff --git a/templates/web/prod/orders/order_item.twig b/templates/web/prod/orders/order_item.twig index b9add58859..4b2ace416e 100644 --- a/templates/web/prod/orders/order_item.twig +++ b/templates/web/prod/orders/order_item.twig @@ -61,7 +61,7 @@ {% endif %} {% endif %}
- {{ thumbnail.format(element.get_thumbnail,80, 80, '', session, true) }} + {{ thumbnail.format(element.get_thumbnail,80, 80, '', session, true, false) }}
{% endfor %} diff --git a/templates/web/prod/results/record.html b/templates/web/prod/results/record.html index 41c8c25b0f..788d4a02f8 100644 --- a/templates/web/prod/results/record.html +++ b/templates/web/prod/results/record.html @@ -59,9 +59,9 @@ {% if rollover_gif %} {% set extraclass = 'rollover-gif-out' %} {% endif %} - {{thumbnail.format(record.get_thumbnail(), th_size, th_size, extraclass, session, true)}} + {{thumbnail.format(record.get_thumbnail(), th_size, th_size, extraclass, session, true, true)}} {% if rollover_gif %} - {{thumbnail.format(rollover_gif, th_size, th_size, 'rollover-gif-hover', session, true )}} + {{thumbnail.format(rollover_gif, th_size, th_size, 'rollover-gif-hover', session, true, true )}} {% endif %}
diff --git a/templates/web/prod/upload/lazaret.html.twig b/templates/web/prod/upload/lazaret.html.twig index a4c77f629c..3cfd041068 100644 --- a/templates/web/prod/upload/lazaret.html.twig +++ b/templates/web/prod/upload/lazaret.html.twig @@ -308,7 +308,7 @@
  • - {{ thumb.format(record.get_thumbnail(), 260, 180, "", session, false) }} + {{ thumb.format(record.get_thumbnail(), 260, 180, "", session, false, false) }}