From a535268ae86f30974379850a68272be88ea8300b Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia-webagency.com>
Date: Thu, 14 May 2020 18:39:24 +0400
Subject: [PATCH] PHRAS-3072 #comment Design fix #time 6h

---
 package.json                                  |  2 +-
 .../prod/WorkZone/Browser/Browser.html.twig   |  3 ++-
 .../prod/WorkZone/Browser/Results.html.twig   | 22 +++++++++----------
 .../prod/actions/publish/publish.html.twig    |  4 ++--
 .../actions/publish/publish_edit.html.twig    |  4 ++--
 templates/web/prod/results/entry.html.twig    | 11 +++++-----
 .../web/prod/results/feeds_entry.html.twig    | 12 +++++-----
 yarn.lock                                     |  8 +++----
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 64bb7dd864..1676a85157 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.201-d",
+    "phraseanet-production-client": "0.34.203-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig
index 0f40cff488..5dba51d44f 100644
--- a/templates/web/prod/WorkZone/Browser/Browser.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig
@@ -86,7 +86,8 @@
 </div>
 <style>
 .dialog-Medium {
-  height: 523px!important;
+  height: 544px!important;
+  overflow: hidden!important;
 }
 .paginator a {
   background: none!important;
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig
index 78d6d41835..01625fcb4f 100644
--- a/templates/web/prod/WorkZone/Browser/Results.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Results.html.twig
@@ -50,7 +50,7 @@
 
               {% if Basket.getPusher() %}
               <p>
-                {% set user_name = '<a href="/user/' ~ Basket.getPusher().getId() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).getDisplayName() ~ '</a>' %}
+                {% set user_name = '<a href="/user/' ~ Basket.getPusher().getId() ~ '/"  class="UserTips">' ~ Basket.getPusher(app).getDisplayName() ~ '</a>' %}
                 {% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}
               </p>
               {% endif %}
@@ -65,7 +65,7 @@
                     {% set list_participants = list_participants ~ ', ' %}
                   {% endif %}
 
-                  {% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Participant.getUser().getId() }) ~ '"  href="/user/' ~ Participant.getUser().getId() ~ '/">' %}
+                  {% set list_participants = list_participants ~ '<a class="UserTips"  href="/user/' ~ Participant.getUser().getId() ~ '/">' %}
                   {% set list_participants = list_participants ~ Participant.getUser().getDisplayName() %}
                   {% set list_participants = list_participants ~ '</a>' %}
                 {% endfor %}
@@ -84,9 +84,8 @@
     </div>
   </div>
   <div class="PNB footer">
-    <table>
-      <tr>
-        <td>
+    <div class="paginator-wrapper">
+        <span class="paginator-result">
           {% if Total == 0 %}
             {{ 'No results' | trans }}
           {% elseif Total == 1 %}
@@ -94,19 +93,18 @@
           {% else %}
             {% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
           {% endif %}
-        </td>
-        <td class="paginator">
+        </span>
+        <span class="paginator">
           {% if Page - 1  > 0 %}
-          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res icon-round-chevron_left-24px">&nbsp;</a>
+          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="prev_res icon-round-chevron_left-24px">&nbsp;</a>
           {% endif %}
           <span>
             Page {{ Page }} / {{ MaxPage }}
           </span>
           {% if Page + 1  <= MaxPage %}
-          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result next_res icon-round-chevron_right-24px">&nbsp;</a>
+          <a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="next_res icon-round-chevron_right-24px">&nbsp;</a>
           {% endif %}
-        </td>
-      </tr>
-    </table>
+        </span>
+    </div>
   </div>
 
diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig
index 709044cd04..a161199184 100644
--- a/templates/web/prod/actions/publish/publish.html.twig
+++ b/templates/web/prod/actions/publish/publish.html.twig
@@ -42,9 +42,9 @@
                         </label>
                         <br />
                         {% endif %}
-                        <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b></label>
+                        <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span class="feed_title_warning feed_warning">{{ 'publication : title warning' | trans }}</span></label>
                         <input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" />
-                        <label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b></label>
+                        <label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
                         <textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea>
                         <label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
                         <input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ app.getAuthenticatedUser().getDisplayName() }}" />
diff --git a/templates/web/prod/actions/publish/publish_edit.html.twig b/templates/web/prod/actions/publish/publish_edit.html.twig
index 9426bb0687..bcfee39324 100644
--- a/templates/web/prod/actions/publish/publish_edit.html.twig
+++ b/templates/web/prod/actions/publish/publish_edit.html.twig
@@ -27,9 +27,9 @@
                     <div class="span6">
                         <h1>{{ 'Editer' | trans }}</h1>
                         <br />
-                        <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b></label>
+                        <label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span class="feed_title_warning feed_warning">{{ 'publication : title warning' | trans }}</span></label>
                         <input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{ entry.getTitle() }}" />
-                        <label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b></label>
+                        <label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
                         <textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{ entry.getSubTitle() }}</textarea>
                         <label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
                         <input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ entry.getAuthorName() }}" />
diff --git a/templates/web/prod/results/entry.html.twig b/templates/web/prod/results/entry.html.twig
index a116cc3ec7..f0c271425b 100644
--- a/templates/web/prod/results/entry.html.twig
+++ b/templates/web/prod/results/entry.html.twig
@@ -23,11 +23,11 @@
             </td>
             <td style="width:60px;text-align:right;">
                 {% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %}
-                    <a class="tools options feed_edit" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
-                        <img src="/assets/common/images/icons/file-edit.png" title="{{ 'boutton::editer' | trans }}"/>
+                    <a class="options feed_edit" title="{{ 'boutton::editer' | trans }}" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
+                        <i class="fa fa-edit"></i>
                     </a>
-                    <a class="tools feed_delete"href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
-                        <img src="/assets/common/images/icons/delete.png" title="{{ 'boutton::supprimer' | trans }}"/>
+                    <a class="feed_delete" title="{{ 'boutton::supprimer' | trans }} href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
+                        <i class="fa fa-times-circle"></i>
                     </a>
                 {% endif %}
             </td>
@@ -50,8 +50,7 @@
             <a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
                 {% set feed_name = entry.feed.title %}
                 {% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %}
-                <img style="height:16px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
-            </a>
+                <i class="fa fa-rss-square"></i></a>
         {% endif %}
     </div>
 
diff --git a/templates/web/prod/results/feeds_entry.html.twig b/templates/web/prod/results/feeds_entry.html.twig
index ee6010ee76..ba8af43574 100644
--- a/templates/web/prod/results/feeds_entry.html.twig
+++ b/templates/web/prod/results/feeds_entry.html.twig
@@ -17,12 +17,14 @@
             </td>
             <td style="width:60px;text-align:right;">
                 {% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %}
-                    <a class="tools options feed_edit" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
-                        <img src="/assets/common/images/icons/file-edit.png" title="{{ 'boutton::editer' | trans }}" width="16" height="16"/>
+                    <div class="feed_btn_wrapper">
+                    <a class="options feed_edit feed_icon" title="{{ 'boutton::editer' | trans }}" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
+                        <i class="fa fa-edit"></i>
                     </a>
-                    <a class="tools feed_delete"href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
-                        <img src="/assets/common/images/icons/delete.png" title="{{ 'boutton::supprimer' | trans }}" width="16" height="16"/>
+                    <a class="feed_delete feed_icon" title="{{ 'boutton::supprimer' | trans }} href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
+                        <i class="fa fa-times-circle"></i>
                     </a>
+                    </div>
                 {% endif %}
             </td>
         </tr>
@@ -44,7 +46,7 @@
             <a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
                 {% set feed_name = entry.feed.title %}
                 {% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %}
-                <img style="height:16px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
+                <i class="fa fa-rss-square"></i>
             </a>
         {% endif %}
     </div>
diff --git a/yarn.lock b/yarn.lock
index 66ae825f84..375dcafee6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.201-d:
-  version "0.34.201-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.201-d.tgz#c668b8a44761e21b06a0c38362c23749c68d865e"
-  integrity sha512-7jQH9zv/DMaDmj79240LrdZzShNYpdmGEfhPN3Km1UGd1W0Phs/0kGfW0jB4hWzV1LO1SIRx4A4vIzr6UQVipg==
+phraseanet-production-client@0.34.203-d:
+  version "0.34.203-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.203-d.tgz#46c2505f05f4e68b29e3eb8358a5bcd15e6b5d27"
+  integrity sha512-yJ0iEuY87VEveXHsr1u+X4DWlwM1BnDuvJfGIS8XEx9wB0st9F/5sxbQJ3dgFRQE9YHoZr+TI6iUFReNprWgNA==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"