Merge branch 'master' into PHRAS-2868_PRod-video_tools_define_thumbnails_video

This commit is contained in:
Nicolas Maillat
2020-01-08 14:02:44 +01:00
committed by GitHub
4 changed files with 19 additions and 1 deletions

View File

@@ -319,3 +319,8 @@ a.active_choice {
color: #313131; color: #313131;
padding: 6px 0 6px 30px; padding: 6px 0 6px 30px;
} }
.pdf-iframe {
background: #1a1a1a;
padding-bottom: 10px;
}

View File

@@ -694,6 +694,9 @@ button.confirm_report {
iframe { iframe {
min-height: 240px; min-height: 240px;
width: auto; width: auto;
.ui-mobile & {
width: 100%;
}
} }
} }

View File

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

View File

@@ -93,5 +93,13 @@
</div> </div>
</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 %} {% endblock %}