Merge branch 'master' into PHRAS-3116_prod_video-tools-add_subtitle_generation

package.json

@@ -65,7 +65,7 @@
     "normalize-css": "^2.1.0",
     "npm": "^6.0.0",
     "npm-modernizr": "^2.8.3",
-    "phraseanet-production-client": "0.34.234-d",
+    "phraseanet-production-client": "0.34.236-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",

resources/www/lightbox/images/chevron-left-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chevron-left" class="svg-inline--fa fa-chevron-left fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"></path></svg>

resources/www/lightbox/images/chevron-right-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chevron-right" class="svg-inline--fa fa-chevron-right fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"></path></svg>

resources/www/lightbox/images/file-download-solid-blue.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="file-download" class="svg-inline--fa fa-file-download fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="#2196f3" d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm76.45 211.36l-96.42 95.7c-6.65 6.61-17.39 6.61-24.04 0l-96.42-95.7C73.42 337.29 80.54 320 94.82 320H160v-80c0-8.84 7.16-16 16-16h32c8.84 0 16 7.16 16 16v80h65.18c14.28 0 21.4 17.29 11.27 27.36zM377 105L279.1 7c-4.5-4.5-10.6-7-17-7H256v128h128v-6.1c0-6.3-2.5-12.4-7-16.9z"></path></svg>

resources/www/lightbox/images/file-download-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="file-download" class="svg-inline--fa fa-file-download fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="#ffffff" d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm76.45 211.36l-96.42 95.7c-6.65 6.61-17.39 6.61-24.04 0l-96.42-95.7C73.42 337.29 80.54 320 94.82 320H160v-80c0-8.84 7.16-16 16-16h32c8.84 0 16 7.16 16 16v80h65.18c14.28 0 21.4 17.29 11.27 27.36zM377 105L279.1 7c-4.5-4.5-10.6-7-17-7H256v128h128v-6.1c0-6.3-2.5-12.4-7-16.9z"></path></svg>

resources/www/lightbox/images/home-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="home" class="svg-inline--fa fa-home fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="#ffffff" d="M280.37 148.26L96 300.11V464a16 16 0 0 0 16 16l112.06-.29a16 16 0 0 0 15.92-16V368a16 16 0 0 1 16-16h64a16 16 0 0 1 16 16v95.64a16 16 0 0 0 16 16.05L464 480a16 16 0 0 0 16-16V300L295.67 148.26a12.19 12.19 0 0 0-15.3 0zM571.6 251.47L488 182.56V44.05a12 12 0 0 0-12-12h-56a12 12 0 0 0-12 12v72.61L318.47 43a48 48 0 0 0-61 0L4.34 251.47a12 12 0 0 0-1.6 16.9l25.5 31A12 12 0 0 0 45.15 301l235.22-193.74a12.19 12.19 0 0 1 15.3 0L530.9 301a12 12 0 0 0 16.9-1.6l25.5-31a12 12 0 0 0-1.7-16.93z"></path></svg>

resources/www/lightbox/images/pause-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pause" class="svg-inline--fa fa-pause fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M144 479H48c-26.5 0-48-21.5-48-48V79c0-26.5 21.5-48 48-48h96c26.5 0 48 21.5 48 48v352c0 26.5-21.5 48-48 48zm304-48V79c0-26.5-21.5-48-48-48h-96c-26.5 0-48 21.5-48 48v352c0 26.5 21.5 48 48 48h96c26.5 0 48-21.5 48-48z"></path></svg>

resources/www/lightbox/images/play-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="play" class="svg-inline--fa fa-play fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M424.4 214.7L72.4 6.6C43.8-10.3 0 6.1 0 47.9V464c0 37.5 40.7 60.1 72.4 41.3l352-208c31.4-18.5 31.5-64.1 0-82.6z"></path></svg>

resources/www/lightbox/styles/main.scss

@@ -99,7 +99,7 @@ img {
     overflow: scroll;
   }
   .display_id {
-    top: 5px;
+    top: 0;
     margin: 0 0 0 5px;
   }
 }
@@ -134,8 +134,8 @@ img {
     background-color: #212121;
   }
   .display_id {
-    top: 4px;
+    top: 5px;
-    left: 8px;
+    left: 5px;
   }
   .agreement {
     position: absolute;
@@ -173,7 +173,9 @@ img {
 
 .display_id {
   background-color: #FFFFFF;
-  padding: 3px 6px;
+  padding: 3.5px 6px;
+  min-width: 15px;
+  text-align: center;
   font-weight: bold;
   z-index: 99;
   color: #212121;
@@ -214,6 +216,28 @@ img {
   overflow: hidden;
   background-color: #1F1E1B;
   color: #BFBFBF;
+  .PNB.choices {
+    position: relative;
+  }
+  .comment_button {
+    text-align: center;
+    background: #353430;
+    margin: 0;
+    width: 118px;
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    padding: 7px;
+    font-size: 14px;
+    line-height: 14px;
+    border: 0;
+    bottom: -30px;
+    .fa-comment.icon-white {
+      font-size: 15px;
+      line-height: 18px;
+      margin-right: 10px;
+    }
+  }
 }
 
 #basket_options {
@@ -230,6 +254,11 @@ img {
 #basket_infos .user_infos {
   height: 120px;
   top: auto;
+  bottom: 43px;
+}
+.lightbox-icon {
+  width: 10px;
+  padding-bottom: 1px;
 }
 
 #basket_infos {
@@ -284,7 +313,7 @@ img {
 }
 
 #right_column .right_column_wrapper {
-  //top: 30px;
+  top: 30px;
   bottom: 45px;
 }
 
@@ -296,6 +325,7 @@ img {
 #record_infos {
   overflow-x: hidden;
   overflow-y: auto;
+  margin-bottom: 80px;
 }
 
 #record_compare {
@@ -303,7 +333,10 @@ img {
   top: auto;
   left: auto;
 }
-
+.download-feed{
+  color: #fff;
+  font-size: 22px;
+}
 #record_compare .header, #record_compare .lightbox_container {
   left: 5px;
 }
@@ -546,10 +579,14 @@ table th i {
 }
 
 .basket_downloader {
-  background-color: #1F1E1B;
+  background-color: #ffffff;
   margin: 0 10px;
-  padding: 2px;
+  padding: 4px 0;
   border: 0;
+  transition: 0.3s all;
+  &:hover {
+    background-color: #e6e6e6;
+  }
 }
 
 hr {
@@ -562,6 +599,13 @@ hr {
 .report {
   margin: 0 10px;
   vertical-align: bottom;
+}.back-home {
+    margin: 0 10px;
+    vertical-align: bottom;
+   width: 20px;
+   background: #1F1E1B;
+   padding: 5px;
+   border-radius: 3px;
 }
 
 /*

templates/web/lightbox/agreement_box.html.twig

@@ -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>

templates/web/lightbox/feed.html.twig

@@ -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>

templates/web/lightbox/feed_options_box.html.twig

@@ -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()}}"/>

templates/web/lightbox/sc_options_box.html.twig

@@ -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>
 

templates/web/lightbox/validate.html.twig

@@ -155,11 +155,10 @@
                     <tr>
                         <td style="width:20px;">
                         </td>
-                        {% if basket.getValidation() %}
+
-                            <td style="width:50px;">
+                        <td style="width:50px;">
-                                <img title="{{ 'lightbox::recaptitulatif' | trans }}" class="report" src="/assets/lightbox/images/retour.png"/>
+                            <a href="/lightbox"><img title="{{ 'lightbox::recaptitulatif' | trans }}" class="back-home" src="/assets/lightbox/images/home-solid.svg"/></a>
-                            </td>
+                        </td>
-                        {% endif %}
                         <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>

yarn.lock

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.234-d:
+phraseanet-production-client@0.34.236-d:
-  version "0.34.234-d"
+  version "0.34.236-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.234-d.tgz#0db4c6477bdda2946d41e9601f1198b350c57886"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.236-d.tgz#083120cc1ff02893b62058ff875742d45975e3ee"
-  integrity sha512-eMfX0xdOsjg9FqhcT22RLX/zNzTFvsQv8oTImJ6Wc9XA2Q/j+SiI40LxnvZEmzYQsEKEQMzbQhA4IxowsbzgYw==
+  integrity sha512-mOT8S2V2FlhOVZmIo2cWQuXOTQ9D4h7t0jquhLboz2zN4Uo0iLFAEkM0P9GmizYSixh1MYLbU0vFLJUPzvz2Wg==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"