From 04c3830c2a2d4b683a740377cd194960f15982a4 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Mon, 20 Jan 2020 18:56:42 +0400
Subject: [PATCH] PHRAS-2875 Workzone refacto #time 8h

---
 package.json                                 |  2 +-
 templates/web/prod/WorkZone/Macros.html.twig | 39 ++++++++++++--------
 yarn.lock                                    |  8 ++--
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 62fa0e1cea..dbbef508e8 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.102-d",
+    "phraseanet-production-client": "0.34.103-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 f37dfdc054..6b17c3f1f5 100644
--- a/templates/web/prod/WorkZone/Macros.html.twig
+++ b/templates/web/prod/WorkZone/Macros.html.twig
@@ -32,7 +32,10 @@
                                src="/assets/common/images/icons/valid.png" />
                       </td>
                       <td>
-                          <a class="contextMenuTrigger icon-display-grid" href="#"></a>
+                          <a class="contextMenuTrigger" href="#">
+                              <i class="icomoon icon-circle  fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
+                              <i class="icomoon icon-round-more_horiz-24px white fa-stack-1x fa-inverse" aria-hidden="true"></i>
+                          </a>
                       </td>
                   </tr>
               </table>
@@ -126,7 +129,8 @@
                         {% endif %}
                       -->
                         <td>
-                            <a class="contextMenuTrigger" href="#">   <i class="icomoon icon-circle  fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
+                            <a class="contextMenuTrigger" href="#">
+                                <i class="icomoon icon-circle  fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
                                 <i class="icomoon icon-round-more_horiz-24px white fa-stack-1x fa-inverse" aria-hidden="true"></i></a>
                         </td>
                   </tr>
@@ -230,7 +234,10 @@
               <table>
                   <tr>
                       <td>
-                          <a class="contextMenuTrigger icon-display-grid" href="#"></a>
+                          <a class="contextMenuTrigger " href="#">
+                              <i class="icomoon icon-circle  fa-stack-2x fa-inverse-bg" aria-hidden="true"></i>
+                              <i class="icomoon icon-round-more_horiz-24px white fa-stack-1x fa-inverse" aria-hidden="true"></i>
+                          </a>
                       </td>
                   </tr>
               </table>
@@ -305,7 +312,18 @@
   {% endif %}
 
   {% import 'common/thumbnail.html.twig' as thumbnail %}
-
+    {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %}
+        <div class="title">
+                {{ record.get_title() | truncate(20, true, "...") }}
+        </div>
+    {% endif %}
+    {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %}
+        <div class="status" style="position:relative;height:20px;overflow-y:visible;z-index:15;">
+            {% for flag in record_flags(record) %}
+                <img src="{{ flag.path }}" title="{{ attribute(flag.labels, app.locale) }}" />
+            {% endfor %}
+        </div>
+    {% endif %}
   <div class="CHIM diapo CHIM_{{record.get_serialize_key()}} open-preview-action"
        data-kind="{% if wz_scope == 'groupings' %}REG{% else %}BASK{% endif %}"
        data-position="{{ ord }}"
@@ -313,18 +331,7 @@
        style="height:{{box_height}}px;"
        id="CHIM_{% if wz_scope == 'groupings' %}{{record.get_serialize_key()}}{% else %}{{ contained.getId() }}{% endif %}">
        <input type="hidden" name="id" value="{{ record.get_serialize_key() }}"/>
-      {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %}
-          <div class="title">
-              {{record.get_title()}}
-          </div>
-      {% endif %}
-      {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %}
-          <div class="status" style="position:relative;height:20px;overflow-y:visible;z-index:15;">
-              {% for flag in record_flags(record) %}
-                  <img src="{{ flag.path }}" title="{{ attribute(flag.labels, app.locale) }}" />
-              {% endfor %}
-          </div>
-      {% endif %}
+
           <div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;">
               {{record.getNumber()}}
           </div>
diff --git a/yarn.lock b/yarn.lock
index b0531eaf13..c3e99c41fd 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.102-d:
-  version "0.34.102-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.102-d.tgz#ee2772fd712a5fb2acc87eae5c7d4a2a46f5a28a"
-  integrity sha512-3KtY3n9uI42o6mDUDDXX6KgP3Os2FlQE3nkzEJc3eVbstG9V6rNlk8J/ujXaMKy1hibBT+9f7TTSYy0Z9ARPBA==
+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==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"