From b5248bf62e6d4eb7ac8550de1e9c6d4e9c4b195e Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Thu, 23 Jan 2020 14:29:37 +0400
Subject: [PATCH 1/4] PHRAS-2719 #comment Fix multivalue fields selection #time
 4h

---
 package.json                                      | 2 +-
 templates/web/prod/actions/edit_default.html.twig | 6 +++---
 yarn.lock                                         | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index fbe48edbd0..fbf2bef49d 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.106-d",
+    "phraseanet-production-client": "0.34.108-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig
index e065811f8d..5afc68ad03 100644
--- a/templates/web/prod/actions/edit_default.html.twig
+++ b/templates/web/prod/actions/edit_default.html.twig
@@ -74,8 +74,8 @@
             </table>
         </div>
         <div class="editDiaButtons" style="position:absolute; bottom:0px; right:0px; width:30px; height:12px; display:none">
-            <img id="idEditDiaButtonsP_{{i}}" style="cursor:pointer" src="/assets/common/images/icons/plus11.png"/>
-            <img id="idEditDiaButtonsM_{{i}}" style="cursor:pointer" src="/assets/common/images/icons/minus11.png"/>
+            <span  id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="icon-round-add_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span>
+            <span  id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="icon-baseline-indeterminate_check_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span>
         </div>
     </div>
 {% endmacro %}
@@ -198,7 +198,7 @@
                             </div>
                             <div style="position:absolute; top:4px; width:60px; right:6px; height:24px;">
                                 <button type="submit" class="submit-multivalued">
-                                    <img id="EditButAddMultiValued" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
+                                    <i id="EditButAddMultiValued"  class="icon-round-add_box-24px icomoon" style="font-size: 24px;color: grey;">&nbsp;</i>
                                 </button>
                             </div>
                         </form>
diff --git a/yarn.lock b/yarn.lock
index 89b0c8e0ea..e9f292f194 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.106-d:
-  version "0.34.106-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.106-d.tgz#020379df0fc6023eebd5e188c7047b2e83892070"
-  integrity sha512-Z8XPVe++0oQ6LYubGMHovOhJg1qbSPoCyAD0HMazmtg+TzklfNcvPmUKWxKev2mP9qMLwYr5h4ts7XueyangAQ==
+phraseanet-production-client@0.34.108-d:
+  version "0.34.108-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.108-d.tgz#69a18bd2619f5fece745b884db23b048664a4ce6"
+  integrity sha512-ggEk7COtFSdNMFLCf+9q7PewoJneZxV6RpIE7hSgaBlHck1p5zSkSXbzkepumvYgLeE4/UMNeV6XvQUszQwzXg==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"

From 407c13b8c8742da5618ab249b547062341e92bba Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Thu, 23 Jan 2020 16:26:11 +0400
Subject: [PATCH 2/4] PHRAS-2719

---
 package.json                                      | 2 +-
 templates/web/prod/actions/edit_default.html.twig | 4 ++--
 yarn.lock                                         | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index fbf2bef49d..cdc083bedc 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.108-d",
+    "phraseanet-production-client": "0.34.109-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig
index 5afc68ad03..96fd7de7f2 100644
--- a/templates/web/prod/actions/edit_default.html.twig
+++ b/templates/web/prod/actions/edit_default.html.twig
@@ -41,7 +41,7 @@
         <div style='position:absolute; top:0px; left:0px; height:20px'>
             <img class="require_alert" src="/assets/common/images/icons/alert.png" style="display:none;cursor:help;" title="{{ 'edit::Certains champs doivent etre remplis pour valider cet editing' | trans }}">
         </div>
-        <div style='position:absolute; bottom:0px; left:0px; height:20px' class="bottom actions">
+        <div style='position:absolute; bottom:7px; left:8px; height:20px' class="bottom actions">
 
             <span class="fa-stack previewTips"
                   tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
@@ -73,7 +73,7 @@
                 </tbody>
             </table>
         </div>
-        <div class="editDiaButtons" style="position:absolute; bottom:0px; right:0px; width:30px; height:12px; display:none">
+        <div class="editDiaButtons" style="position:absolute; bottom:14px; right:0px; width:30px; height:12px; display:none">
             <span  id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="icon-round-add_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span>
             <span  id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="icon-baseline-indeterminate_check_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span>
         </div>
diff --git a/yarn.lock b/yarn.lock
index e9f292f194..173495d240 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.108-d:
-  version "0.34.108-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.108-d.tgz#69a18bd2619f5fece745b884db23b048664a4ce6"
-  integrity sha512-ggEk7COtFSdNMFLCf+9q7PewoJneZxV6RpIE7hSgaBlHck1p5zSkSXbzkepumvYgLeE4/UMNeV6XvQUszQwzXg==
+phraseanet-production-client@0.34.109-d:
+  version "0.34.109-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.109-d.tgz#9c48a3a4edabe146351ec36acfa3c9ef2eeddee4"
+  integrity sha512-AA7b72bWddguCH8jbBtFFsqKTrnfcRAfB8JjJIkUJ/fbZe3FSmDCh0nzPUhc9LbLfzKsmYVIVIZE6zkzlDUyfA==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"

From 2b15159fa2c0ca751026b025637c8f2fe0db50f3 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Fri, 24 Jan 2020 10:54:53 +0400
Subject: [PATCH 3/4] PHRAS-2719

---
 package.json                                      | 2 +-
 templates/web/common/preview.html.twig            | 6 +++++-
 templates/web/prod/actions/edit_default.html.twig | 7 ++++---
 yarn.lock                                         | 8 ++++----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index cdc083bedc..8c51a0798e 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.109-d",
+    "phraseanet-production-client": "0.34.110-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/common/preview.html.twig b/templates/web/common/preview.html.twig
index 0dba1f0cfd..90898e454c 100644
--- a/templates/web/common/preview.html.twig
+++ b/templates/web/common/preview.html.twig
@@ -15,7 +15,11 @@
 
 {% set previewHtml5 = null %}
 
-{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.has_preview == true %}
+{# first check if type audio and there is no preview , fallback to thumbnail #}
+
+{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.getType == 'audio' and record.has_preview == false %}
+    {% set preview_obj = record.get_thumbnail() %}
+{% elseif app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') %}
     {% set preview_obj = record.get_preview() %}
 {% else %}
     {% set preview_obj = record.get_thumbnail() %}
diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig
index 96fd7de7f2..acc218ee88 100644
--- a/templates/web/prod/actions/edit_default.html.twig
+++ b/templates/web/prod/actions/edit_default.html.twig
@@ -73,9 +73,9 @@
                 </tbody>
             </table>
         </div>
-        <div class="editDiaButtons" style="position:absolute; bottom:14px; right:0px; width:30px; height:12px; display:none">
-            <span  id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="icon-round-add_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span>
-            <span  id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="icon-baseline-indeterminate_check_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span>
+        <div class="editDiaButtons" style="position:absolute; bottom:8px; right:3px; width:30px; display:none">
+            <span  id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="fa fa-plus editIcon">&nbsp;</i></span>
+            <span  id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="fa fa-minus editIcon">&nbsp;</i></span>
         </div>
     </div>
 {% endmacro %}
@@ -477,4 +477,5 @@
             {% endfor %}
         ]
     };
+
 </script>
diff --git a/yarn.lock b/yarn.lock
index 173495d240..f7b2e96374 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.109-d:
-  version "0.34.109-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.109-d.tgz#9c48a3a4edabe146351ec36acfa3c9ef2eeddee4"
-  integrity sha512-AA7b72bWddguCH8jbBtFFsqKTrnfcRAfB8JjJIkUJ/fbZe3FSmDCh0nzPUhc9LbLfzKsmYVIVIZE6zkzlDUyfA==
+phraseanet-production-client@0.34.110-d:
+  version "0.34.110-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.110-d.tgz#6ccef1446ba321c15db80898b1d32968cc97cafa"
+  integrity sha512-pAQ4KcbMOaPnY7qr7pOmaAfCE+ULhK0tFQksbmTyTmIBP0vP9IXziWtYhd77pYt3h4yqdohytsaAXHZyO4KIbQ==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"

From eff33ef4d20d35a4c73d9969bc98d370ea80b819 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Fri, 24 Jan 2020 12:34:21 +0400
Subject: [PATCH 4/4] PHRAS-2719

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8c51a0798e..dd944ae7d7 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.110-d",
+    "phraseanet-production-client": "0.34.111-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/yarn.lock b/yarn.lock
index f7b2e96374..975d8ef471 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.110-d:
-  version "0.34.110-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.110-d.tgz#6ccef1446ba321c15db80898b1d32968cc97cafa"
-  integrity sha512-pAQ4KcbMOaPnY7qr7pOmaAfCE+ULhK0tFQksbmTyTmIBP0vP9IXziWtYhd77pYt3h4yqdohytsaAXHZyO4KIbQ==
+phraseanet-production-client@0.34.111-d:
+  version "0.34.111-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.111-d.tgz#e0b4e5d92b12c9920db4d0271c5728c2fd950106"
+  integrity sha512-MXDDDaiyv+5acl9w4IqihFZaLaYGgK3UNZAYIcw7O/lfvUEOG7KmxOw/w7mC6uN/5YCuN45KILC/5zPYzNIH6w==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"