diff --git a/package.json b/package.json index 093f3c2b65..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.148-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 0cf5f98b1d..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. @@ -33,16 +33,6 @@ WorkZone/Browser/Results.html.twig - - lightbox:feedback:sendreport:warnwindows:record_null - lightbox:feedback:sendreport:warnwindows:record_null - web/lightbox/validate.html.twig - - - lightbox:feedback:sendreport:warnwindows:record_refused - lightbox:feedback:sendreport:warnwindows:record_refused - web/lightbox/validate.html.twig - #3567c6 #3567c6 @@ -4915,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% @@ -7347,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 @@ -8033,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 @@ -9441,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 @@ -10131,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 @@ -10146,22 +10136,44 @@ lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - - lightbox:feedback:sendreport:warnwindows:record_accepted - lightbox:feedback:sendreport:warnwindows:record_accepted + + 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 - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 0ea42da028..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. @@ -33,16 +33,6 @@ WorkZone/Browser/Results.html.twig - - lightbox:feedback:sendreport:warnwindows:record_null - lightbox:feedback:sendreport:warnwindows:record_null - web/lightbox/validate.html.twig - - - lightbox:feedback:sendreport:warnwindows:record_refused - lightbox:feedback:sendreport:warnwindows:record_refused - web/lightbox/validate.html.twig - #3567c6 #3567c6 @@ -4918,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% @@ -7350,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 @@ -8036,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 @@ -9444,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 @@ -10134,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 @@ -10149,22 +10139,44 @@ lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - - lightbox:feedback:sendreport:warnwindows:record_accepted - lightbox:feedback:sendreport:warnwindows:record_accepted + + 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 - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index a64bbd066d..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. @@ -33,16 +33,6 @@ WorkZone/Browser/Results.html.twig - - lightbox:feedback:sendreport:warnwindows:record_null - lightbox:feedback:sendreport:warnwindows:record_null - web/lightbox/validate.html.twig - - - lightbox:feedback:sendreport:warnwindows:record_refused - lightbox:feedback:sendreport:warnwindows:record_refused - web/lightbox/validate.html.twig - #3567c6 #3567c6 @@ -4915,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% @@ -7349,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 @@ -8035,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 @@ -9444,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 @@ -10134,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 @@ -10149,22 +10139,44 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - - lightbox:feedback:sendreport:warnwindows:record_accepted - lightbox:feedback:sendreport:warnwindows:record_accepted + + 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 - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index a82a868ae4..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. @@ -37,16 +37,6 @@ WorkZone/Browser/Results.html.twig - - lightbox:feedback:sendreport:warnwindows:record_null - lightbox:feedback:sendreport:warnwindows:record_null - web/lightbox/validate.html.twig - - - lightbox:feedback:sendreport:warnwindows:record_refused - lightbox:feedback:sendreport:warnwindows:record_refused - web/lightbox/validate.html.twig - #3567c6 #3567c6 @@ -4925,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% @@ -7357,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 @@ -8043,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 @@ -9451,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 @@ -10141,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 @@ -10156,22 +10146,44 @@ lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - - lightbox:feedback:sendreport:warnwindows:record_accepted - lightbox:feedback:sendreport:warnwindows:record_accepted + + 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 - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 94dcb3d404..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 5183bfb0b0..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 417b31731a..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 360779f4ae..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 165538ee4c..4f3caeedab 100644 --- a/templates/web/lightbox/validate.html.twig +++ b/templates/web/lightbox/validate.html.twig @@ -127,20 +127,22 @@

{{ 'lightbox:feedback:sendreport:warnwindows:title' | trans }}

-
- {{ 'lightbox:feedback:sendreport:warnwindows:record_accepted'| trans }} : -
-
-
- {{ ' lightbox:feedback:sendreport:warnwindows:record_refused'| trans }} : -
-
-
- {{ ' lightbox:feedback:sendreport:warnwindows:record_null'| trans }} : -
+

{{'lightbox:feedback:sendreport:warnwindows:message ' | trans}}

+ +

{{ 'lightbox:feedback:sendreport:warnwindows:record_approved'| trans }} : + +

+
+

+ {{'lightbox:feedback:sendreport:warnwindows:record_rejected'| trans }} : +

+
+

+ {{'lightbox:feedback:sendreport:warnwindows:record_unexpressed'| trans }} : +

- +
diff --git a/yarn.lock b/yarn.lock index f2a4a1e46b..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.148-d: - version "0.34.148-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.148-d.tgz#17cd3df593bf8adb61d0c3da1c696472d076165e" - integrity sha512-F5iOfLJazv8lJ4PqbDdNplsGELAwxn018q67j7WeqrEm3so1znnRNuVbRGe4fL8bt+2dukbrrT04CV8i/GifAw== +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"