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

Merge branch 'master' into PHRAS-3070_Prod_publication_fix_on_display

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-05-13 18:48:27 +04:00
committed by GitHub
parent 6b34c149e3 bfdba6cd7f
commit 5cb7e728b4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/web/prod/Share/record.html.twig
View File

@@ -65,15 +65,19 @@
<div class="form-group clearfix"> <div class="form-group clearfix">
{#{% if type == 'image' %}#} {#{% if type == 'image' %}#}
<label>{% trans %}Embed code{% endtrans %}</label> <label>{% trans %}Embed code{% endtrans %}</label>
{% set embedUrl = subdefList[defKey].embedUrl %}
{% if subdefList[defKey].height == 0 %}
{% set defKey = 'thumbnail' %}
{% endif %}
{% spaceless %} {% spaceless %}
<textarea class="input-block-level" rows="4" readonly="true" id="embedRecordUrl"> <textarea class="input-block-level" rows="4" readonly="true" id="embedRecordUrl">
<iframe width="{{ subdefList[defKey].width }}" height="{{ subdefList[defKey].height }}" <iframe width="{{ subdefList[defKey].width != 0 ?subdefList[defKey].width : 240 }}" height="{{subdefList[defKey].height != 0 ? subdefList[defKey].height : 240 }}"
src="{{ subdefList[defKey].embedUrl }}" frameborder="0" src="{{ embedUrl }}" frameborder="0"
allowfullscreen></iframe> allowfullscreen></iframe>
</textarea> </textarea>
{% endspaceless %} {% endspaceless %}
<p class="pull-right"> <p class="pull-right">
<a id="embedRecordUrl-link" href="{{ subdefList[defKey].embedUrl }}" <a id="embedRecordUrl-link" href="{{ embedUrl }}"
target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp; target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a href="#" class="" id="embedCopy">{{ 'copyClipboardLabel' | trans }}</a> <a href="#" class="" id="embedCopy">{{ 'copyClipboardLabel' | trans }}</a>
</p> </p>

2
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -229,7 +229,7 @@
{% endfor %} {% endfor %}
], ],
preferences: { preferences: {
overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}0{% endif %}, overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}1{% endif %},
} }
}; };