From e06c4d8ecac325e8ce2dca820525236f0c0f7a8a Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Wed, 22 Jan 2020 16:04:36 +0400
Subject: [PATCH] PHRAS-2875 add Collection on caption tooltip

---
 package.json                                 | 2 +-
 templates/web/prod/Tooltip/Caption.html.twig | 7 ++++++-
 templates/web/prod/WorkZone/Macros.html.twig | 2 +-
 yarn.lock                                    | 8 ++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index d5cfe5cddf..fbe48edbd0 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.105-d",
+    "phraseanet-production-client": "0.34.106-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/Tooltip/Caption.html.twig b/templates/web/prod/Tooltip/Caption.html.twig
index cd85656671..8bd04c2fe8 100644
--- a/templates/web/prod/Tooltip/Caption.html.twig
+++ b/templates/web/prod/Tooltip/Caption.html.twig
@@ -1,6 +1,11 @@
 {% extends 'prod/Tooltip/Tooltip.html.twig' %}
 
-{% set title %}{{ 'Caption' | trans }}{% endset %}
+{% set title %}{{ 'Caption' | trans }} &nbsp;<span class="collection-block" style="float: right"> {% set collectionLogo = collection_logo(record.baseId) %}
+    {% if collectionLogo is empty %}
+        {{ record.collectionName }}
+    {% else %}
+        {{ collectionLogo|raw }}
+    {% endif %}</span> {% endset %}
 {% set width = 400 %}
 {% set maxwidth = 700 %}
 
diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig
index b3298373c3..a2eff03031 100644
--- a/templates/web/prod/WorkZone/Macros.html.twig
+++ b/templates/web/prod/WorkZone/Macros.html.twig
@@ -112,7 +112,7 @@
     {% endfor %}
       </div>
       <div id="all_baskets-block" class="all_baskets-block">
-    {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) %}
+    {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) | sort | reverse %}
         <div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
              id="SSTT_{{basket.getId()}}"
              class="basketTips ui-accordion-header ui-state-default
diff --git a/yarn.lock b/yarn.lock
index 26c85d4cd3..89b0c8e0ea 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.105-d:
-  version "0.34.105-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.105-d.tgz#f34a02238e1fec724a836943cb8324df62a6a6db"
-  integrity sha512-5Qv2zmLwWiXrYt99V6kS5RRDwXkAjFahkuSA4Z6mTO74ClJYKDnpUIWG6jKcYtwVyBuKQPxa1XPLSrdXkbZg6Q==
+phraseanet-production-client@0.34.106-d:
+  version "0.34.106-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.106-d.tgz#020379df0fc6023eebd5e188c7047b2e83892070"
+  integrity sha512-Z8XPVe++0oQ6LYubGMHovOhJg1qbSPoCyAD0HMazmtg+TzklfNcvPmUKWxKev2mP9qMLwYr5h4ts7XueyangAQ==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"