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

Merge branch 'master' into PHRAS-2757_print-feedback_4.1

Browse Source
This commit is contained in:
jygaulier
2020-01-09 20:33:11 +01:00
committed by GitHub
parent 32fbf049cf a445e44d47
commit b6fa28276d
16 changed files with 669 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/mobile/common/thumbnail.html.twig
View File

@@ -68,6 +68,8 @@
<iframe width="100%" height="100%"
src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
frameborder="0" allowfullscreen></iframe>
{% elseif record_type == 'PDF' %}
<iframe src="{{ url('alchemy_embed_view', {url: url|trim }) }}" width="100%" scrolling="no" marginheight="0" frameborder="0" allowfullscreen="" height="0" class="pdf-iframe"></iframe>
{% else %}
<img style="max-height: 100%;max-width:100%" class="record record_image imgTips zoomable thumb"
oncontextMenu="return(false);"

10
templates/mobile/lightbox/basket_element.html.twig
View File

@@ -93,5 +93,13 @@
</div>
</div>
<script type="text/javascript">
/*resize of PDF */
$(window).on("load resize ",function(e){
if($('.pdf-iframe').length > 0) {
var pdfHeight = $('.pdf-iframe').width() / 0.707;
$('.pdf-iframe').css('height', pdfHeight);
}
});
</script>
{% endblock %}

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

@@ -115,7 +115,9 @@
<div class="frame_canva">
<div id="thumb_delete_button"/>
<div id="thumb_download_button"/>
<canvas id="thumb_canvas"></canvas>
<div class="canvas-wrap">
<canvas id="thumb_canvas"></canvas>
</div>
<div id="alt_canvas_container"
style="position:absolute;overflow:hidden;top:-1200px;visibility: hidden; width:0!important;height:0!important">
{% for subdef in outputFormats %}