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-3116_prod_video-tools-add_subtitle_generation

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-06-19 15:09:29 +04:00
committed by GitHub
parent 130912f6f9 9a3896eb80
commit 4bb1caab5d
15 changed files with 99 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
templates/web/lightbox/agreement_box.html.twig
View File

@@ -47,4 +47,16 @@
</div>
</div>
{% endif %}
{% if basket_element.getBasket().getValidation() %}
<button class="comment_button btn btn-mini btn-inverse">
<i class="fa fa-comment icon-white" aria-hidden="true"></i>
{% set n = 0 %}
{% for validationData in basket_element.getValidationDatas() %}
{% if validationData.getNote() %}
{% set n = n+1 %}
{% endif %}
{% endfor %}
{{ n }}
</button>
{% endif %}
</div>

5
templates/web/lightbox/feed.html.twig
View File

@@ -92,11 +92,12 @@
<div class="PNB" style="height:30px;bottom:auto;">
<table border="0" cellspacing="0" cellpadding="0" style="width:100%;">
<tr>
<td style="width:20px;">
<td style="width:50px;">
<a href="/lightbox"><img title="{{ 'lightbox::recaptitulatif' | trans }}" class="back-home" src="/assets/lightbox/images/home-solid.svg"/></a>
</td>
<td style="width:40px;">
<button class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
<img src="/assets/lightbox/images/save.png"/>
<img width="15" src="/assets/lightbox/images/file-download-solid-blue.svg" >
</button>
</td>
<td>

14
templates/web/lightbox/feed_options_box.html.twig
View File

@@ -1,25 +1,25 @@
<span style="padding:10px 4px 7px;">
{% if feed_element %}
<button class="previous_button play btn btn-mini" title="{{ 'boutton::precedent' | trans }}">
<i class="fa fa-chevron-left" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-left-solid.svg"/>
</button>
<button class="previous_button pause btn btn-mini btn-inverse" title="{{ 'boutton::precedent' | trans }}">
<i class="fa fa-chevron-left icon-white" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-left-solid.svg"/>
</button>
<button class="play_button btn btn-mini" title="{{ 'boutton::demarrer' | trans }}">
<i class="fa fa-play" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/play-solid.svg"/>
</button>
<button class="pause_button btn btn-mini" title="{{ 'boutton::pause' | trans }}">
<i class="fa fa-pause" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/pause-solid.svg"/>
</button>
<button class="next_button play btn btn-mini" title="{{ 'boutton::suivant' | trans }}">
<i class="fa fa-chevron-right" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-right-solid.svg"/>
</button>
<button class="next_button pause btn btn-mini btn-inverse" title="{{ 'boutton::suivant' | trans }}">
<i class="fa fa-chevron-right icon-white" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-right-solid.svg"/>
</button>
<button class="download_button btn btn-mini btn-inverse" title="{{ 'boutton::telecharger' | trans }}">
<i class="fa fa-arrow-circle-o-down icon-white" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/file-download-solid.svg"/>
</button>
<form name="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{feed_element.getRecord(app).get_serialize_key()}}"/>

27
templates/web/lightbox/sc_options_box.html.twig
View File

@@ -1,42 +1,31 @@
<span style="padding:10px 4px 7px;">
{% if basket_element %}
<button class="previous_button play btn btn-mini" title="{{ 'boutton::precedent' | trans }}">
<i class="fa fa-chevron-left" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-left-solid.svg"/>
</button>
<button class="previous_button pause btn btn-mini btn-inverse" title="{{ 'boutton::precedent' | trans }}" style="display:none">
<i class="fa fa-chevron-left icon-white" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-left-solid.svg"/>
</button>
<button class="play_button btn btn-mini" title="{{ 'boutton::demarrer' | trans }}">
<i class="fa fa-play" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/play-solid.svg"/>
</button>
<button class="pause_button btn btn-mini" title="{{ 'boutton::pause' | trans }}" style="display:none">
<i class="fa fa-pause" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/pause-solid.svg"/>
</button>
<button class="next_button play btn btn-mini" title="{{ 'boutton::suivant' | trans }}">
<i class="fa fa-chevron-right" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-right-solid.svg"/>
</button>
<button class="next_button pause btn btn-mini btn-inverse" title="{{ 'boutton::suivant' | trans }}" style="display:none">
<i class="fa fa-chevron-right icon-white" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/chevron-right-solid.svg"/>
</button>
<button class="download_button btn btn-mini btn-inverse" title="{{ 'boutton::telecharger' | trans }}">
<i class="fa fa-arrow-circle-o-down icon-white" aria-hidden="true"></i>
<img class="lightbox-icon" src="/assets/lightbox/images/file-download-solid.svg"/>
</button>
<form name="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{basket_element.getRecord(app).get_serialize_key()}}"/>
</form>
|
{% if basket_element.getBasket().getValidation() %}
<button class="comment_button btn btn-mini btn-inverse">
<i class="fa fa-pencil-square-o icon-white" aria-hidden="true"></i>
{% set n = 0 %}
{% for validationData in basket_element.getValidationDatas() %}
{% if validationData.getNote() %}
{% set n = n+1 %}
{% endif %}
{% endfor %}
{{ n }}
</button>
{% endif %}
{% endif %}
</span>

11
templates/web/lightbox/validate.html.twig
View File

@@ -155,11 +155,10 @@
<tr>
<td style="width:20px;">
</td>
{% if basket.getValidation() %}
<td style="width:50px;">
<img title="{{ 'lightbox::recaptitulatif' | trans }}" class="report" src="/assets/lightbox/images/retour.png"/>
</td>
{% endif %}
<td style="width:50px;">
<a href="/lightbox"><img title="{{ 'lightbox::recaptitulatif' | trans }}" class="back-home" src="/assets/lightbox/images/home-solid.svg"/></a>
</td>
<td style="width:220px;">
<select id="navigation" style='margin:0'>
<optgroup label="{{ 'Validations' | trans }}">
@@ -182,7 +181,7 @@
</td>
<td style="width:50px;">
<button style='width:30px;margin:0;' class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
<img src="/assets/lightbox/images/save.png"/>
<img width="15" src="/assets/lightbox/images/file-download-solid-blue.svg" >
</button>
</td>
<td>