PHRAS-2875 Port of PHRAS-2864

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.104-d",
+    "phraseanet-production-client": "0.34.105-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",

templates/web/prod/WorkZone/Macros.html.twig

@@ -5,8 +5,37 @@
     </a>
   </div>
   <div class="bloc">
+      <div id="basket-filter" class="basket-filter">
+          <span class="filter-title">{{ 'See' | trans }} : </span>
+          <span class="filter-item">
+              <label id="basket-list" class="checkbox inline" for="basketFilter">
+                  <input type="checkbox" class="checkbox " name="basketFilter" value="basket" checked>
+                  {{ 'Basket' | trans }}
+              </label>
+          </span>
+          <span class="filter-item">
+              <label id="feedback-list"  class="checkbox inline" for="basketFilter">
+                  <input type="checkbox" class="checkbox " name="basketFilter" value="feedback" checked>
+                  {{ 'Feedback' | trans }}
+              </label>
+          </span>
+          <span class="filter-item">
+              <label id="push-list" class="checkbox inline" for="basketFilter">
+                  <input type="checkbox" class="checkbox " name="basketFilter" value="push" checked >
+                  {{ 'Push' | trans }}
+              </label>
+          </span>
+          <span class="filter-item">
+              <label id="story-list" class="checkbox inline" for="basketFilter">
+                  <input type="checkbox" class="checkbox " name="basketFilter" value="story" checked>
+                  {{ 'Stories' | trans }}
+              </label>
+          </span>
+      </div>
+
   <div class="insidebloc">
     {% set content = WorkZone.getContent(srt) %}
+      <div id="validations-block" class="validations-block">
     {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::VALIDATIONS')) %}
         <div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
              id="SSTT_{{basket.getId()}}"
@@ -31,7 +60,7 @@
                                class="basket_title"
                                src="/assets/common/images/icons/valid.png" />
                       </td>
-                      <td>
+                      <td class="contextMenuWrapper">
                           <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>
@@ -81,13 +110,14 @@
         </div>
         <div id="SSTT_content_{{basket.getId()}}" class="content basket" style="overflow:hidden;"></div>
     {% endfor %}
-
+      </div>
+      <div id="all_baskets-block" class="all_baskets-block">
     {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) %}
         <div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
              id="SSTT_{{basket.getId()}}"
              class="basketTips ui-accordion-header ui-state-default
                     ui-corner-all header SSTT basket {% if not basket.isRead() %}unread{% endif %}
-                    {% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
+                    {% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}{% if basket.getValidation() %}feedbacks-block{% elseif basket.getPusher() %}pushes-block{% else %}baskets-block{% endif %} ">
           <a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}" style="">
             <span>
               {% if basket.getValidation() %}
@@ -128,7 +158,7 @@
                             </td>
                         {% endif %}
                       -->
-                        <td>
+                      <td class="contextMenuWrapper">
                             <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>
@@ -214,9 +244,8 @@
         </div>
         <div id="SSTT_content_{{basket.getId()}}" class="content basket" style="overflow:hidden;"> </div>
     {% endfor %}
-
+      </div>
-
+      <div id="stories-block" class="stories-block">
-
     {% for story in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::STORIES')) %}
         <div tooltipsrc="{{ path('prod_tooltip_story', { 'sbas_id' : story.getRecord(app).get_sbas_id(), 'record_id' : story.getRecord(app).get_record_id() }) }}"
              id="SSWZ_{{story.getId()}}" sbas="{{story.getSbasId()}}"
@@ -233,7 +262,7 @@
           <div class="menu">
               <table>
                   <tr>
-                      <td>
+                      <td class="contextMenuWrapper">
                           <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>
@@ -299,6 +328,7 @@
     {% endfor %}
   </div>
 </div>
+</div>
 {% endmacro %}
 
 
@@ -333,7 +363,7 @@
            id="CHIM_{% if wz_scope == 'groupings' %}{{record.get_serialize_key()}}{% else %}{{ contained.getId() }}{% endif %}">
            <input type="hidden" name="id" value="{{ record.get_serialize_key() }}"/>
 
-            <div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;">
+            <div class="record-number">
                   {{record.getNumber()}}
             </div>
             {{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}}

templates/web/prod/WorkZone/Story.html.twig

@@ -1,5 +1,5 @@
 <div>
-    <button class="tools-accordion"><span>Actions<i class="fa fa-chevron-right rotate"></i></span></button>
+    <button class="tools-accordion"><span>Actions</span></button>
     <div class="tools-panel">
 
         <button class="ui-corner-all TOOL_disktt_btn story_window" data-selection-source="story">

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.104-d:
+phraseanet-production-client@0.34.105-d:
-  version "0.34.104-d"
+  version "0.34.105-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.104-d.tgz#97eb1014f7fcda330a0e5746ec4a85f60eb67a0c"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.105-d.tgz#f34a02238e1fec724a836943cb8324df62a6a6db"
-  integrity sha512-2ius5Yjhku04N/nVJDOc0MN3qPM6oIBRlQQgrAT8nsS5GCKDypAmpdF4e8IuneV0uD28XDf6KH59HRBOy+Mg+Q==
+  integrity sha512-5Qv2zmLwWiXrYt99V6kS5RRDwXkAjFahkuSA4Z6mTO74ClJYKDnpUIWG6jKcYtwVyBuKQPxa1XPLSrdXkbZg6Q==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"