From bc1ee172720135bf03f3d0733ef904bbcf6ba70c Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia-webagency.com>
Date: Fri, 19 Jun 2020 13:19:17 +0400
Subject: [PATCH] PHRAS-3138

---
 package.json                                  |  2 +-
 .../images/file-download-solid-blue.svg       |  1 +
 resources/www/lightbox/styles/main.scss       | 23 +++++++++++--------
 .../web/lightbox/agreement_box.html.twig      | 12 ++++++++++
 templates/web/lightbox/feed.html.twig         |  2 +-
 .../web/lightbox/sc_options_box.html.twig     | 13 +----------
 templates/web/lightbox/validate.html.twig     |  2 +-
 yarn.lock                                     |  8 +++----
 8 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 resources/www/lightbox/images/file-download-solid-blue.svg

diff --git a/package.json b/package.json
index 310c5cd977..152b427e5b 100644
--- a/package.json
+++ b/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.235-d",
+    "phraseanet-production-client": "0.34.236-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/resources/www/lightbox/images/file-download-solid-blue.svg b/resources/www/lightbox/images/file-download-solid-blue.svg
new file mode 100644
index 0000000000..bf3bfc4d65
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/resources/www/lightbox/styles/main.scss b/resources/www/lightbox/styles/main.scss
index 5c2ae1a573..c98acc4a3e 100644
--- a/resources/www/lightbox/styles/main.scss
+++ b/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;
-    left: 8px;
+    top: 5px;
+    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;
@@ -229,16 +231,13 @@ img {
     font-size: 14px;
     line-height: 14px;
     border: 0;
-    bottom: 10px;
+    bottom: -30px;
     .fa-comment.icon-white {
       font-size: 15px;
       line-height: 18px;
       margin-right: 10px;
     }
   }
-  .user_infos  .comment_button {
-    bottom: initial;
-  }
 }
 
 #basket_options {
@@ -580,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 {
diff --git a/templates/web/lightbox/agreement_box.html.twig b/templates/web/lightbox/agreement_box.html.twig
index ddf7ef1601..8a5d673da7 100644
--- a/templates/web/lightbox/agreement_box.html.twig
+++ b/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>
diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig
index 6ae64905a3..5a63d68abb 100644
--- a/templates/web/lightbox/feed.html.twig
+++ b/templates/web/lightbox/feed.html.twig
@@ -97,7 +97,7 @@
                         </td>
                         <td style="width:40px;">
                             <button class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
-                                <i class="fa fa-cart-arrow-down download-feed"></i>
+                                <img width="15" src="/assets/lightbox/images/file-download-solid-blue.svg" >
                             </button>
                         </td>
                         <td>
diff --git a/templates/web/lightbox/sc_options_box.html.twig b/templates/web/lightbox/sc_options_box.html.twig
index c0689ed920..50edaf67d9 100644
--- a/templates/web/lightbox/sc_options_box.html.twig
+++ b/templates/web/lightbox/sc_options_box.html.twig
@@ -25,18 +25,7 @@
             <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-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 %}
+
     {% endif %}
 </span>
 
diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig
index f9a85d7295..72d55c0f6d 100644
--- a/templates/web/lightbox/validate.html.twig
+++ b/templates/web/lightbox/validate.html.twig
@@ -181,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 }}">
-                                <i class="fa fa-cart-arrow-down download-feed"></i>
+                                <img width="15" src="/assets/lightbox/images/file-download-solid-blue.svg" >
                             </button>
                         </td>
                         <td>
diff --git a/yarn.lock b/yarn.lock
index 6f2b4b5b70..38e0f53175 100644
--- a/yarn.lock
+++ b/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.235-d:
-  version "0.34.235-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.235-d.tgz#f4d9d0b28ad36090db122ab4885c07890ee5a8e5"
-  integrity sha512-B55HnN4TTXXM7dS+SAtOMlIY7gzAXiWgdArXllv2EuCWsFK8BZFTGnqmvL0uixei7bO7hFfu0IfuqYOfJRU2cQ==
+phraseanet-production-client@0.34.236-d:
+  version "0.34.236-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.236-d.tgz#083120cc1ff02893b62058ff875742d45975e3ee"
+  integrity sha512-mOT8S2V2FlhOVZmIo2cWQuXOTQ9D4h7t0jquhLboz2zN4Uo0iLFAEkM0P9GmizYSixh1MYLbU0vFLJUPzvz2Wg==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"