From 3d9f9136d702d57ec7d4664046aae193349c32c5 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Thu, 19 Dec 2019 18:12:58 +0400
Subject: [PATCH 01/11] PHRAS-2870 #comment Fix Prod workzone video max-width
 #time 3h

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

diff --git a/package.json b/package.json
index 7525421e67..9c24b25e60 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.86-d",
+    "phraseanet-production-client": "0.34.89-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/yarn.lock b/yarn.lock
index a7d490caab..ce242614be 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.86-d:
-  version "0.34.86-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.86-d.tgz#51e6c6fb17fcd2695cee90fb3d972c781057fd78"
-  integrity sha512-12o7pcRZAJ/5Ote4DbkaRxLz2GIZBUcZf53FB+GHVFxhds5ia6UNDCPhYP5vX4hhHtO/Y6Mj/BOlOjnoyi+k1g==
+phraseanet-production-client@0.34.89-d:
+  version "0.34.89-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.89-d.tgz#14d8723014136cfa547b893fefabc22de6cdc802"
+  integrity sha512-bmuY31zbTs9Fvy3rFMe//AFE113eCYAuwbVmCTkP/3l4xfNbHFjczCokxYtEMLrQqiAp20lYx/hfZxHYxLmSow==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"

From 6272aa37b1c6acbb1913312d8eba45e41b4a2abe Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Mon, 23 Dec 2019 16:55:11 +0400
Subject: [PATCH 02/11] PHRAS-2868 #comment Fix Video editor canvas for
 vertical video #time 8h

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

diff --git a/package.json b/package.json
index 7525421e67..3520bc96fb 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.86-d",
+    "phraseanet-production-client": "0.34.90-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/yarn.lock b/yarn.lock
index a7d490caab..a733bda6af 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.86-d:
-  version "0.34.86-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.86-d.tgz#51e6c6fb17fcd2695cee90fb3d972c781057fd78"
-  integrity sha512-12o7pcRZAJ/5Ote4DbkaRxLz2GIZBUcZf53FB+GHVFxhds5ia6UNDCPhYP5vX4hhHtO/Y6Mj/BOlOjnoyi+k1g==
+phraseanet-production-client@0.34.90-d:
+  version "0.34.90-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.90-d.tgz#e3bac60a8a97476e0de3b6654417fa9a7ecf5a5f"
+  integrity sha512-UpgYXdfLZLUs8CIVntuMN7dpXHGtk6wwkg/3ofQJHoBw6Y3MjU6L90p1ALKDjAYR/lnVfZNfUn0bWEYxnO0ILQ==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"

From d57901e0b0260581bbdd215281bee626a32fbc00 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Tue, 7 Jan 2020 19:02:33 +0400
Subject: [PATCH 03/11] PHRAS-2868

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

diff --git a/package.json b/package.json
index 3520bc96fb..f773ee6260 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.90-d",
+    "phraseanet-production-client": "0.34.92-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig
index 6d10080cce..d31302ebd0 100644
--- a/templates/web/prod/actions/Tools/videoEditor.html.twig
+++ b/templates/web/prod/actions/Tools/videoEditor.html.twig
@@ -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 %}
diff --git a/yarn.lock b/yarn.lock
index a733bda6af..751a2f36a0 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.90-d:
-  version "0.34.90-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.90-d.tgz#e3bac60a8a97476e0de3b6654417fa9a7ecf5a5f"
-  integrity sha512-UpgYXdfLZLUs8CIVntuMN7dpXHGtk6wwkg/3ofQJHoBw6Y3MjU6L90p1ALKDjAYR/lnVfZNfUn0bWEYxnO0ILQ==
+phraseanet-production-client@0.34.92-d:
+  version "0.34.92-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.92-d.tgz#bfe36241d9ebe05ee8f117b1db55ac4960289c1d"
+  integrity sha512-IWMlCvGLVXQTTe6sZGJJO/Kkxu9i1j+UtnSyGPGdgzq8dPo6vGhZIX54qz2fnKtg474KgxSxYuwBQmHdam3ddQ==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"

From 8d0165d14f8770d7fc142a647c482e5d822360e5 Mon Sep 17 00:00:00 2001
From: Nicolas Maillat <maillat@alchemy.fr>
Date: Wed, 8 Jan 2020 20:11:26 +0000
Subject: [PATCH 04/11] Translated using Weblate (English)

Currently translated at 98.0% (2360 of 2408 strings)
---
 resources/locales/messages.en.xlf | 94 +++++++++++++++----------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index 54dde3fb56..3e0e566fbf 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -3435,9 +3435,9 @@
         <target state="translated">General settings</target>
         <jms:reference-file line="87">web/admin/dashboard.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms">
+      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms" approved="no">
         <source>Generate-cterms</source>
-        <target state="new">Generate-cterms</target>
+        <target state="needs-translation">Generate candidat terms</target>
         <jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="9f1b4c9f85fcbbf355fdd3c97210173b63551aa6" resname="Generates a flexpaper flash file" approved="yes">
@@ -3577,14 +3577,14 @@
         <target state="translated">You must be authenticated to have the right to download.</target>
         <jms:reference-file line="88">web/common/dialog_export.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="771d30c668093219776b418dc5d3475682457167" resname="Gui-editable">
+      <trans-unit id="771d30c668093219776b418dc5d3475682457167" resname="Gui-editable" approved="no">
         <source>Gui-editable</source>
-        <target state="new">Gui-editable</target>
+        <target state="needs-translation">Editable in Graphical interface (prod)</target>
         <jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="c3ccdd44c467c7149733d19a40e0068ddb00ab25" resname="Gui-visible">
+      <trans-unit id="c3ccdd44c467c7149733d19a40e0068ddb00ab25" resname="Gui-visible" approved="no">
         <source>Gui-visible</source>
-        <target state="new">Gui-visible</target>
+        <target state="needs-translation">Visible in Graphical Interface</target>
         <jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="6bc9ceaf6239215199222552fbbe96c17a549705" resname="HD Download" approved="yes">
@@ -7181,9 +7181,9 @@
         <target state="translated">Use a SMTP server</target>
         <jms:reference-file line="28">Form/Configuration/EmailFormType.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="337f9aa5d63611e88aedd8cc09ee1488fb9fe3a4" resname="Use an existing index">
+      <trans-unit id="337f9aa5d63611e88aedd8cc09ee1488fb9fe3a4" resname="Use an existing index" approved="yes">
         <source>Use an existing index</source>
-        <target state="new">Use an existing index</target>
+        <target state="translated">Use an existing index</target>
         <jms:reference-file line="662">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d029e308808256c5e3868e24ea33f14866ab2e36" resname="Use latest search settings on Production loading" approved="yes">
@@ -9030,9 +9030,9 @@
         <target state="translated">New User</target>
         <jms:reference-file line="24">web/admin/users.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="59d12fc723a0831f5f4e19792cf0158b81833b39" resname="admin::userlist: filterguestuser">
+      <trans-unit id="59d12fc723a0831f5f4e19792cf0158b81833b39" resname="admin::userlist: filterguestuser" approved="yes">
         <source>admin::userlist: filterguestuser</source>
-        <target state="needs-translation">Show guest user.</target>
+        <target state="translated">Show guest user</target>
         <jms:reference-file line="37">web/admin/users.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fdec47ae48ab4c4ce33aff0690e796525a883f4f" resname="admin::utilisateurs: bases de donnees" approved="yes">
@@ -9940,19 +9940,19 @@
         <target state="translated">Modifications done</target>
         <jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="30fd9aaccb427181468696921afdef907567a5fa" resname="generate_cterms">
+      <trans-unit id="30fd9aaccb427181468696921afdef907567a5fa" resname="generate_cterms" approved="yes">
         <source>generate_cterms</source>
-        <target state="new">generate_cterms</target>
+        <target state="translated">Generate candidate terms</target>
         <jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="aef8d82707701b3e01b408fb013669040af1bdf1" resname="gui_editable">
+      <trans-unit id="aef8d82707701b3e01b408fb013669040af1bdf1" resname="gui_editable" approved="yes">
         <source>gui_editable</source>
-        <target state="new">gui_editable</target>
+        <target state="translated">Editable in Graphical interface</target>
         <jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="83e4a406813db28238114f37fc57d1e055584ce5" resname="gui_visible">
+      <trans-unit id="83e4a406813db28238114f37fc57d1e055584ce5" resname="gui_visible" approved="yes">
         <source>gui_visible</source>
-        <target state="new">gui_visible</target>
+        <target state="translated">Visible in Graphical interface</target>
         <jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling" approved="yes">
@@ -9960,9 +9960,9 @@
         <target state="translated">Check that there are no misspellings or typing errors.</target>
         <jms:reference-file line="17">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9be1244ce3eb4b1de4abe01d696f2ab14effa5ca" resname="help::help-section-bullet: default-operator-between-terms">
+      <trans-unit id="9be1244ce3eb4b1de4abe01d696f2ab14effa5ca" resname="help::help-section-bullet: default-operator-between-terms" approved="no">
         <source>help::help-section-bullet: default-operator-between-terms</source>
-        <target state="new">help::help-section-bullet: default-operator-between-terms</target>
+        <target state="needs-translation">Default operator between terms is an AND, example : typing words “red“ “dog”, search "red AND dog" in same record</target>
         <jms:reference-file line="26">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a939bc9799c52952fd10a0a4c27520ffb080abf8" resname="help::help-section-bullet: expand search" approved="yes">
@@ -9982,7 +9982,7 @@
       </trans-unit>
       <trans-unit id="76544223abc0670157f5a270138a638283071678" resname="help::help-section-bullet: search-in-a-specific-field" approved="no">
         <source>help::help-section-bullet: search-in-a-specific-field</source>
-        <target state="needs-translation">To search in a specific field, use syntax "name of field: value", for example: city:"Paris". See documentation for more examples: https://docs.phraseanet.com</target>
+        <target state="needs-translation">To search in a specific field, use syntax "name of field: value", for example: city:"Paris". You can also use the advance search and read documentation for more examples: https://docs.phraseanet.com</target>
         <jms:reference-file line="30">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="ac8d5acf555e427edbdcb05033256148d4bf9204" resname="help::help-section-bullet: search-in-document" approved="yes">
@@ -10097,9 +10097,9 @@
         <target state="translated">Service will be available again in a few minutes</target>
         <jms:reference-file line="8">actions/Bridge/deactivated.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="08dffae30f5e0bfb179632f591a0ffb3daaffe6d" resname="lightbox::list">
+      <trans-unit id="08dffae30f5e0bfb179632f591a0ffb3daaffe6d" resname="lightbox::list" approved="no">
         <source>lightbox::list</source>
-        <target state="new">lightbox::list</target>
+        <target state="needs-translation">summary</target>
         <jms:reference-file line="63">mobile/lightbox/validate.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="49956c0a16703da1e642ef7ea5f5d56ddb026c9b" resname="lightbox::recaptitulatif" approved="yes">
@@ -10928,9 +10928,9 @@
         <jms:reference-file line="344">Controller/Root/AccountController.php</jms:reference-file>
         <jms:reference-file line="541">Controller/Root/AccountController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access">
+      <trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access" approved="no">
         <source>phraseanet::error: failed to revoke some user access</source>
-        <target state="new">phraseanet::error: failed to revoke some user access</target>
+        <target state="needs-translation">Failed to revoke some users access</target>
         <jms:reference-file line="530">Controller/Root/AccountController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="2a5db6bf8928d23c54b13277fa7d5289a1f52744" resname="phraseanet::jours:: dimanche" approved="yes">
@@ -11458,9 +11458,9 @@
         <target state="translated">Replace with term ?</target>
         <jms:reference-file line="19">web/prod/tab_thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="556186e33fc15d5397f8b5f7a6855e822b354f9b" resname="prod::toolbar : video editor">
+      <trans-unit id="556186e33fc15d5397f8b5f7a6855e822b354f9b" resname="prod::toolbar : video editor" approved="yes">
         <source>prod::toolbar : video editor</source>
-        <target state="needs-translation">video tool</target>
+        <target state="translated">video tools</target>
         <jms:reference-file line="72">web/prod/toolbar.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="6ad73c8fd370f62ccd3bf50cd9cc3563aed5273c" resname="prod::tools: document" approved="yes">
@@ -11474,14 +11474,14 @@
         <target state="translated">Also move to Trash the records that rely on stories</target>
         <jms:reference-file line="28">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9dd9daa2dc851f005bbcb2ce0ea0c8de6b86ad52" resname="prod:app trash: record-delete">
+      <trans-unit id="9dd9daa2dc851f005bbcb2ce0ea0c8de6b86ad52" resname="prod:app trash: record-delete" approved="yes">
         <source>prod:app trash: record-delete</source>
-        <target state="needs-translation">record delete</target>
+        <target state="translated">record delete</target>
         <jms:reference-file line="40">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9dcc690970b62ae5d2f6e2bf25213650f69d44ea" resname="prod:app trash: record-move-to-trash">
+      <trans-unit id="9dcc690970b62ae5d2f6e2bf25213650f69d44ea" resname="prod:app trash: record-move-to-trash" approved="yes">
         <source>prod:app trash: record-move-to-trash</source>
-        <target state="needs-translation">move record to trash</target>
+        <target state="translated">move record to trash</target>
         <jms:reference-file line="23">prod/actions/delete_records_confirm.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="054aec17d6db5d5ab74b6bf4440acfd5a9fdc09d" resname="prod:app trash: title-trash">
@@ -11532,14 +11532,14 @@ It is possible to place several search areas</target>
         <target state="needs-translation">Geographic Search</target>
         <jms:reference-file line="153">Controller/Prod/LanguageController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="6ce4044e1fce74fb5f716f7d67f3a538f4d12d26" resname="prod:push: create new user">
+      <trans-unit id="6ce4044e1fce74fb5f716f7d67f3a538f4d12d26" resname="prod:push: create new user" approved="no">
         <source>prod:push: create new user</source>
-        <target state="new">prod:push: create new user</target>
+        <target state="needs-translation">Create new user</target>
         <jms:reference-file line="156">Controller/Prod/LanguageController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a938566e7b60b6fc2e197259cf2f2b2f42656d17" resname="prod:push: delete selection">
+      <trans-unit id="a938566e7b60b6fc2e197259cf2f2b2f42656d17" resname="prod:push: delete selection" approved="no">
         <source>prod:push: delete selection</source>
-        <target state="new">prod:push: delete selection</target>
+        <target state="needs-translation">Delete selection</target>
         <jms:reference-file line="223">prod/actions/Push.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="61c9b2b17db77a27841bbeeabff923448b0f6388" resname="public" approved="yes">
@@ -12256,9 +12256,9 @@ It is possible to place several search areas</target>
         <target state="translated">E-mails send test</target>
         <jms:reference-file line="127">web/admin/dashboard.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="cf75de5e3a89d03d1888b4caccfafc65f6456fc3" resname="setup::custom-link:add-link">
+      <trans-unit id="cf75de5e3a89d03d1888b4caccfafc65f6456fc3" resname="setup::custom-link:add-link" approved="yes">
         <source>setup::custom-link:add-link</source>
-        <target state="needs-translation">Add link</target>
+        <target state="translated">Add link</target>
         <jms:reference-file line="78">web/admin/setup.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="44a5de1cdcf30547c937f197cd3d58e143de62a6" resname="setup::custom-link:help-menu" approved="yes">
@@ -12276,9 +12276,9 @@ It is possible to place several search areas</target>
         <target state="needs-translation">Destination URL</target>
         <jms:reference-file line="99">web/admin/setup.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="2de3bc78c6fb26b56dd934a81dc76afdba8c79ab" resname="setup::custom-link:location">
+      <trans-unit id="2de3bc78c6fb26b56dd934a81dc76afdba8c79ab" resname="setup::custom-link:location" approved="no">
         <source>setup::custom-link:location</source>
-        <target state="new">setup::custom-link:location</target>
+        <target state="needs-translation">Select a placement</target>
         <jms:reference-file line="57">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="f4db79dfecabb4b9acb44a4b49e9b6b433b28d04" resname="setup::custom-link:location-link" approved="yes">
@@ -12286,15 +12286,15 @@ It is possible to place several search areas</target>
         <target state="translated">Placement</target>
         <jms:reference-file line="100">web/admin/setup.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="ccfe45428ee9769a865d3d90c0e4dc50a6b68e9c" resname="setup::custom-link:name-link">
+      <trans-unit id="ccfe45428ee9769a865d3d90c0e4dc50a6b68e9c" resname="setup::custom-link:name-link" approved="yes">
         <source>setup::custom-link:name-link</source>
-        <target state="needs-translation">Name of link</target>
+        <target state="translated">Name of link</target>
         <jms:reference-file line="23">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
         <jms:reference-file line="97">web/admin/setup.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="fdecb6454c7adeaeb05bac7f574ee70884900ca2" resname="setup::custom-link:navigation-bar">
+      <trans-unit id="fdecb6454c7adeaeb05bac7f574ee70884900ca2" resname="setup::custom-link:navigation-bar" approved="yes">
         <source>setup::custom-link:navigation-bar</source>
-        <target state="needs-translation">Navigation Bar</target>
+        <target state="translated">Navigation Bar</target>
         <jms:reference-file line="59">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="4696021003b181f9acc9261382e07364c6b83036" resname="setup::custom-link:order-link" approved="yes">
@@ -12302,14 +12302,14 @@ It is possible to place several search areas</target>
         <target state="translated">Display order</target>
         <jms:reference-file line="101">web/admin/setup.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="1b09a3a0a8b0205f23b3fe59074f8dfd72d0b0ae" resname="setup::custom-link:placeholder-link-url">
+      <trans-unit id="1b09a3a0a8b0205f23b3fe59074f8dfd72d0b0ae" resname="setup::custom-link:placeholder-link-url" approved="yes">
         <source>setup::custom-link:placeholder-link-url</source>
-        <target state="needs-translation">eg: https://docs.phraseanet.com</target>
+        <target state="translated">eg: https://docs.phraseanet.com</target>
         <jms:reference-file line="47">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a1380c70f5190d6c0c38214fe24ac99272ef7bd2" resname="setup::custom-link:select-language">
+      <trans-unit id="a1380c70f5190d6c0c38214fe24ac99272ef7bd2" resname="setup::custom-link:select-language" approved="yes">
         <source>setup::custom-link:select-language</source>
-        <target state="needs-translation">Select Language</target>
+        <target state="translated">Select Language</target>
         <jms:reference-file line="34">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="67572283912404fe90681e8566d880e1fd10d58e" resname="setup::custom-link:title-custom-link" approved="yes">
@@ -13186,9 +13186,9 @@ It is possible to place several search areas</target>
         <jms:reference-file line="370">web/admin/subdefs.html.twig</jms:reference-file>
         <jms:reference-file line="25">task-manager/task-editor/subdefs.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="51ca3cfa60e4d9ce2c7cd07b0b96fc84c4adb59f" resname="video range extractor">
+      <trans-unit id="51ca3cfa60e4d9ce2c7cd07b0b96fc84c4adb59f" resname="video range extractor" approved="yes">
         <source>video range extractor</source>
-        <target state="needs-translation">Video Chapter Editing</target>
+        <target state="translated">Video Chapter Editing</target>
         <jms:reference-file line="29">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="5f579f302357e60409bbfb73a4caa4700c4d8be5" resname="video tool" approved="yes">

From a60487bd0cfdf5f1abc13445a401c3a1390e333f Mon Sep 17 00:00:00 2001
From: Nicolas Maillat <maillat@alchemy.fr>
Date: Wed, 8 Jan 2020 20:17:46 +0000
Subject: [PATCH 05/11] Translated using Weblate (English)

Currently translated at 97.9% (2359 of 2408 strings)
---
 resources/locales/messages.en.xlf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index 3e0e566fbf..0678facf5d 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -13191,9 +13191,9 @@ It is possible to place several search areas</target>
         <target state="translated">Video Chapter Editing</target>
         <jms:reference-file line="29">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="5f579f302357e60409bbfb73a4caa4700c4d8be5" resname="video tool" approved="yes">
+      <trans-unit id="5f579f302357e60409bbfb73a4caa4700c4d8be5" resname="video tool" approved="no">
         <source>video tool</source>
-        <target state="translated">Video Tools</target>
+        <target state="needs-translation">Thumbnail definition</target>
         <jms:reference-file line="24">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fb360f9c09ac8c5edb2f18be5de4e80ea4c430d0" resname="yes" approved="yes">

From fe358834ffe0577c9bfbf98ccc42295a3d217065 Mon Sep 17 00:00:00 2001
From: Nicolas Maillat <maillat@alchemy.fr>
Date: Wed, 8 Jan 2020 19:42:01 +0000
Subject: [PATCH 06/11] Translated using Weblate (French)

Currently translated at 99.0% (2384 of 2408 strings)
---
 resources/locales/messages.fr.xlf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
index 0acea280c7..c34c6abf1e 100644
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -9972,7 +9972,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       </trans-unit>
       <trans-unit id="a1635ba73964dd21d9d5907401d77a11cd474611" resname="help::help-section-bullet: quotation-marks-allow" approved="no">
         <source>help::help-section-bullet: quotation-marks-allow</source>
-        <target state="needs-translation">Ajouter des guillemets pour chercher une expression exacte permet aussi d'exclure un opérateur de la recherche, exemple : « Pile Ou face » , «Sain et sauf»</target>
+        <target state="needs-translation">Ajouter des guillemets pour chercher une expression exacte, permet aussi d'exclure un opérateur de la recherche, exemple : « Pile Ou face » , «Sain et sauf»</target>
         <jms:reference-file line="29">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2c7c99c6e44d0f6117f812b18739f8990ebb8052" resname="help::help-section-bullet: remove-advance-search" approved="yes">

From 4f0669e65f37fea1b758251c84e69179f8a44615 Mon Sep 17 00:00:00 2001
From: Jennifer <jguerin@alchemy.fr>
Date: Thu, 9 Jan 2020 11:50:48 +0000
Subject: [PATCH 07/11] Translated using Weblate (English)

Currently translated at 98.1% (2363 of 2408 strings)
---
 resources/locales/messages.en.xlf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index 0678facf5d..a0e2c6c0e9 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -3435,9 +3435,9 @@
         <target state="translated">General settings</target>
         <jms:reference-file line="87">web/admin/dashboard.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms" approved="no">
+      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms" approved="yes">
         <source>Generate-cterms</source>
-        <target state="needs-translation">Generate candidat terms</target>
+        <target state="translated">Generate candidate terms</target>
         <jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="9f1b4c9f85fcbbf355fdd3c97210173b63551aa6" resname="Generates a flexpaper flash file" approved="yes">
@@ -9960,9 +9960,9 @@
         <target state="translated">Check that there are no misspellings or typing errors.</target>
         <jms:reference-file line="17">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9be1244ce3eb4b1de4abe01d696f2ab14effa5ca" resname="help::help-section-bullet: default-operator-between-terms" approved="no">
+      <trans-unit id="9be1244ce3eb4b1de4abe01d696f2ab14effa5ca" resname="help::help-section-bullet: default-operator-between-terms" approved="yes">
         <source>help::help-section-bullet: default-operator-between-terms</source>
-        <target state="needs-translation">Default operator between terms is an AND, example : typing words “red“ “dog”, search "red AND dog" in same record</target>
+        <target state="translated">Default operator between terms is AND, example : typing words “red“ “dog”, search "red AND dog" in same record</target>
         <jms:reference-file line="26">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a939bc9799c52952fd10a0a4c27520ffb080abf8" resname="help::help-section-bullet: expand search" approved="yes">
@@ -9980,9 +9980,9 @@
         <target state="translated">Remove advanced search filters.</target>
         <jms:reference-file line="19">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="76544223abc0670157f5a270138a638283071678" resname="help::help-section-bullet: search-in-a-specific-field" approved="no">
+      <trans-unit id="76544223abc0670157f5a270138a638283071678" resname="help::help-section-bullet: search-in-a-specific-field" approved="yes">
         <source>help::help-section-bullet: search-in-a-specific-field</source>
-        <target state="needs-translation">To search in a specific field, use syntax "name of field: value", for example: city:"Paris". You can also use the advance search and read documentation for more examples: https://docs.phraseanet.com</target>
+        <target state="translated">To search in a specific field, use syntax "name of field: value", for example: city:"Paris". You can also use the advanced search and read documentation for more examples: https://docs.phraseanet.com</target>
         <jms:reference-file line="30">prod/results/help.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="ac8d5acf555e427edbdcb05033256148d4bf9204" resname="help::help-section-bullet: search-in-document" approved="yes">
@@ -10928,9 +10928,9 @@
         <jms:reference-file line="344">Controller/Root/AccountController.php</jms:reference-file>
         <jms:reference-file line="541">Controller/Root/AccountController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access" approved="no">
+      <trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access" approved="yes">
         <source>phraseanet::error: failed to revoke some user access</source>
-        <target state="needs-translation">Failed to revoke some users access</target>
+        <target state="translated">Failed to revoke some user access</target>
         <jms:reference-file line="530">Controller/Root/AccountController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="2a5db6bf8928d23c54b13277fa7d5289a1f52744" resname="phraseanet::jours:: dimanche" approved="yes">
@@ -12278,7 +12278,7 @@ It is possible to place several search areas</target>
       </trans-unit>
       <trans-unit id="2de3bc78c6fb26b56dd934a81dc76afdba8c79ab" resname="setup::custom-link:location" approved="no">
         <source>setup::custom-link:location</source>
-        <target state="needs-translation">Select a placement</target>
+        <target state="needs-translation">Select a position</target>
         <jms:reference-file line="57">Form/Configuration/CustomLinkFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="f4db79dfecabb4b9acb44a4b49e9b6b433b28d04" resname="setup::custom-link:location-link" approved="yes">

From 32fbf049cfc384e925058aadd21b83a33924e3ce Mon Sep 17 00:00:00 2001
From: Jean-Yves Gaulier <gaulier@alchemy.fr>
Date: Thu, 9 Jan 2020 20:31:09 +0100
Subject: [PATCH 08/11] PHRAS-2757_print-feedback_4.1 Add a print format when
 printing a feedback basket Only the creator of the feedback can print it.

---
 .../Controller/Prod/PrinterController.php     |  15 +-
 lib/Alchemy/Phrasea/Model/Entities/Basket.php |  14 +-
 lib/Alchemy/Phrasea/Out/Module/PDF.php        | 523 +-------------
 lib/Alchemy/Phrasea/Out/Module/PDFRecords.php | 675 ++++++++++++++++++
 .../prod/actions/printer_default.html.twig    |  11 +
 5 files changed, 712 insertions(+), 526 deletions(-)
 create mode 100644 lib/Alchemy/Phrasea/Out/Module/PDFRecords.php

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php b/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php
index d2bc03b190..0d9c4a466f 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/PrinterController.php
@@ -12,7 +12,7 @@ namespace Alchemy\Phrasea\Controller\Prod;
 use Alchemy\Phrasea\Application\Helper\DataboxLoggerAware;
 use Alchemy\Phrasea\Controller\Controller;
 use Alchemy\Phrasea\Helper\Record as RecordHelper;
-use Alchemy\Phrasea\Out\Module\PDF as PDFExport;
+use Alchemy\Phrasea\Out\Module\PDFRecords;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -24,19 +24,27 @@ class PrinterController extends Controller
     {
         $printer = new RecordHelper\Printer($this->app, $request);
 
-        return $this->render('prod/actions/printer_default.html.twig', ['printer' => $printer, 'message' => '']);
+        $basketFeedbackId = null;
+        if($printer->is_basket() && ($basket = $printer->get_original_basket()) && ($validation = $basket->getValidation())) {
+            if($validation->getInitiator()->getId() === $this->app->getAuthenticatedUser()->getId()) {
+                $basketFeedbackId = $basket->getId();
+            }
+        }
+
+        return $this->render('prod/actions/printer_default.html.twig', ['printer' => $printer, 'message' => '', 'basketFeedbackId' => $basketFeedbackId]);
     }
 
     public function printAction(Request $request)
     {
         $printer = new RecordHelper\Printer($this->app, $request);
+        $b = $printer->get_original_basket();
 
         $layout = $request->request->get('lay');
 
         foreach ($printer->get_elements() as $record) {
             $this->getDataboxLogger($record->getDatabox())->log($record, \Session_Logger::EVENT_PRINT, $layout, '');
         }
-        $PDF = new PDFExport($this->app, $printer->get_elements(), $layout);
+        $PDF = new PDFRecords($this->app, $printer, $layout);
 
         $response = new Response($PDF->render(), 200, array('Content-Type' => 'application/pdf'));
         $response->headers->set('Pragma', 'public', true);
@@ -44,4 +52,5 @@ class PrinterController extends Controller
 
         return $response;
     }
+
 }
diff --git a/lib/Alchemy/Phrasea/Model/Entities/Basket.php b/lib/Alchemy/Phrasea/Model/Entities/Basket.php
index c25b074634..eea18b21e0 100644
--- a/lib/Alchemy/Phrasea/Model/Entities/Basket.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/Basket.php
@@ -456,17 +456,27 @@ class Basket
     }
 
     public function hasRecord(Application $app, \record_adapter $record)
+    {
+        return !is_null($this->getElementByRecord($app, $record));
+    }
+
+    /**
+     * @param Application $app
+     * @param \record_adapter $record
+     * @return BasketElement
+     */
+    public function getElementByRecord(Application $app, \record_adapter $record)
     {
         foreach ($this->getElements() as $basket_element) {
             $bask_record = $basket_element->getRecord($app);
 
             if ($bask_record->getRecordId() == $record->getRecordId()
                 && $bask_record->getDataboxId() == $record->getDataboxId()) {
-                return true;
+                return $basket_element;
             }
         }
 
-        return false;
+        return null;
     }
 
     public function getSize(Application $app)
diff --git a/lib/Alchemy/Phrasea/Out/Module/PDF.php b/lib/Alchemy/Phrasea/Out/Module/PDF.php
index 7514a099db..7e29c3b459 100644
--- a/lib/Alchemy/Phrasea/Out/Module/PDF.php
+++ b/lib/Alchemy/Phrasea/Out/Module/PDF.php
@@ -20,6 +20,7 @@ class PDF
     protected $records;
     protected $pdf;
 
+    const LAYOUT_FEEDBACK = 'feedback';
     const LAYOUT_PREVIEW = 'preview';
     const LAYOUT_PREVIEWCAPTION = 'previewCaption';
     const LAYOUT_PREVIEWCAPTIONTDM = 'previewCaptionTdm';
@@ -27,64 +28,10 @@ class PDF
     const LAYOUT_THUMBNAILGRID = 'thumbnailGrid';
     const LAYOUT_CAPTION = 'caption';
 
-    public function __construct(Application $app, array $records, $layout)
+    public function __construct(Application $app)
     {
         $this->app = $app;
 
-        $list = [];
-
-        foreach ($records as $record) {
-            switch ($layout) {
-                default:
-                    throw new \Exception('Unknown layout');
-                    break;
-                case self::LAYOUT_PREVIEW:
-                case self::LAYOUT_PREVIEWCAPTION:
-                case self::LAYOUT_PREVIEWCAPTIONTDM:
-                    try {
-                        $subdef = $record->get_subdef('preview');
-                        // fallback to thumbnail ( video, sound, doc ) ..
-                        if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
-                            $subdef = $record->get_thumbnail();
-                        }
-
-                        if (!$subdef->is_physically_present()) {
-                            continue 2;
-                        }
-
-                        if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
-                            continue 2;
-                        }
-                    } catch (\Exception $e) {
-                        continue 2;
-                    }
-                    break;
-                case self::LAYOUT_THUMBNAILLIST:
-                case self::LAYOUT_THUMBNAILGRID:
-                    try {
-                        $subdef = $record->get_thumbnail();
-                        if (!$subdef->is_physically_present()) {
-                            continue 2;
-                        }
-
-                        if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
-                            continue 2;
-                        }
-                    } catch (\Exception $e) {
-                        continue 2;
-                    }
-                    break;
-                case self::LAYOUT_CAPTION:
-                    break;
-            }
-
-            $record->setNumber(count($list) + 1);
-
-            $list[] = $record;
-        }
-
-        $this->records = $list;
-
         $pdf = new PhraseaPDF("P", "mm", "A4", true, 'UTF-8', false);
 
         $pdf->SetAuthor("Phraseanet");
@@ -92,29 +39,6 @@ class PDF
         $pdf->SetDisplayMode("fullpage", "single");
 
         $this->pdf = $pdf;
-
-        switch ($layout) {
-            case self::LAYOUT_PREVIEW:
-                $this->print_preview(false, false);
-                break;
-            case self::LAYOUT_PREVIEWCAPTION:
-                $this->print_preview(false, true);
-                break;
-            case self::LAYOUT_PREVIEWCAPTIONTDM:
-                $this->print_preview(true, true);
-                break;
-            case self::LAYOUT_THUMBNAILLIST:
-                $this->print_thumbnailList();
-                break;
-            case self::LAYOUT_THUMBNAILGRID:
-                $this->print_thumbnailGrid();
-                break;
-            case self::LAYOUT_CAPTION:
-                $this->print_caption();
-                break;
-        }
-
-        return $this;
     }
 
     public function render()
@@ -123,447 +47,4 @@ class PDF
 
         return $this->pdf->Output('', 'S');
     }
-
-    protected function print_thumbnailGrid($links = false)
-    {
-        $NDiapoW = 3;
-        $NDiapoH = 4;
-
-        $this->pdf->AddPage();
-
-        $oldMargins = $this->pdf->getMargins();
-        $tmargin = $oldMargins['top'];
-        $lmargin = $oldMargins['left'];
-        $bmargin = $oldMargins['bottom'];
-        $rmargin = $oldMargins['right'];
-
-        $this->pdf->SetLeftMargin($lmargin + 55);
-
-        $clientW = $this->pdf->getPageWidth() - $lmargin - $rmargin;
-        $clientH = $this->pdf->getPageHeight() - $tmargin - $bmargin;
-
-        $DiapoW = floor($clientW / $NDiapoW);
-        $DiapoH = floor($clientH / $NDiapoH);
-        $TitleH = 5;
-        $ImgSize = min($DiapoW, ($DiapoH - $TitleH)) - 5;
-
-        $npages = ceil(count($this->records) / ($NDiapoW * $NDiapoH));
-
-        $irow = $ipage = 0;
-        $icol = -1;
-        foreach ($this->records as $rec) {
-            /* @var \record_adapter $rec */
-            if (++$icol >= $NDiapoW) {
-                $icol = 0;
-                if (++$irow >= $NDiapoH) {
-                    $irow = 0;
-                    $ipage++;
-                    $this->pdf->AddPage();
-                }
-            }
-            $fimg = null;
-            $himg = 0;
-
-            $subdef = $rec->get_subdef('preview');
-
-            if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
-                $subdef = $rec->get_thumbnail();
-            }
-
-            $fimg = $subdef->getRealPath();
-
-            if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->getBaseId(), \ACL::NOWATERMARK)
-                && $subdef->get_type() == \media_subdef::TYPE_IMAGE) {
-                $fimg = \recordutils_image::watermark($this->app, $subdef);
-            }
-
-            $wimg = $himg = $ImgSize;
-            if ($subdef->get_height() > 0 && $subdef->get_width() > 0) {
-                if ($subdef->get_width() > $subdef->get_height())
-                    $himg = $wimg * $subdef->get_height() / $subdef->get_width();
-                else
-                    $wimg = $himg * $subdef->get_width() / $subdef->get_height();
-            }
-
-            if ($fimg) {
-                $x = $lmargin + ($icol * $DiapoW);
-                $y = $tmargin + ($irow * $DiapoH);
-                $this->pdf->SetDrawColor(0);
-                $this->pdf->Rect($x, $y, $DiapoW, $DiapoH, "D");
-
-                $this->pdf->SetXY($x, $y + 1);
-                $this->pdf->SetFont(PhraseaPDF::FONT, '', 10);
-                $t = $irow . '-' . $x;
-                $t = $rec->get_title();
-
-                if ($links) {
-                    $lk = $this->pdf->AddLink();
-                    $this->pdf->SetLink($lk, 0, $npages + $rec->getNumber());
-                    $this->pdf->Image(
-                        $fimg
-                        , $x + (($DiapoW - $wimg) / 2)
-                        , $TitleH + $y + (($DiapoH - $TitleH - $himg) / 2)
-                        , $wimg, $himg
-                        , null, $lk
-                    );
-                } else {
-                    $this->pdf->Image($fimg
-                        , $x + (($DiapoW - $wimg) / 2)
-                        , $TitleH + $y + (($DiapoH - $TitleH - $himg) / 2)
-                        , $wimg, $himg
-                    );
-                }
-
-                $this->pdf->MultiCell($DiapoW, $TitleH, $t, '0', 'C', false);
-            }
-        }
-        $this->pdf->SetLeftMargin($oldMargins['left']);
-    }
-
-    protected function print_thumbnailList()
-    {
-        $this->pdf->AddPage();
-        $oldMargins = $this->pdf->getMargins();
-
-        $lmargin = $oldMargins['left'];
-        $rmargin = $oldMargins['right'];
-
-        $this->pdf->SetLeftMargin($lmargin + 55);
-
-        $ndoc = 0;
-        foreach ($this->records as $rec) {
-            /* @var \record_adapter $rec */
-            $subdef = $rec->get_subdef('thumbnail');
-
-            $fimg = $subdef->getRealPath();
-
-            $wimg = $himg = 50;
-            // 1px = 3.77952 mm
-            $finalWidth = round($subdef->get_width() / 3.779528, 2);
-            $finalHeight = round($subdef->get_height() / 3.779528, 2);
-            $aspectH = $finalWidth/$finalHeight;
-            $aspectW = $finalHeight/$finalWidth;
-
-            if ($finalWidth > 0 && $finalHeight > 0) {
-                if ($finalWidth > $finalHeight && $finalWidth > $wimg) {
-                    $finalWidth = $wimg;
-                    $finalHeight = $wimg * $aspectW;
-                } else if ($finalHeight > $finalWidth && $finalHeight > $himg) {
-                    $finalHeight = $himg;
-                    $finalWidth = $himg * $aspectH;
-                } else if ($finalHeight == $finalWidth & $finalWidth > $wimg) {
-                    $finalHeight = $wimg;
-                    $finalWidth = $himg;
-                }
-            }
-
-            if ($this->pdf->GetY() > $this->pdf->getPageHeight() - (6 + $finalHeight + 20))
-                $this->pdf->AddPage();
-
-            $title = "record : " . $rec->get_title();
-
-            $y = $this->pdf->GetY();
-
-            $t = \phrasea::bas_labels($rec->getBaseId(), $this->app);
-            $this->pdf->SetFont(PhraseaPDF::FONT, '', 10);
-            $this->pdf->SetFillColor(220, 220, 220);
-            $this->pdf->SetLeftMargin($lmargin);
-            $this->pdf->SetRightMargin($rmargin);
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-
-            $this->pdf->out = false;
-            $this->pdf->MultiCell(140, 4, $title, "LTR", "L", 1);
-            $y2 = $this->pdf->GetY();
-            $h = $y2 - $y;
-            $this->pdf->out = true;
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-            $this->pdf->Cell(0, $h, "", "LTR", 1, "R", 1);
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-            $this->pdf->Cell(0, 4, $t, "", 1, "R");
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-            $this->pdf->MultiCell(140, 4, $title, "", "L");
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y = $y2);
-
-            $this->pdf->SetLeftMargin($lmargin + 55);
-            $this->pdf->SetY($y + 2);
-
-            if ($fimg) {
-                $y = $this->pdf->GetY();
-                $this->pdf->Image($fimg, $lmargin, $y, $finalWidth, $finalHeight);
-                $this->pdf->SetY($y + 3);
-            }
-
-            $nf = 0;
-            $this->pdf->SetX($lmargin + 55);
-            $p0 = $this->pdf->PageNo();
-            $y0 = $this->pdf->GetY();
-            foreach ($rec->get_caption()->get_fields() as $field) {
-                /* @var $field caption_field */
-
-                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
-                $this->pdf->Write(5, $field->get_name() . " : ");
-
-                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
-                $this->pdf->Write(5, $field->get_serialized_values());
-
-                $this->pdf->Write(6, "\n");
-                $nf++;
-            }
-            if ($this->pdf->PageNo() == $p0 && ($this->pdf->GetY() - $y0) < $finalHeight)
-                $this->pdf->SetY($y0 + $finalHeight);
-            $ndoc++;
-        }
-        $this->pdf->SetLeftMargin($lmargin);
-    }
-
-    protected function print_caption()
-    {
-        $this->pdf->AddPage();
-        $oldMargins = $this->pdf->getMargins();
-
-        $lmargin = $oldMargins['left'];
-        $rmargin = $oldMargins['right'];
-
-        foreach ($this->records as $rec) {
-            $title = "record : " . $rec->get_title();
-
-            $y = $this->pdf->GetY();
-            if($this->pdf->getPageHeight() - $y < 20){ // height of the footer is 15
-                $this->pdf->AddPage();
-                $y = $oldMargins['top'];
-            }
-
-            $t = \phrasea::bas_labels($rec->getBaseId(), $this->app);
-            $this->pdf->SetFont(PhraseaPDF::FONT, '', 10);
-            $this->pdf->SetFillColor(220, 220, 220);
-            $this->pdf->SetLeftMargin($lmargin);
-            $this->pdf->SetRightMargin($rmargin);
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-
-            $this->pdf->out = false;
-            $this->pdf->MultiCell(140, 4, $title, "LTR", "L", 1);
-            $y2 = $this->pdf->GetY();
-            $h = $y2 - $y;
-            $this->pdf->out = true;
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-            $this->pdf->Cell(0, $h, "", "LTR", 1, "R", 1);
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-            $this->pdf->Cell(0, 4, $t, "", 1, "R");
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y);
-            $this->pdf->MultiCell(140, 4, $title, "", "L");
-            $this->pdf->SetX($lmargin);
-            $this->pdf->SetY($y = $y2);
-            $this->pdf->SetY($y + 2);
-
-            foreach ($rec->get_caption()->get_fields() as $field) {
-                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
-                $this->pdf->Write(5, $field->get_name() . " : ");
-
-                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
-                $t = str_replace(
-                    ["&lt;", "&gt;", "&amp;"]
-                    , ["<", ">", "&"]
-                    , strip_tags($field->get_serialized_values())
-                );
-                $this->pdf->Write(5, $t);
-
-                $this->pdf->Write(6, "\n");
-            }
-            $this->pdf->SetY($this->pdf->GetY() + 10);
-        }
-    }
-
-    protected function print_preview($withtdm, $write_caption)
-    {
-        if ($withtdm === true) {
-            $this->print_thumbnailGrid($this->pdf, $this->records, true);
-        }
-
-        foreach ($this->records as $krec => $rec) {
-            /* @var \record_adapter $rec */
-
-            $this->pdf->AddPage();
-
-            if ($withtdm === "CALCPAGES") {
-                $rec->setNumber($this->pdf->PageNo());
-            }
-            $lmargin = $this->pdf->GetX();
-            $himg = 0;
-            $y = 0;
-            $miniConv = NULL;
-
-            $LEFT__TEXT = "";
-            $LEFT__IMG = NULL;
-            $RIGHT_TEXT = "";
-            $RIGHT_IMG = NULL;
-
-            $LEFT__IMG = $this->app['root.path'] . "/config/minilogos/logopdf_" . $rec->getDataboxId() . ".jpg";
-
-            if (!is_file($LEFT__IMG)) {
-                $databox = $rec->getDatabox();
-                $str = $databox->get_sxml_structure();
-                $vn = (string) ($str->pdfPrintLogo);
-                if (($vn * 1) == 1) {
-                    $LEFT__TEXT = $databox->get_label($this->app['locale']);
-                }
-            }
-
-            $collection = \collection::getByBaseId($this->app, $rec->getBaseId());
-
-            $vn = "";
-            if (false !== $str = simplexml_load_string($collection->get_prefs())) {
-                $vn = (string) ($str->pdfPrintappear);
-            }
-
-            if ($vn == "" || $vn == "1") {
-                $RIGHT_TEXT = \phrasea::bas_labels($rec->getBaseId(), $this->app);
-            } elseif ($vn == "2") {
-                $RIGHT_IMG = $this->app['root.path'] . "/config/minilogos/" . $rec->getBaseId();
-            }
-
-            $xtmp = $this->pdf->GetX();
-            $ytmp = $this->pdf->GetY();
-
-            $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
-            $this->pdf->SetFillColor(220, 220, 220);
-            $y = $this->pdf->GetY();
-            $this->pdf->MultiCell(95, 7, $LEFT__TEXT, "LTB", "L", 1);
-            $y2 = $this->pdf->GetY();
-            $h = $y2 - $y;
-            $this->pdf->SetY($y);
-            $this->pdf->SetX(105);
-            $this->pdf->Cell(95, $h, $RIGHT_TEXT, "TBR", 1, "R", 1);
-
-            if ($LEFT__TEXT == "" && is_file($LEFT__IMG)) {
-                if ($size = @getimagesize($LEFT__IMG)) {
-                    $wmm = (int) $size[0] * 25.4 / 72;
-                    $hmm = (int) $size[1] * 25.4 / 72;
-                    if ($hmm > 6) {
-                        $coeff = $hmm / 6;
-                        $wmm = (int) $wmm / $coeff;
-                        $hmm = (int) $hmm / $coeff;
-                    }
-                    $this->pdf->Image($LEFT__IMG, $xtmp + 0.5, $ytmp + 0.5, $wmm, $hmm);
-                }
-            }
-
-            if ($RIGHT_IMG != NULL && is_file($RIGHT_IMG)) {
-                if ($size = @getimagesize($RIGHT_IMG)) {
-
-                    if ($size[2] == '1') {
-                        if (!isset($miniConv[$RIGHT_IMG])) {
-                            $tmp_filename = tempnam('minilogos/', 'gif4fpdf');
-                            $img = imagecreatefromgif($RIGHT_IMG);
-                            imageinterlace($img, 0);
-                            imagepng($img, $tmp_filename);
-                            rename($tmp_filename, $tmp_filename . '.png');
-                            $miniConv[$RIGHT_IMG] = $tmp_filename . '.png';
-                            $RIGHT_IMG = $tmp_filename . '.png';
-                        } else
-                            $RIGHT_IMG = $miniConv[$RIGHT_IMG];
-
-                        $wmm = (int) $size[0] * 25.4 / 72;
-                        $hmm = (int) $size[1] * 25.4 / 72;
-                        if ($hmm > 6) {
-                            $coeff = $hmm / 6;
-                            $wmm = (int) $wmm / $coeff;
-                            $hmm = (int) $hmm / $coeff;
-                        }
-                        $tt = 0;
-                        if ($hmm < 6)
-                            $tt = (6 - $hmm) / 2;
-                        $this->pdf->Image($RIGHT_IMG, 200 - 0.5 - $wmm, $ytmp + 0.5 + $tt);
-                    } else {
-                        $wmm = (int) $size[0] * 25.4 / 72;
-                        $hmm = (int) $size[1] * 25.4 / 72;
-                        if ($hmm > 6) {
-                            $coeff = $hmm / 6;
-                            $wmm = (int) $wmm / $coeff;
-                            $hmm = (int) $hmm / $coeff;
-                        }
-                        $this->pdf->Image($RIGHT_IMG, 200 - 0.5 - $wmm, $ytmp + 0.5);
-                    }
-                }
-            }
-
-            $y = $this->pdf->GetY() + 5;
-
-            $subdef = $rec->get_subdef('preview');
-
-            if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
-                $subdef = $rec->get_thumbnail();
-            }
-
-            $f = $subdef->getRealPath();
-
-            if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->getBaseId(), \ACL::NOWATERMARK)
-                && $subdef->get_type() == \media_subdef::TYPE_IMAGE)
-                $f = \recordutils_image::watermark($this->app, $subdef);
-
-            // original height / original width x new width = new height
-            $wimg = $himg = 150; // preview dans un carre de 150 mm
-            // 1px = 3.77952 mm
-            $finalWidth = round($subdef->get_width() / 3.779528, 2);
-            $finalHeight = round($subdef->get_height() / 3.779528, 2);
-            $aspectH = $finalWidth/$finalHeight;
-            $aspectW = $finalHeight/$finalWidth;
-
-            if ($finalWidth > 0 && $finalHeight > 0) {
-                if ($finalWidth > $finalHeight && $finalWidth > $wimg) {
-                    $finalWidth = $wimg;
-                    $finalHeight = $wimg * $aspectW;
-                } else if ($finalHeight > $finalWidth && $finalHeight > $himg) {
-                    $finalHeight = $himg;
-                    $finalWidth = $himg * $aspectH;
-                } else if ($finalHeight == $finalWidth & $finalWidth > $wimg) {
-                    $finalHeight = $wimg;
-                    $finalWidth = $himg;
-                }
-            }
-
-            $this->pdf->Image($f, (210 - $finalWidth) / 2, $y, $finalWidth, $finalHeight);
-
-            if ($miniConv != NULL) {
-                foreach ($miniConv as $oneF)
-                    unlink($oneF);
-            }
-            $this->pdf->SetXY($lmargin, $y += ( $finalHeight + 5));
-
-            $nf = 0;
-            if ($write_caption) {
-                foreach ($rec->get_caption()->get_fields() as $field) {
-                    /* @var $field caption_field */
-                    if ($nf > 0) {
-                        $this->pdf->Write(6, "\n");
-                    }
-
-                    $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
-                    $this->pdf->Write(5, $field->get_name() . " : ");
-
-                    $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
-
-                    $t = str_replace(
-                        ["&lt;", "&gt;", "&amp;"]
-                        , ["<", ">", "&"]
-                        , strip_tags($field->get_serialized_values())
-                    );
-
-                    $this->pdf->Write(5, $t);
-
-                    $nf++;
-                }
-            }
-        }
-
-        return;
-    }
 }
diff --git a/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php b/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php
new file mode 100644
index 0000000000..1a201a5499
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php
@@ -0,0 +1,675 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2016 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Out\Module;
+
+use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Out\Tool\PhraseaPDF;
+use Alchemy\Phrasea\Helper\Record\Printer;
+use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
+
+class PDFRecords extends PDF
+{
+    /** @var Printer */
+    private $printer;
+
+    public function __construct(Application $app, Printer $printer, $layout)
+    {
+        parent::__construct($app);
+        $this->printer = $printer;
+
+        $records = $printer->get_elements();
+
+        $list = [];
+
+        foreach ($records as $record) {
+            switch ($layout) {
+                default:
+                    throw new \Exception('Unknown layout');
+                    break;
+                case self::LAYOUT_FEEDBACK:
+                case self::LAYOUT_PREVIEW:
+                case self::LAYOUT_PREVIEWCAPTION:
+                case self::LAYOUT_PREVIEWCAPTIONTDM:
+                    try {
+                        $subdef = $record->get_subdef('preview');
+                        // fallback to thumbnail ( video, sound, doc ) ..
+                        if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
+                            $subdef = $record->get_thumbnail();
+                        }
+
+                        if (!$subdef->is_physically_present()) {
+                            continue 2;
+                        }
+
+                        if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
+                            continue 2;
+                        }
+                    } catch (\Exception $e) {
+                        continue 2;
+                    }
+                    break;
+                case self::LAYOUT_THUMBNAILLIST:
+                case self::LAYOUT_THUMBNAILGRID:
+                    try {
+                        $subdef = $record->get_thumbnail();
+                        if (!$subdef->is_physically_present()) {
+                            continue 2;
+                        }
+
+                        if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
+                            continue 2;
+                        }
+                    } catch (\Exception $e) {
+                        continue 2;
+                    }
+                    break;
+                case self::LAYOUT_CAPTION:
+                    break;
+            }
+
+            $record->setNumber(count($list) + 1);
+
+            $list[] = $record;
+        }
+
+        $this->records = $list;
+
+        switch ($layout) {
+            case self::LAYOUT_FEEDBACK:
+                $this->print_preview(false, true, true);
+                break;
+            case self::LAYOUT_PREVIEW:
+                $this->print_preview(false, false, false);
+                break;
+            case self::LAYOUT_PREVIEWCAPTION:
+                $this->print_preview(false, true, false);
+                break;
+            case self::LAYOUT_PREVIEWCAPTIONTDM:
+                $this->print_preview(true, true, false);
+                break;
+            case self::LAYOUT_THUMBNAILLIST:
+                $this->print_thumbnailList();
+                break;
+            case self::LAYOUT_THUMBNAILGRID:
+                $this->print_thumbnailGrid();
+                break;
+            case self::LAYOUT_CAPTION:
+                $this->print_caption();
+                break;
+        }
+    }
+
+    protected function print_thumbnailGrid($links = false)
+    {
+        $NDiapoW = 3;
+        $NDiapoH = 4;
+
+        $this->pdf->AddPage();
+
+        $oldMargins = $this->pdf->getMargins();
+        $tmargin = $oldMargins['top'];
+        $lmargin = $oldMargins['left'];
+        $bmargin = $oldMargins['bottom'];
+        $rmargin = $oldMargins['right'];
+
+        $this->pdf->SetLeftMargin($lmargin + 55);
+
+        $clientW = $this->pdf->getPageWidth() - $lmargin - $rmargin;
+        $clientH = $this->pdf->getPageHeight() - $tmargin - $bmargin;
+
+        $DiapoW = floor($clientW / $NDiapoW);
+        $DiapoH = floor($clientH / $NDiapoH);
+        $TitleH = 5;
+        $ImgSize = min($DiapoW, ($DiapoH - $TitleH)) - 5;
+
+        $npages = ceil(count($this->records) / ($NDiapoW * $NDiapoH));
+
+        $irow = $ipage = 0;
+        $icol = -1;
+        foreach ($this->records as $rec) {
+            /* @var \record_adapter $rec */
+            if (++$icol >= $NDiapoW) {
+                $icol = 0;
+                if (++$irow >= $NDiapoH) {
+                    $irow = 0;
+                    $ipage++;
+                    $this->pdf->AddPage();
+                }
+            }
+            $fimg = null;
+            $himg = 0;
+
+            $subdef = $rec->get_subdef('preview');
+
+            if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
+                $subdef = $rec->get_thumbnail();
+            }
+
+            $fimg = $subdef->getRealPath();
+
+            if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->getBaseId(), \ACL::NOWATERMARK)
+                && $subdef->get_type() == \media_subdef::TYPE_IMAGE) {
+                $fimg = \recordutils_image::watermark($this->app, $subdef);
+            }
+
+            $wimg = $himg = $ImgSize;
+            if ($subdef->get_height() > 0 && $subdef->get_width() > 0) {
+                if ($subdef->get_width() > $subdef->get_height())
+                    $himg = $wimg * $subdef->get_height() / $subdef->get_width();
+                else
+                    $wimg = $himg * $subdef->get_width() / $subdef->get_height();
+            }
+
+            if ($fimg) {
+                $x = $lmargin + ($icol * $DiapoW);
+                $y = $tmargin + ($irow * $DiapoH);
+                $this->pdf->SetDrawColor(0);
+                $this->pdf->Rect($x, $y, $DiapoW, $DiapoH, "D");
+
+                $this->pdf->SetXY($x, $y + 1);
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 10);
+                $t = $irow . '-' . $x;
+                $t = $rec->get_title();
+
+                if ($links) {
+                    $lk = $this->pdf->AddLink();
+                    $this->pdf->SetLink($lk, 0, $npages + $rec->getNumber());
+                    $this->pdf->Image(
+                        $fimg
+                        , $x + (($DiapoW - $wimg) / 2)
+                        , $TitleH + $y + (($DiapoH - $TitleH - $himg) / 2)
+                        , $wimg, $himg
+                        , null, $lk
+                    );
+                } else {
+                    $this->pdf->Image($fimg
+                        , $x + (($DiapoW - $wimg) / 2)
+                        , $TitleH + $y + (($DiapoH - $TitleH - $himg) / 2)
+                        , $wimg, $himg
+                    );
+                }
+
+                $this->pdf->MultiCell($DiapoW, $TitleH, $t, '0', 'C', false);
+            }
+        }
+        $this->pdf->SetLeftMargin($oldMargins['left']);
+    }
+
+    protected function print_thumbnailList()
+    {
+        $this->pdf->AddPage();
+        $oldMargins = $this->pdf->getMargins();
+
+        $lmargin = $oldMargins['left'];
+        $rmargin = $oldMargins['right'];
+
+        $this->pdf->SetLeftMargin($lmargin + 55);
+
+        $ndoc = 0;
+        foreach ($this->records as $rec) {
+            /* @var \record_adapter $rec */
+            $subdef = $rec->get_subdef('thumbnail');
+
+            $fimg = $subdef->getRealPath();
+
+            $wimg = $himg = 50;
+            // 1px = 3.77952 mm
+            $finalWidth = round($subdef->get_width() / 3.779528, 2);
+            $finalHeight = round($subdef->get_height() / 3.779528, 2);
+            $aspectH = $finalWidth/$finalHeight;
+            $aspectW = $finalHeight/$finalWidth;
+
+            if ($finalWidth > 0 && $finalHeight > 0) {
+                if ($finalWidth > $finalHeight && $finalWidth > $wimg) {
+                    $finalWidth = $wimg;
+                    $finalHeight = $wimg * $aspectW;
+                } else if ($finalHeight > $finalWidth && $finalHeight > $himg) {
+                    $finalHeight = $himg;
+                    $finalWidth = $himg * $aspectH;
+                } else if ($finalHeight == $finalWidth & $finalWidth > $wimg) {
+                    $finalHeight = $wimg;
+                    $finalWidth = $himg;
+                }
+            }
+
+            if ($this->pdf->GetY() > $this->pdf->getPageHeight() - (6 + $finalHeight + 20))
+                $this->pdf->AddPage();
+
+            $title = "record : " . $rec->get_title();
+
+            $y = $this->pdf->GetY();
+
+            $t = \phrasea::bas_labels($rec->getBaseId(), $this->app);
+            $this->pdf->SetFont(PhraseaPDF::FONT, '', 10);
+            $this->pdf->SetFillColor(220, 220, 220);
+            $this->pdf->SetLeftMargin($lmargin);
+            $this->pdf->SetRightMargin($rmargin);
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+
+            $this->pdf->out = false;
+            $this->pdf->MultiCell(140, 4, $title, "LTR", "L", 1);
+            $y2 = $this->pdf->GetY();
+            $h = $y2 - $y;
+            $this->pdf->out = true;
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+            $this->pdf->Cell(0, $h, "", "LTR", 1, "R", 1);
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+            $this->pdf->Cell(0, 4, $t, "", 1, "R");
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+            $this->pdf->MultiCell(140, 4, $title, "", "L");
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y = $y2);
+
+            $this->pdf->SetLeftMargin($lmargin + 55);
+            $this->pdf->SetY($y + 2);
+
+            if ($fimg) {
+                $y = $this->pdf->GetY();
+                $this->pdf->Image($fimg, $lmargin, $y, $finalWidth, $finalHeight);
+                $this->pdf->SetY($y + 3);
+            }
+
+            $nf = 0;
+            $this->pdf->SetX($lmargin + 55);
+            $p0 = $this->pdf->PageNo();
+            $y0 = $this->pdf->GetY();
+            foreach ($rec->get_caption()->get_fields() as $field) {
+                /* @var $field caption_field */
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $field->get_name() . " : ");
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                $this->pdf->Write(5, $field->get_serialized_values());
+
+                $this->pdf->Write(6, "\n");
+                $nf++;
+            }
+            if ($this->pdf->PageNo() == $p0 && ($this->pdf->GetY() - $y0) < $finalHeight)
+                $this->pdf->SetY($y0 + $finalHeight);
+            $ndoc++;
+        }
+        $this->pdf->SetLeftMargin($lmargin);
+    }
+
+    protected function print_caption()
+    {
+        $this->pdf->AddPage();
+        $oldMargins = $this->pdf->getMargins();
+
+        $lmargin = $oldMargins['left'];
+        $rmargin = $oldMargins['right'];
+
+        foreach ($this->records as $rec) {
+            $title = "record : " . $rec->get_title();
+
+            $y = $this->pdf->GetY();
+            if($this->pdf->getPageHeight() - $y < 20){ // height of the footer is 15
+                $this->pdf->AddPage();
+                $y = $oldMargins['top'];
+            }
+
+            $t = \phrasea::bas_labels($rec->getBaseId(), $this->app);
+            $this->pdf->SetFont(PhraseaPDF::FONT, '', 10);
+            $this->pdf->SetFillColor(220, 220, 220);
+            $this->pdf->SetLeftMargin($lmargin);
+            $this->pdf->SetRightMargin($rmargin);
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+
+            $this->pdf->out = false;
+            $this->pdf->MultiCell(140, 4, $title, "LTR", "L", 1);
+            $y2 = $this->pdf->GetY();
+            $h = $y2 - $y;
+            $this->pdf->out = true;
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+            $this->pdf->Cell(0, $h, "", "LTR", 1, "R", 1);
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+            $this->pdf->Cell(0, 4, $t, "", 1, "R");
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y);
+            $this->pdf->MultiCell(140, 4, $title, "", "L");
+            $this->pdf->SetX($lmargin);
+            $this->pdf->SetY($y = $y2);
+            $this->pdf->SetY($y + 2);
+
+            foreach ($rec->get_caption()->get_fields() as $field) {
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $field->get_name() . " : ");
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                $t = str_replace(
+                    ["&lt;", "&gt;", "&amp;"]
+                    , ["<", ">", "&"]
+                    , strip_tags($field->get_serialized_values())
+                );
+                $this->pdf->Write(5, $t);
+
+                $this->pdf->Write(6, "\n");
+            }
+            $this->pdf->SetY($this->pdf->GetY() + 10);
+        }
+    }
+
+
+    protected function print_preview($withtdm, $write_caption, $withfeedback)
+    {
+        $basket = $validation = null;
+
+        if($this->printer->is_basket()) {
+            $basket = $this->printer->get_original_basket();
+
+            if($withfeedback) {
+                // first page : validation informations
+                $validation = $basket->getValidation();
+
+                $this->pdf->AddPage();
+
+                $this->pdf->SetY(20);
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 14);
+                $this->pdf->Cell(0, 0,
+                    $this->app->trans("print_feedback:: Feedback on basket %name%", ['%name%'=>$basket->getName()]),
+                    '', 1, 'C', false);
+
+                $this->pdf->SetY($this->pdf->GetY()+10);
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $this->app->trans("print_feedback:: Document generated on : "));
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                $this->pdf->Write(5, $this->app['date-formatter']->getDate(new \DateTime('now')));
+                $this->pdf->Write(12, "\n");
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback initiated by : "));
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                $this->pdf->Write(5, $validation->getInitiator()->getLogin());
+                $this->pdf->Write(6, "\n");
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback initiated on : "));
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                $this->pdf->Write(5, $this->app['date-formatter']->getDate($validation->getCreated()));
+                $this->pdf->Write(6, "\n");
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback expiring on : "));
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                $this->pdf->Write(5, $this->app['date-formatter']->getDate($validation->getExpires()));
+                $this->pdf->Write(12, "\n");
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback " . ($validation->isFinished() ? "expired" : "active")));
+                $this->pdf->Write(12, "\n");
+
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $this->app->trans("print_feedback:: Participants : "));
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                foreach ($validation->getParticipants() as $participant) {
+                    $this->pdf->Write(5, "\n - " . $participant->getUser()->getLogin());
+                }
+            }
+        }
+
+        if ($withtdm === true) {
+            $this->print_thumbnailGrid($this->pdf, $this->records, true);
+        }
+
+        foreach ($this->records as $krec => $rec) {
+            /* @var \record_adapter $rec */
+
+            $this->pdf->AddPage();
+
+            if ($withtdm === "CALCPAGES") {
+                $rec->setNumber($this->pdf->PageNo());
+            }
+            $lmargin = $this->pdf->GetX();
+            $himg = 0;
+            $y = 0;
+            $miniConv = NULL;
+
+            $LEFT__TEXT = "";
+            $LEFT__IMG = NULL;
+            $RIGHT_TEXT = "";
+            $RIGHT_IMG = NULL;
+
+            $LEFT__IMG = $this->app['root.path'] . "/config/minilogos/logopdf_" . $rec->getDataboxId() . ".jpg";
+
+            if (!is_file($LEFT__IMG)) {
+                $databox = $rec->getDatabox();
+                $str = $databox->get_sxml_structure();
+                $vn = (string) ($str->pdfPrintLogo);
+                if (($vn * 1) == 1) {
+                    $LEFT__TEXT = $databox->get_label($this->app['locale']);
+                }
+            }
+
+            $collection = \collection::getByBaseId($this->app, $rec->getBaseId());
+
+            $vn = "";
+            if (false !== $str = simplexml_load_string($collection->get_prefs())) {
+                $vn = (string) ($str->pdfPrintappear);
+            }
+
+            if ($vn == "" || $vn == "1") {
+                $RIGHT_TEXT = \phrasea::bas_labels($rec->getBaseId(), $this->app);
+            } elseif ($vn == "2") {
+                $RIGHT_IMG = $this->app['root.path'] . "/config/minilogos/" . $rec->getBaseId();
+            }
+
+            $xtmp = $this->pdf->GetX();
+            $ytmp = $this->pdf->GetY();
+
+            $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+            $this->pdf->SetFillColor(220, 220, 220);
+            $y = $this->pdf->GetY();
+            $this->pdf->MultiCell(95, 7, $LEFT__TEXT, "LTB", "L", 1);
+            $y2 = $this->pdf->GetY();
+            $h = $y2 - $y;
+            $this->pdf->SetY($y);
+            $this->pdf->SetX(105);
+            $this->pdf->Cell(95, $h, $RIGHT_TEXT, "TBR", 1, "R", 1);
+
+            if($basket) {
+                $ord = $basket->getElementByRecord($this->app, $rec)->getOrd();
+                $this->pdf->SetY($y);
+                $this->pdf->SetX(10);
+                $this->pdf->Cell(190, $h, '#' . $ord, "", 1, "C", 0);
+            }
+
+            if ($LEFT__TEXT == "" && is_file($LEFT__IMG)) {
+                if ($size = @getimagesize($LEFT__IMG)) {
+                    $wmm = (int) $size[0] * 25.4 / 72;
+                    $hmm = (int) $size[1] * 25.4 / 72;
+                    if ($hmm > 6) {
+                        $coeff = $hmm / 6;
+                        $wmm = (int) $wmm / $coeff;
+                        $hmm = (int) $hmm / $coeff;
+                    }
+                    $this->pdf->Image($LEFT__IMG, $xtmp + 0.5, $ytmp + 0.5, $wmm, $hmm);
+                }
+            }
+
+            if ($RIGHT_IMG != NULL && is_file($RIGHT_IMG)) {
+                if ($size = @getimagesize($RIGHT_IMG)) {
+
+                    if ($size[2] == '1') {
+                        if (!isset($miniConv[$RIGHT_IMG])) {
+                            $tmp_filename = tempnam('minilogos/', 'gif4fpdf');
+                            $img = imagecreatefromgif($RIGHT_IMG);
+                            imageinterlace($img, 0);
+                            imagepng($img, $tmp_filename);
+                            rename($tmp_filename, $tmp_filename . '.png');
+                            $miniConv[$RIGHT_IMG] = $tmp_filename . '.png';
+                            $RIGHT_IMG = $tmp_filename . '.png';
+                        } else
+                            $RIGHT_IMG = $miniConv[$RIGHT_IMG];
+
+                        $wmm = (int) $size[0] * 25.4 / 72;
+                        $hmm = (int) $size[1] * 25.4 / 72;
+                        if ($hmm > 6) {
+                            $coeff = $hmm / 6;
+                            $wmm = (int) $wmm / $coeff;
+                            $hmm = (int) $hmm / $coeff;
+                        }
+                        $tt = 0;
+                        if ($hmm < 6)
+                            $tt = (6 - $hmm) / 2;
+                        $this->pdf->Image($RIGHT_IMG, 200 - 0.5 - $wmm, $ytmp + 0.5 + $tt);
+                    } else {
+                        $wmm = (int) $size[0] * 25.4 / 72;
+                        $hmm = (int) $size[1] * 25.4 / 72;
+                        if ($hmm > 6) {
+                            $coeff = $hmm / 6;
+                            $wmm = (int) $wmm / $coeff;
+                            $hmm = (int) $hmm / $coeff;
+                        }
+                        $this->pdf->Image($RIGHT_IMG, 200 - 0.5 - $wmm, $ytmp + 0.5);
+                    }
+                }
+            }
+
+            $y = $this->pdf->GetY() + 5;
+
+            $subdef = $rec->get_subdef('preview');
+
+            if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
+                $subdef = $rec->get_thumbnail();
+            }
+
+            $f = $subdef->getRealPath();
+
+            if (!$this->app->getAclForUser($this->app->getAuthenticatedUser())->has_right_on_base($rec->getBaseId(), \ACL::NOWATERMARK)
+                && $subdef->get_type() == \media_subdef::TYPE_IMAGE)
+                $f = \recordutils_image::watermark($this->app, $subdef);
+
+            // original height / original width x new width = new height
+            $wimg = $himg = 150; // preview dans un carre de 150 mm
+            // 1px = 3.77952 mm
+            $finalWidth = round($subdef->get_width() / 3.779528, 2);
+            $finalHeight = round($subdef->get_height() / 3.779528, 2);
+            $aspectH = $finalWidth/$finalHeight;
+            $aspectW = $finalHeight/$finalWidth;
+
+            if ($finalWidth > 0 && $finalHeight > 0) {
+                if ($finalWidth > $finalHeight && $finalWidth > $wimg) {
+                    $finalWidth = $wimg;
+                    $finalHeight = $wimg * $aspectW;
+                } else if ($finalHeight > $finalWidth && $finalHeight > $himg) {
+                    $finalHeight = $himg;
+                    $finalWidth = $himg * $aspectH;
+                } else if ($finalHeight == $finalWidth & $finalWidth > $wimg) {
+                    $finalHeight = $wimg;
+                    $finalWidth = $himg;
+                }
+            }
+
+            $this->pdf->Image($f, (210 - $finalWidth) / 2, $y, $finalWidth, $finalHeight);
+
+            if ($miniConv != NULL) {
+                foreach ($miniConv as $oneF)
+                    unlink($oneF);
+            }
+            $this->pdf->SetXY($lmargin, $y += ( $finalHeight + 5));
+
+            $nf = 0;
+            if ($write_caption) {
+                foreach ($rec->get_caption()->get_fields() as $field) {
+                    /* @var $field caption_field */
+                    if ($nf > 0) {
+                        $this->pdf->Write(6, "\n");
+                    }
+
+                    $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                    $this->pdf->Write(5, $field->get_name() . " : ");
+
+                    $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+
+                    $t = str_replace(
+                        ["&lt;", "&gt;", "&amp;"]
+                        , ["<", ">", "&"]
+                        , strip_tags($field->get_serialized_values())
+                    );
+
+                    $this->pdf->Write(5, $t);
+
+                    $nf++;
+                }
+            }
+
+            if($basket && $validation) {
+                /** @var ValidationParticipant $participant */
+
+                if ($nf > 0) {
+                    $this->pdf->Write(6, "\n");
+                }
+                $this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
+                $this->pdf->Write(5, $this->app->trans("print_feedback:: Votes :"));
+                $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+
+                $basketElement = $basket->getElementByRecord($this->app, $rec);
+
+                $iparticipant = 0;
+                foreach ($validation->getParticipants() as $participant) {
+                    $this->pdf->Write(6, "\n");
+                    if($iparticipant++ > 0) {
+                        // $this->pdf->SetY($this->pdf->GetY()+1);
+                    }
+                    $validationData = $basketElement->getUserValidationDatas($participant->getUser());
+
+                    $this->pdf->Write(5, '- ' . $participant->getUser()->getLogin() . " : ");
+
+                    $r = $validationData->getAgreement();
+                    $this->pdf->SetX(100);
+                    if ($r === null) {
+                        $this->pdf->Write(0, $this->app->trans("print_feedback:: non voté"));
+                    }
+                    else {
+                        if($r) {
+                            $this->pdf->SetTextColor(0, 127, 0);
+                            $this->pdf->Write(0, $this->app->trans("print_feedback:: Oui"));
+                        }
+                        else {
+                            $this->pdf->SetTextColor(200, 0, 0);
+                            $this->pdf->Write(0, $this->app->trans("print_feedback:: Non"));
+                        }
+                        $this->pdf->SetTextColor(0);
+                        $this->pdf->Write(0, "  (" . $this->app['date-formatter']->getDate($validationData->getUpdated()) . ")");
+                    }
+
+                    if (($note = (string)($validationData->getNote())) !== '') {
+                        $this->pdf->SetFont(PhraseaPDF::FONT, 'I', 11);
+                        $this->pdf->Write(5,"\n");
+                        $this->pdf->SetX(100);
+                        $this->pdf->MultiCell(95, 0, $note, '', "L", false);
+                        $this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
+                    }
+
+                    $nf++;
+                }
+            }
+        }
+
+        return;
+    }
+
+    private function formatDate(DateTime $d)
+    {
+        // todo
+    }
+
+}
diff --git a/templates/web/prod/actions/printer_default.html.twig b/templates/web/prod/actions/printer_default.html.twig
index 880653f822..e3833c0f7d 100644
--- a/templates/web/prod/actions/printer_default.html.twig
+++ b/templates/web/prod/actions/printer_default.html.twig
@@ -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>

From 998c751843e2f0fff396b92a1be36b34ee286978 Mon Sep 17 00:00:00 2001
From: jygaulier <gaulier@alchemy.fr>
Date: Mon, 13 Jan 2020 14:48:53 +0100
Subject: [PATCH 09/11] Port PHRAS-2877

Port of PHRAS-2877 User manipulator did not allow to set a null email
Temporary Null email is used by saml plugin while creating a user.
---
 lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
index 8104c04c47..3d0815370e 100644
--- a/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
+++ b/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
@@ -368,7 +368,7 @@ class UserManipulator implements ManipulatorInterface
             throw new InvalidArgumentException(sprintf('Email %s is not legal.', $email));
         }
 
-        if (null !== $this->repository->findByEmail($email)) {
+        if (($email !== null) && (null !== $this->repository->findByEmail($email))) {
             throw new RuntimeException(sprintf('User with email %s already exists.', $email));
         }
 

From 9082c85b84d7d9551cf7647571fb998d4e1216f9 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Mon, 13 Jan 2020 18:22:11 +0400
Subject: [PATCH 10/11] PHRAS-2870 #comment fix resize video on preview #time
 8h

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

diff --git a/package.json b/package.json
index 9c24b25e60..3fd5bea9fc 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.89-d",
+    "phraseanet-production-client": "0.34.95-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/yarn.lock b/yarn.lock
index ce242614be..e108f79679 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.89-d:
-  version "0.34.89-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.89-d.tgz#14d8723014136cfa547b893fefabc22de6cdc802"
-  integrity sha512-bmuY31zbTs9Fvy3rFMe//AFE113eCYAuwbVmCTkP/3l4xfNbHFjczCokxYtEMLrQqiAp20lYx/hfZxHYxLmSow==
+phraseanet-production-client@0.34.95-d:
+  version "0.34.95-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.95-d.tgz#2fbdb3f80cfd696d3eb40b234ace08820554a752"
+  integrity sha512-wPZOVPJPK+m0405IB9OaxeQ+1LjVU+2CjcvUei8q17e/I3CXIZjVRIbLFUJW65YOYnwzAwwbBw3P13VVQrBm6w==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"

From 7319b345db73bc9a710b24c86b764906ed152183 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Tue, 14 Jan 2020 12:19:03 +0400
Subject: [PATCH 11/11] PHRAS-2870 #comment update phraseanet-production-client

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

diff --git a/package.json b/package.json
index 3fd5bea9fc..d2015b6b33 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.95-d",
+    "phraseanet-production-client": "0.34.98-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/yarn.lock b/yarn.lock
index e108f79679..f15be70554 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.95-d:
-  version "0.34.95-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.95-d.tgz#2fbdb3f80cfd696d3eb40b234ace08820554a752"
-  integrity sha512-wPZOVPJPK+m0405IB9OaxeQ+1LjVU+2CjcvUei8q17e/I3CXIZjVRIbLFUJW65YOYnwzAwwbBw3P13VVQrBm6w==
+phraseanet-production-client@0.34.98-d:
+  version "0.34.98-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.98-d.tgz#4a8da93f09e8cc3e352f3bbe70fe19033a14da77"
+  integrity sha512-2pR0Kb3toMUc2Lz9v80Z55XopikZAYKJ1nFIIABJjGVw4DRE0peSkHip2S08a4tx1CvgH9cW6tdFLQBS4RCdLQ==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"