diff --git a/package.json b/package.json index 2d92d90040..70d1fbaddb 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.146-d", + "phraseanet-production-client": "0.34.149-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 96fff7f659..6d303f8141 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
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. @@ -4905,7 +4905,7 @@ web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -6602,7 +6602,7 @@ The URL you used is out of date, please login Die URL, die Sie benutzt haben, ist nicht mehr gültig. Bitte loggen Sie sich ein - Phrasea/ControllerProvider/Lightbox.php + Phrasea/ControllerProvider/Lightbox.php The Youtube servers have received too many calls from the same caller in a short amount of time. @@ -7337,7 +7337,7 @@ mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7841,7 +7841,7 @@ You have to give your feedback at least on one document to send a report Sie müssen Ihr Feedback mindestens an einem Dokument geben, um einen Bericht zu senden - Phrasea/Controller/LightboxController.php + Phrasea/Controller/LightboxController.php You have to wait for an administrator approval for your access request @@ -8023,7 +8023,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9431,7 +9431,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10121,7 +10121,7 @@ Übersicht mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10133,6 +10133,48 @@ lightbox::see_more_basket web/lightbox/index.html.twig + + lightbox:feedback:sendreport:warnwindows:cancel + lightbox:feedback:sendreport:warnwindows:cancel + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:message + lightbox:feedback:sendreport:warnwindows:message + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_approved + lightbox:feedback:sendreport:warnwindows:record_approved + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_rejected + lightbox:feedback:sendreport:warnwindows:record_rejected + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_unexpressed + lightbox:feedback:sendreport:warnwindows:record_unexpressed + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:title + lightbox:feedback:sendreport:warnwindows:title + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:validate + lightbox:feedback:sendreport:warnwindows:validate + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + login:: Changer mon adresse email meine E-Mail Adresse ändern diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index c93ab68f91..a5ab91f476 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
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. @@ -4908,7 +4908,7 @@ web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -6605,7 +6605,7 @@ The URL you used is out of date, please login The URL you used is out of date. Please login. - Phrasea/ControllerProvider/Lightbox.php + Phrasea/ControllerProvider/Lightbox.php The Youtube servers have received too many calls from the same caller in a short amount of time. @@ -7340,7 +7340,7 @@ mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7844,7 +7844,7 @@ You have to give your feedback at least on one document to send a report You have to give at least one document feedback to send a report - Phrasea/Controller/LightboxController.php + Phrasea/Controller/LightboxController.php You have to wait for an administrator approval for your access request @@ -8026,7 +8026,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9434,7 +9434,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10124,7 +10124,7 @@ Summary mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10136,6 +10136,48 @@ See more baskets web/lightbox/index.html.twig + + lightbox:feedback:sendreport:warnwindows:cancel + lightbox:feedback:sendreport:warnwindows:cancel + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:message + lightbox:feedback:sendreport:warnwindows:message + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_approved + lightbox:feedback:sendreport:warnwindows:record_approved + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_rejected + lightbox:feedback:sendreport:warnwindows:record_rejected + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_unexpressed + lightbox:feedback:sendreport:warnwindows:record_unexpressed + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:title + lightbox:feedback:sendreport:warnwindows:title + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:validate + lightbox:feedback:sendreport:warnwindows:validate + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + login:: Changer mon adresse email Change my e-mail diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 7df3cacb5d..3ae907a829 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
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. @@ -4905,7 +4905,7 @@ web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -6604,7 +6604,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The URL you used is out of date, please login L'URL utilisée est périmé. Veuillez vous identifier. - Phrasea/ControllerProvider/Lightbox.php + Phrasea/ControllerProvider/Lightbox.php The Youtube servers have received too many calls from the same caller in a short amount of time. @@ -7339,7 +7339,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7843,7 +7843,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis You have to give your feedback at least on one document to send a report Vous devez donner au moins un avis pour envoyer un report - Phrasea/Controller/LightboxController.php + Phrasea/Controller/LightboxController.php You have to wait for an administrator approval for your access request @@ -8025,7 +8025,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9434,7 +9434,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10124,7 +10124,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Récapitulatif mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10136,6 +10136,48 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Voir plus de paniers web/lightbox/index.html.twig + + lightbox:feedback:sendreport:warnwindows:cancel + lightbox:feedback:sendreport:warnwindows:cancel + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:message + lightbox:feedback:sendreport:warnwindows:message + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_approved + lightbox:feedback:sendreport:warnwindows:record_approved + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_rejected + lightbox:feedback:sendreport:warnwindows:record_rejected + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_unexpressed + lightbox:feedback:sendreport:warnwindows:record_unexpressed + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:title + lightbox:feedback:sendreport:warnwindows:title + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:validate + lightbox:feedback:sendreport:warnwindows:validate + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + login:: Changer mon adresse email Changer mon adresse e-mail diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 939d51832c..933082ae1a 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
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. @@ -4915,7 +4915,7 @@ web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -6612,7 +6612,7 @@ The URL you used is out of date, please login De gebruikte URL is niet meer geldig, gelieve u aan te melden - Phrasea/ControllerProvider/Lightbox.php + Phrasea/ControllerProvider/Lightbox.php The Youtube servers have received too many calls from the same caller in a short amount of time. @@ -7347,7 +7347,7 @@ mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7851,7 +7851,7 @@ You have to give your feedback at least on one document to send a report U moet op tenminste één document feedback geven om een rapport te versturen - Phrasea/Controller/LightboxController.php + Phrasea/Controller/LightboxController.php You have to wait for an administrator approval for your access request @@ -8033,7 +8033,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9441,7 +9441,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10131,7 +10131,7 @@ Beknopt mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10143,6 +10143,48 @@ lightbox::see_more_basket web/lightbox/index.html.twig + + lightbox:feedback:sendreport:warnwindows:cancel + lightbox:feedback:sendreport:warnwindows:cancel + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:message + lightbox:feedback:sendreport:warnwindows:message + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_approved + lightbox:feedback:sendreport:warnwindows:record_approved + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_rejected + lightbox:feedback:sendreport:warnwindows:record_rejected + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:record_unexpressed + lightbox:feedback:sendreport:warnwindows:record_unexpressed + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:title + lightbox:feedback:sendreport:warnwindows:title + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + + + lightbox:feedback:sendreport:warnwindows:validate + lightbox:feedback:sendreport:warnwindows:validate + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig + login:: Changer mon adresse email Verander mijn email adres diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 11948e705f..33596e5930 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
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. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 183d040a1a..c0a4fb87ee 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
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. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index b97301f6e4..2dc9b0935b 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
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. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index ba3aa9800a..722071bff5 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
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. diff --git a/resources/www/lightbox/styles/main-mobile.scss b/resources/www/lightbox/styles/main-mobile.scss index e9ff61aa43..bc34f81762 100644 --- a/resources/www/lightbox/styles/main-mobile.scss +++ b/resources/www/lightbox/styles/main-mobile.scss @@ -543,6 +543,23 @@ hr { padding: 0 20px; } +.modal-footer .btn-primary { + color: #fff!important; + background-color: #007bff!important; + border-color: #007bff!important; +} +.modal-header .close { + display: inline-block; + float: right; + width: 25px; + opacity: 1; + background: #e1e1e1; +} + +.hide { + display: none; +} + button.confirm_report { background: #38c !important; color: #fff !important; diff --git a/templates/mobile/common/menubar.html.twig b/templates/mobile/common/menubar.html.twig index d8190dd5fa..b6e0101500 100644 --- a/templates/mobile/common/menubar.html.twig +++ b/templates/mobile/common/menubar.html.twig @@ -13,5 +13,7 @@ {% endif %} + + {% endif %} diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig index 67f698664f..6bb64d68db 100644 --- a/templates/mobile/lightbox/index.html.twig +++ b/templates/mobile/lightbox/index.html.twig @@ -4,10 +4,12 @@ {# #} + {% endblock %} {% block stylesheet %} + {% endblock %} {% block icon %} @@ -62,7 +64,6 @@ -
{{ 'Back' | trans }} @@ -99,6 +100,7 @@ {{ 'Validations' | trans }} {{_self.valid_baskets_length(baskets_collection)}}

+

{{ 'Voici vos validations en cours' | trans }}

@@ -168,7 +170,6 @@
- + {% endblock %} {% block stylesheet %} + {% endblock %} {% block content %} @@ -41,7 +44,40 @@ {% set basket_length = basket.getElements().count() %} {% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %}

+ + {% if basket.getValidation() %} +
{% if basket.getValidation() and basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %} - @@ -100,7 +140,6 @@
- {% endblock %} diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig index fbb1561817..4f3caeedab 100644 --- a/templates/web/lightbox/validate.html.twig +++ b/templates/web/lightbox/validate.html.twig @@ -116,6 +116,39 @@ {% endif %} + + +
diff --git a/yarn.lock b/yarn.lock index 06c87497e0..98775d43a0 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.146-d: - version "0.34.146-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.146-d.tgz#39e5e61c38a0719d46a3805d8fe3d7a64b0d7c38" - integrity sha512-0Flp6UuNiSPTo1rF80NyHjjB7sgP0c13gwtfR8Mzx0Rp7s2NFzgJnh4LXwdhWy+/WCQYnXWuH4XTJuRjmT27RA== +phraseanet-production-client@0.34.149-d: + version "0.34.149-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.149-d.tgz#e486bbe160861d259b005c7b549d8f1ea08cd82d" + integrity sha512-7aXn1WWcALhuruiz8dkLS67Z6MNkQZoxoehCE7iRdnIDRzKioYQ1wycia4MtxyL+4S5XZZb39HIunvdxGsgDSQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"