Merge pull request #3064 from HRavalomanana/PHRAS-2386-Feedback_result_display

PHRAS-2386 #comment merge of  feedback result display

resources/www/common/styles/main.scss

@@ -38,5 +38,17 @@ $mainMenuLinkBackgroundHoverColor: transparent;
   }
 }
 
+.macroFileEdit {
+  width: 24px;
+  height: 24px;
+  background: url(../images/icons/file-edit.png) no-repeat center;
+  cursor: help;
+  display: inline-block;
+  transition: 0.3s all;
+  &:hover, &:focus {
+    background-image: url(../images/icons/file-edit-hover.png);
+  }
+}
+
 
 

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

@@ -27,8 +27,8 @@
                   <tr>
                       <td>
                           <img
-                              title="{{ 'Vous avez recu une demande de validation de document sur ce panier' | trans }}"
+                              title="{{ basket.getDescription() }}"
-                              class="basketTips"
+                              class="basketTips basket_title"
                               src="/assets/common/images/icons/valid.png"
                             />
                       </td>
@@ -385,19 +385,19 @@
                                   <td>
                                   {% if choice.getParticipant().getCanAgree() %}
                                         {% if choice.getAgreement() == true %}
-                                            <img style="cursor:help;" src='/assets/lightbox/images/agree.png' title="{{ "L'utilisateur approuve ce document" | trans }}" />
+                                            <img style="cursor:help;" src='/assets/common/images/icons/green-check.png' title="{{ "L'utilisateur approuve ce document" | trans }}" />
                                         {% elseif choice.getAgreement() is null %}
-                                            <img style="cursor:help;" src='/assets/common/images/icons/valid.png' title="{{ "L'utilisateur n'a pas encore donne son avis sur ce document" | trans }}" />
+                                            <img style="cursor:help;" src='/assets/common/images/icons/no-response.png' title="{{ "L'utilisateur n'a pas encore donne son avis sur ce document" | trans }}" />
                                         {% else %}
-                                            <img style="cursor:help;" src='/assets/lightbox/images/disagree.png' title="{{ "L'utilisateur desapprouve ce document" | trans }}" />
+                                            <img style="cursor:help;" src='/assets/common/images/icons/red-cross.png' title="{{ "L'utilisateur desapprouve ce document" | trans }}" />
                                         {% endif %}
                                   {% else %}
-                                        <img style="cursor:help;" src='/assets/common/images/icons/no-valid.png' title="{{ "This user does not participate to the validation but is only viewer." | trans }}" />
+                                        <img style="cursor:help;" src='/assets/common/images/icons/vote-admin.png' title="{{ "This user does not participate to the validation but is only viewer." | trans }}" />
                                   {% endif %}
                                   </td>
                                   <td style="width:25px;">
                                   {% if choice.getNote() != '' %}
-                                       <img style="cursor:help;" src='/assets/common/images/icons/file-edit.png' class="noteTips" title="{{choice.getNote()|nl2br}}" />
+                                      <span class="noteTips macroFileEdit"  title="{{choice.getNote()|nl2br}}">&nbsp;</span>
                                   {% endif %}
                                   </td>
                               </tr>

templates/web/prod/actions/Push.html.twig

@@ -19,7 +19,7 @@
                 {% if context == 'Push' %}
                     <img style="width: 36px; height: 36px" src="/assets/common/images/icons/push-icon.png"/>
                 {% else %}
-                    <img style="width: 36px; height: 36px" src="/assets/common/images/icons/validation.png"/>
+                    <img style="width: 36px; height: 36px" src="/assets/common/images/icons/feedback-icon.png"/>
                 {% endif %}
             </div>
             <div class="PNB content" style="top:45px; overflow-y:auto;">

templates/web/prod/tab_headers.html.twig

@@ -17,7 +17,8 @@
                 </li>
             {% endif %}
             <li class="ui-corner-top baskets">
-                <a href="#baskets" class="WZbasketTab">
+                <a href="#baskets" class="WZbasketTab WZtabs">
+                    <img src="/assets/common/images/icons/workzone32.png" title="{{ 'phraseanet:: baskets' | trans }}"/>
                     <div id="basket_menu_trigger">&#9660;</div>
                 </a>
             </li>