Merge with 3.7

This commit is contained in:
Romain Neutron
2012-10-04 12:49:01 +02:00
48 changed files with 353 additions and 89 deletions

View File

@@ -1,7 +1,7 @@
{% macro format_diapo(record, session) %}
{% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="diapo">
{{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
{{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true, false)}}
</div>
{% endmacro %}