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-2861_Prod_Basket_menu_preference

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-01-15 15:29:06 +04:00
committed by GitHub
parent c43e48a8a6 e6bc446e04
commit 8773f4a057
16 changed files with 1178 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 %}

11
templates/web/prod/actions/printer_default.html.twig
View File

@@ -2,6 +2,17 @@
<form target="_blank" name="formprintpage" method="POST" action="{{ path('prod_printer_print') }}">
<div id="printBox">
<div style="padding:10px;">
{% if basketFeedbackId %}
<h4>{{ 'phraseanet:: basket feedback' | trans }}</h4>
<input type="hidden" name="ssel" value="{{ basketFeedbackId }}" />
<div style="margin: 10px 0 20px 0; padding: 0 10px;">
<label for="RADI_PRE_BF" class="radio">
<input type="radio" name="lay" value="feedback" id="RADI_PRE_BF" />
{{ 'print:: basket feedback' | trans }}
</label>
</div>
{% endif %}
{% if printer.get_count_actionable() > 0 %}
{% if printer.get_count_preview() > 0 %}
<h4>{{ 'phraseanet:: preview' | trans }}</h4>