diff --git a/package.json b/package.json index dbbef508e8..49776832c6 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.103-d", + "phraseanet-production-client": "0.34.104-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index 8b8d724b66..c3959230e7 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -89,7 +89,7 @@ {% endif %} -
+
{% set basket_length = basket.getElements()|length %}
{{ 'Certaines donnees du panier ont change' | trans }} {{ 'rafraichir' | trans }}
{% if basket_length == 0 %} diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 6b17c3f1f5..ecf23c1466 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -312,54 +312,56 @@ {% endif %} {% import 'common/thumbnail.html.twig' as thumbnail %} - {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %} -
- {{ record.get_title() | truncate(20, true, "...") }} -
- {% endif %} - {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %} -
- {% for flag in record_flags(record) %} - - {% endfor %} -
- {% endif %} -
- +
+ {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %} +
+ {{ record.get_title()|truncate(20, "...") }} +
+ {% endif %} + {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %} +
+ {% for flag in record_flags(record) %} + + {% endfor %} +
+ {% endif %} +
+ -
- {{record.getNumber()}} -
- {{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}} -
- {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %} - - - - {% endif %} - - - - +
+ {{record.getNumber()}} +
+ {{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}} +
+ {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %} + + + + {% endif %} + + + + -
-
+
+
+
{% endmacro %} {% macro display_basket(app, basket) %} diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig index 7cfeabe0d7..762c4fc011 100644 --- a/templates/web/prod/WorkZone/Story.html.twig +++ b/templates/web/prod/WorkZone/Story.html.twig @@ -81,7 +81,7 @@
-
+
{% set story_length = Story.get_children().get_elements()|length %}
{{ 'Certaines donnees du reportage ont change' | trans }} @@ -97,7 +97,7 @@ {% import 'prod/WorkZone/Macros.html.twig' as Macros %} {% for record in Story.get_children().get_elements() %} - + {{ Macros.element('groupings', Story, record, record, record.getNumber()) }} {% endfor %} diff --git a/yarn.lock b/yarn.lock index c3e99c41fd..0a6a345a7f 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.103-d: - version "0.34.103-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.103-d.tgz#7f043af8c504d66d94450c25029d63338da58037" - integrity sha512-8/205hCZaFCZsFfTCjG1BBCemInnPEu3npQHCNaCAz+TA2ojzajNxbgeGY3Fw6PjUYv+qoPpBQgNaOiBwybkKg== +phraseanet-production-client@0.34.104-d: + version "0.34.104-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.104-d.tgz#97eb1014f7fcda330a0e5746ec4a85f60eb67a0c" + integrity sha512-2ius5Yjhku04N/nVJDOc0MN3qPM6oIBRlQQgrAT8nsS5GCKDypAmpdF4e8IuneV0uD28XDf6KH59HRBOy+Mg+Q== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"