Merge branch 'master' into PHRAS-2910_Fix_order_manager_from_notification_link

resources/locales/validators.de.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-04T09:01:22Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-02-14T15:00:03Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
       <trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
         <source>Please provide the same passwords.</source>
         <target state="translated">Bitte geben Sie diesselbe Passwörter ein.</target>
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">

resources/locales/validators.en.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-04T09:01:47Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-02-14T15:00:18Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
       <trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
         <source>Please provide the same passwords.</source>
         <target state="translated">Please provide the same passwords.</target>
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">

resources/locales/validators.fr.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-04T09:02:08Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-02-14T15:00:34Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
       <trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
         <source>Please provide the same passwords.</source>
         <target state="translated">Veuillez indiquer des mots de passe identiques.</target>
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">

resources/locales/validators.nl.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-04T09:02:30Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-02-14T15:00:57Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
       <trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords.">
         <source>Please provide the same passwords.</source>
         <target state="new">Please provide the same passwords.</target>
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
         <jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">

templates/web/lightbox/index.html.twig

@@ -20,7 +20,7 @@
         <table id="main_wrapper" cellspacing="0" cellpadding="0">
             <thead>
                 <tr>
-                    <th class="title">
+                    <th class="title" id="feed_list">
                         <h1>{{ 'Validations' | trans }}</h1>
                     </th>
                     <th>
@@ -29,10 +29,12 @@
                 </tr>
             </thead>
             <tbody>
-                {% for basket in baskets_collection %}
+                {% for basket in baskets_collection | sort | reverse%}
                   {% if basket.getValidation() %}
                       {% set basket_length = basket.getElements().count() %}
-      <tr>
+                      {% set counter = ( counter | default(0) ) + 1 %}
+
+        <tr class="{% if counter >=4 %}other_feed hidden{% endif %}">
           <td colspan="2">
               <div class="basket_wrapper ui-corner-all clickable">
                   <table cellspacing="0" cellpadding="0" border="0">
@@ -84,20 +86,26 @@
               </div>
           </td>
       </tr>
+                      {% if counter == 3 %}<tr><td colspan="2" style="text-align: center"><a href="#see_more_feed" id="see_more_feed" class="see_more_feed btn btn-info">{{ 'lightbox::See_more_feedback' | trans }}</a></td></tr>{% endif %}
+
                   {% endif %}
                 {% endfor %}
+                <tr><td colspan="2" style="text-align: center"><a href="#feed_list" id="see_less_feed" class="see_more_feed hidden btn btn-success">{{ 'lightbox::See_less_feedback' | trans }}</a></td></tr>
                 <tr>
-                    <th class="title">
+                    <th class="title" id="panier_list">
                         <h1>{{ 'Paniers' | trans }}</h1>
                     </th>
                     <th>
                         <i>{{ 'Voici vos paniers' | trans }}</i>
                     </th>
                 </tr>
-                {% for basket in baskets_collection %}
+                {% for basket in baskets_collection | sort | reverse%}
                   {% if basket.getValidation is null %}
                       {% set basket_length = basket.getElements().count() %}
-      <tr>
+                      {% set counter = ( counter | default(0) ) + 1 %}
+                      {% set counter_length = baskets_collection.length() %}
+
+      <tr class="{% if counter >=4 %}other_basket hidden{% endif %}">
           <td colspan="2">
               <div class="basket_wrapper ui-corner-all clickable">
                   <table cellspacing="0" cellpadding="0" border="0">
@@ -140,9 +148,14 @@
                   <input type="hidden" name="ssel_id" value="{{ basket.getId() }}"/>
               </div>
           </td>
+
       </tr>
+                      {% if counter == 3 %}<tr><td colspan="2" style="text-align: center"><a href="#see_more_basket" id="see_more_basket" class="see_more_basket btn btn-info">{{ 'lightbox::see_more_basket' | trans }}</a></td></tr>{% endif %}
+
                   {% endif %}
                 {% endfor %}
+               <tr><td colspan="2" style="text-align: center"><a href="#panier_list" id="see_less_basket" class="see_more_basket hidden btn btn-success">{{ 'lightbox::see_less_basket' | trans }}</a></td></tr>
+
             </tbody>
         </table>
     </div>

templates/web/prod/index.html.twig

@@ -326,6 +326,9 @@
                             </div>
                             <div class="pull-right">
                                 <input class="btn btn_lightgrey reset_button search-reset-action" style="display: none;" type="button" value="{{ 'Re-initialiser' | trans }}" />
+
+                                <span class="btn btn-info btn-lg reload-search hidden " id="reload-search">{{ 'help::help-search: relaunch search without filter' | trans }}</span>
+
                             </div>
                         </div>
 

templates/web/prod/results/help.html.twig

@@ -30,63 +30,7 @@
                 <li><p>{{ 'help::help-section-bullet: search-in-a-specific-field' | trans }}</p></li>
             </ul>
         </div>
-        {#<h5>{{ 'La recherche s\'effectue grâce à la boîte de dialogue qui se trouve en haut à gauche de l\'écran.' | trans }}#}
+        <p>
-        {#{{ 'Sachez que vous pouvez utiliser les opérateurs ou caractères spéciaux suivants :' | trans }}</h5>#}
+          <span class="btn btn-info btn-lg trigger-reload-search" onclick="jQuery('.reload-search').trigger('click');">{{ 'help::help-search: relaunch search without filter' | trans }}</span></p>
-        {#<h5 style="border:#CCCCCC 2px solid">{{ '* , ? , ET , OU , SAUF , DANS , DERNIERS , TOUT (ou AND , OR , EXCEPT , LAST , ALL)' | trans }}</h5>#}
-
-        {#<h5>{{ 'Caractères de troncature' | trans }}</h5>#}
-
-        {#<table>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky">{{ 'auto*' | trans }}</kbd></td>#}
-        {#<td valign="top"> {{ 'retourne "automobile", "automate", "autoroute", ...' | trans }}</td>#}
-        {#</tr>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky">{{ 'dé?it' | trans }}</kbd></td>#}
-        {#<td valign="top"> {{ 'retourne "délit", "débit", ...' | trans }}</td>#}
-        {#</tr>#}
-        {#</table>#}
-
-        {#<h5>{{ 'Visualiser tous les enregistrements / les derniers enregistrements' | trans }}</h5>#}
-        {#<table>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky"><b>{{ 'TOUT' | trans }}</b></kbd></td>#}
-        {#<td valign="top">{{ 'retourne tous les enregistrements des collections selectionnees' | trans }}</td>#}
-        {#</tr>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky"><b>{{ 'LAST 20' | trans }}</b></kbd></td>#}
-        {#<td valign="top">{{ 'retourne les 20 derniers enregistrements archives dans les collections selectionnees' | trans }}</td>#}
-        {#</tr>#}
-        {#</table>#}
-
-        {#<h5>{{ 'Recherche multicritères' | trans }}</h5>#}
-        {#{{ 'Vous pouvez affiner votre recherche avec les opérateurs : ET, OU, SAUF ou DANS' | trans }}<br>#}
-        {#<table>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky">{{ 'sport' | trans }} <b>ET</b> {{ 'automobile' | trans }}</kbd></td>#}
-        {#<td valign="top">{{ 'retourne les documents comprenant les deux mots.' | trans }}</td>#}
-        {#</tr>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky">{{ 'journal OU jt' | trans }}</kbd></td>#}
-        {#<td valign="top">{{ 'retourne les documents comprenant un mot et/ou l\'autre.' | trans }}</td>#}
-        {#</tr>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky">{{ 'cannes SAUF festival' | trans }}</kbd></td>#}
-        {#<td valign="top">{{ 'retourne les documents comprenant cannes sans le mot festival.' | trans }}</td>#}
-        {#</tr>#}
-        {#<tr>#}
-        {#<td valign="top"><kbd class="ky">{{ 'thalassa DANS titre' | trans }}</kbd></td>#}
-        {#<td valign="top">{{ 'retourne les documents où le terme est au moins présent dans le titre, en évitant par exemple celles où le terme est uniquement cité dans la légende.' | trans }}</td>#}
-        {#</tr>#}
-        {#</table>#}
-
-        {#<center>#}
-        {#<h3 style="background-color:#CCCCCC; color:#000000">{{ 'Attention' | trans }}</h3>#}
-        {#<h4> {{ 'pour chercher une phrase contenant un des mots-clé ci-dessus, utilisez les guillemets :' | trans }}</h4>#}
-        {#<kbd class='tx'><i>"</i>{{ 'C dans l\'air' | trans }}<i>"</i></kbd>#}
-        {#,  <kbd class='tx'><i>"</i>{{ 'Et Dieu créa la femme' | trans }}<i>"</i></kbd>#}
-        {#, <kbd class='tx'><i>"</i>{{ 'bijou en or' | trans }}<i>"</i></kbd>#}
-        {#, <kbd class='tx'><i>"</i>{{ 'tout le sport' | trans }}<i>"</i></kbd>#}
-        {#</center>#}
     </div>
-{% endblock %}
+{% endblock %}

yarn.lock

@@ -7576,11 +7576,11 @@ phraseanet-common@^0.4.5-d:
     jquery "^3.2.1"
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
-
 phraseanet-production-client@0.34.128-d:
   version "0.34.128-d"
   resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.128-d.tgz#c24bebe16d99f67f45b22c7e62b783be135bf569"
   integrity sha512-AZ6Mdx26yfjQ53Y2MSBtOoopsQ3+eHA5qiRLnoUgqm6CmDdYatUyFt7lzGRk1axmVYf+2yH7jNaoHKCxb/n9UA==
+
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"