PORT PHRAS-854 to 4.1

This commit is contained in:
Mike Ng
2018-02-19 11:04:47 +04:00
parent d45c55858f
commit b08b3a5fd8
5 changed files with 29 additions and 10 deletions

View File

@@ -126,7 +126,7 @@
{% block td_duration %}
{% if record.exif[constant('media_subdef::TC_DATA_DURATION')] is defined %}
<dt>{{ 'Duree' | trans }} :
<dd>{{ record.exif[constant('media_subdef::TC_DATA_DURATION')] }}</dd>
<dd>{{ record.exif[constant('media_subdef::TC_DATA_DURATION')]|formatDuration }}</dd>
{% endif %}
{% endblock %}
{% block td_framerate %}

View File

@@ -33,12 +33,12 @@
<div class="thumb captionTips " tooltipsrc="{{ tooltipsrc }}"
style="height:{{ images_size }}px; z-index:90;">
<div class="doc_infos">
{% if doctype_display %}
{{ record_doctype_icon(record) }}
{% endif %}
<span class="duration">
{{ record.get_formated_duration }}
</span>
{% if doctype_display %}
{{ record_doctype_icon(record) }}
{% endif %}
</div>
<div class="{% if rollover_gif %}rollovable{% endif %}">
{% set extraclass = rollover_gif ? 'rollover-gif-out' : '' %}

View File

@@ -28,14 +28,14 @@
{% if settings.rollover_thumbnail == 'preview' %}tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}"{% endif %}
style="height:{{ settings.images_size }}px; z-index:90;">
<div class="doc_infos">
<span class="duration">
{% if record.type == 'video' and attribute(record.exif, constant('\\media_subdef::TC_DATA_DURATION')) is defined %}
{{ attribute(record.exif, constant('\\media_subdef::TC_DATA_DURATION'))|formatDuration }}
{% endif %}
</span>
{% if settings.doctype_display == '1' %}
{{ record_doctype_icon(record) }}
{% endif %}
<span class="duration">
{% if record.type == 'video' and attribute(record.exif, constant('\\media_subdef::TC_DATA_DURATION')) is defined %}
{{ attribute(record.exif, constant('\\media_subdef::TC_DATA_DURATION')) }}
{% endif %}
</span>
</div>
{% set rollover = record.subdefs.thumbnailgif is defined %}
{% set extraclass = '' %}