diff --git a/package.json b/package.json index 475aeb0056..44cbaa4fce 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.174-d", + "phraseanet-production-client": "0.34.175-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 81caa5d204..a93d6da26b 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -346,18 +346,6 @@ {% import 'common/thumbnail.html.twig' as thumbnail %}
- {% 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 %}
- +
+ {% 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()}}
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 17b6f47ba8..b4d191fc05 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -73,6 +73,11 @@ color: {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'fontcolor-selection', 'FFFFFF')}}; background-color: {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'background-selection', 'ab47bc')}}; } + #idFrameC .diapo.selected { + border: 3px solid {{"#" ~ app['settings'].getUserSetting(app.getAuthenticatedUser(), 'background-selection', 'ab47bc')}} !important; + background-color: transparent; + } + {% endblock %} @@ -1001,17 +1006,4 @@ }); }); - {% endblock %} diff --git a/yarn.lock b/yarn.lock index 39ce5c0a4f..66d8a0d4c9 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.174-d: - version "0.34.174-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.174-d.tgz#1896144e78602b04a748d3f5ec33e1d848510222" - integrity sha512-xZ270lzhMEYtKkUmUq5yeBiKHClpVgybgDsMZ9/v9Rez6l860ZAV7Ry9HS11pwX7GfDgvnDYz3eVYCuw7VbRcw== +phraseanet-production-client@0.34.175-d: + version "0.34.175-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.175-d.tgz#282c2cd039083aa99d85eb9cc573076eb0a06e06" + integrity sha512-9I1F0STZTsuSgtJrI0rmjkjf3M4Eca+JuwCf+q1XpDX1DThpiyGlr/0DgRkhpAEQL7Vhg4W3vW0RTmTL/Eh9sA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"