hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
mike-esokia
2018-05-21 11:11:50 +04:00
committed by Mike Ng
parent 12fc9344d4 44b618ac2d
commit 816cd4f20b
5 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/web/common/macros.html.twig
View File

@@ -126,10 +126,10 @@
{% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
<dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
{% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
<dt>{{ caption_field_label(record, name) }}</dt>
<dd>{{ caption_field(record, name, value)|e|highlight|parseColor }}</dd>
{% endfor %}
{% for field in record.get_caption().get_highlight_fields(null, can_see_business) %}
<dt>{{ field.label_name }}</dt>
<dd>{{ _self.caption_value(field, bounceable|default(true))|highlight|linkify|parseColor }}</dd>
{% endfor %}
</dl>
{% if display_exif|default(true) and app.getAuthenticator().user is not none and user_setting('technical_display') == 'group' %}
<hr/>