From 0967f3c8104781e96ec0ed6bdd48f1118f78f610 Mon Sep 17 00:00:00 2001
From: Jean-Yves Gaulier <gaulier@alchemy.fr>
Date: Thu, 5 Dec 2019 14:52:46 +0100
Subject: [PATCH] PHRAS-2631_feedback-icon fix : 2 new icons for feedback
 baskets; no more display of 2 icons. fix : tooltip on "about" icon of
 feedback baskets

---
 .../Phrasea/Controller/Prod/PushController.php   |   2 +-
 .../common/images/icons/basket_feedback_read.png | Bin 0 -> 1372 bytes
 .../images/icons/basket_feedback_unread.png      | Bin 0 -> 1502 bytes
 templates/web/prod/WorkZone/Macros.html.twig     |  13 ++++++-------
 4 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 resources/www/common/images/icons/basket_feedback_read.png
 create mode 100644 resources/www/common/images/icons/basket_feedback_unread.png

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
index f9ce528e41..6e650aefaa 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
@@ -193,7 +193,7 @@ class PushController extends Controller
                 'Validation from %user%', [
                 '%user%' => $this->getAuthenticatedUser()->getDisplayName(),
             ]));
-            $validation_description = $request->request->get('validation_description');
+            $validation_description = $request->request->get('message');
 
             $participants = $request->request->get('participants');
 
diff --git a/resources/www/common/images/icons/basket_feedback_read.png b/resources/www/common/images/icons/basket_feedback_read.png
new file mode 100644
index 0000000000000000000000000000000000000000..129170a64832e4607a8bd55d1950fa22e34e0b84
GIT binary patch
literal 1372
zcmV-i1*7_jP)<h;3K|Lk000e1NJLTq000;O000;W1^@s7mv9Yk00001b5ch_0Itp)
z=>Px)7D+@wR7eeVReelVWf*_Xx#w^{Py{bJEzuEBf27NnGtIRnh;pSlW7eiE`J)fF
zvdp;_MAQg3KxnSEWCij^&e<2)$C3+H5Lp9lrDba&Mll&q^lBJfF8AJZ`u$!wcYx#B
ze)oOf^L)L}*Lz(8s%k6PK0kfIMedXANiuM-tG+1^+vax>t?v86n_Q))BVdQ4!{BbR
zrTlo_yOqIw3f-oWeV{X7#l|g($1KrZx<p4~+wonzR3r7@_*Jb`R~lpjejo`L1+D?`
zB;u;=+}u;s890W$?tDzDZZC+?2fZ4mE~U9aL$CcV@H;=2ZETfA{tStX#;D-aBa!%T
z+?^R{mZ$D(<d$U8ei}@LW|&G=j>!a401LPd+;pz1WoL`|OjBS?B?q@aK;YxbnkH7<
zK3JL;d<jQOS*rLVe}`wD@qRpN2^dOn>d*eRO=2eLQnEhiVT?(>RI}c;Y?VR^e$`Ve
zb*BmwI<ZKcUU>G=gJ;Q|e*g0gt1r<*6wKE)pOmuZTwG@&KZe_dT4?{2ZD_rR3iRRz
z=I%bUrYPg?w0dUJiNUh${#Wu^9|ZqjV3Z0ZN0FUj0$llx*@;dfj#U*Et72-8?p^C%
z^+;-yOVb~Qhr!sG^?K>X;78z7k(B5H9sO3T8`|Ef*I`O&s^Q5NPj9dCq!e5gU*>J|
zq$GX7Oei2@>{couSOuh%aYlJhH#&2Sf-gVRLbucCjT8A|B1_@n@#4y&_M^;@$)d6j
zQ>p&+;}WwX5=E!cSaO=X9DFqTL`D+xa^&nD=?!&Bj{gBMbhp?Lo=ov#M}gN;MdJFz
z%D1GY=S|s=^&F3)AqK`08H=~6Gk)e(wHKU&)-t-!O1)p^c^1hJ7d}zJvWFN$U2$hd
zXdrx*SBjRd53bd8O^r$4@M-z^^5^26V~EFRDB+PC(FO>QKsL_nu(CcN1><=N^Sjh(
z3tpxF{Pkzw+1=F)KA(aJ6`a61!c=6wT>#U@wg>|p=?I|afl360=#8KeDsW<{#Fgza
zt(S0~=qarF{+9f$X0lNYOLvelIe^?wCr$o}j>Jk{4V?T83}qCnQ`AK7C2oZttX4fp
zsmbCi<M^5BgssW?sa44fN52$XMnEUZ0mE~x+j5s@%f8HW(8#1=8r!y_LbB6WgFQQ4
zxN=%PJX<a<_5&)ZX?9;@$(fbC-67^Su8d=27VgPxLX|S<m&Vzivl+h_>Xt*@J0ujo
zBsmLL3!fA|gVeEYEwi|C)nVEMTpV;&EYs8jmP!MJ5CL8aux_OjJ$3TOP=`FWyh`SK
zmneZ4o+h@C=Hi6HGHijt2j6mD5*<b_qr_RaniTnI;8W@7J1nNlBOYUpys+kD?Adj*
zkR_MFVRke+AlcV0jn?>=`rhLeG_Z68!2B`=t8On+m=K-*`{!VnnjrPAum-?T|9=M{
zrCu@i0Yf1?FE*~*x;Q7L!6`D=IP(f*q^^*^uc8O05RK_HiUK=D9=tHT>+M}X9)}o<
zJWdC!0VAOkx7RD)eMfW4=lb1G(*a4fr>c)SCVo_VGGbU6zB=A`aOby`;jl712BC2v
zMhAq`O^zcKRmuXlcW1@D1?kI@^F3~3xn}4KAuD#wx-u4togeBO`T9u3FD=7E5p`Rz
zXjB=-%72B#=wqLlVn*adMTgE=6^()*hQ=Jz2*JT3oHO|<eBR!nnR_R)sjDN))p0U)
eRYoU;)c${Hb}Y|v)b{590000<MNUMnLSTYXeVN|?

literal 0
HcmV?d00001

diff --git a/resources/www/common/images/icons/basket_feedback_unread.png b/resources/www/common/images/icons/basket_feedback_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..31d91d31a4ba41d9fd5157dc1b19aa6b3fd4f752
GIT binary patch
literal 1502
zcmV<41tI#0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s7mv9Yk00001b5ch_0Itp)
z=>Px)m`OxIR7eeNRS9fVWe}cs?a_s8YoXz=U^!Zi5HOMgX^cVxw1|iZh$LdfC}?O(
zgNalSEJ|8v0;mX)azqG`M2i76lpBf_Q?O70uObzsfE2c{+dbayJDl$?Zz;q{X6OIk
z+}FPfF;wg?d|5x!){3*sW;lQLtgZ6Jt~gXkwvF#ZQdM11C{&QwNGp#P*`a8_{{6)~
zTkdF&Z(MuqC3>``p|1q7Rdq#{5w|F=8}!cVkkG}C7ixe@?M-$p7PCM2uD})=U@~Sf
zx)>vjw;YCCRX6dsgkd%ouV~Mi^T*YE#HCdpDb)3-LE&J0FeJC;_KC<<$BNFw@#69O
zC^Nk;{o^O<Q+Il#tn21k7NV1_HB|h}7qo3w3I!91%g{_`QvqlpOI4GpY;3I$3<XR^
zHbNF-J7dU+N*XkXv^TdD#YAyf)if<K6Bd<L-C?<VfN16NJ>zD1Qq^s6Q&vzbxQRr9
z0)YUZC*PBXFrzCaP1|5wHkk%I6Mg?@6|Fh(Jo){8>e#V|%4R6E>{T~)JJgVikUS6P
zWMmXq=UqVv3EiZn6A#ehnz1A?S5YNWTnZ@)U0O2!z%VGli<`0g{Pm-zW<8$10qJvV
z_!DPq*_Yod*!L74kxT>%07p@DfbXFAh8Pof(PS!`%2Y6=>7}FHBVI_`qDb;2%d)OT
z0`cYZKE3@&cS(IWY@3ythfl476=9v{tx8s<QiQ|8WSKS%uaDBx$8{JKaK|#2L0BpO
zwqTma@7f6=AbOC9nN+%=gIva4=}r<xtg1J)Q+Uysz2Y-GL?RIiwN{gB*UqHIU$NMF
zR7gWX&<6)3uIJ{)*C{%2679~lNarEh_ZZzCR{zWA!UF`Iec67dghpk}q}<GWdMK?Y
zofxW7!;=zue5#AqQ5YVOhiDS$E5kpg+UC_XA-9-(J|FqgUF6U3kgO>OnH`33YQ>Sl
zCO-5}@GK2X8%e32UR2-wHA!qvbIGJ~r&r9}pA`+zO?XI@jj0_i$&#4umS6)lUf)gL
zZYp_w8o4|wMT15)3x`?Oga?f=h0$MeXu=P&BKLE~0?A)K*Z%fr^M9&gJ{DVt0=yu3
ztS}TYS6CjD4Py~y#7d)s78D$W5WE3l1PW*ylt3|8_stUDlgjc(d&f=Dd}<|I8vuq=
zc7$uQs-Ov*X6y(>dtWsX-F?85dVKo1OGQpJ4pn#tE5!`5xYK-LoPT&VgmH|U!Mis5
z%P{q7>s-?NtlzyDHZ?hGqU2A`^-Nxv-NZ>`!!V3a8(L0-dgLW_F_NZflCJAwG~K&P
zn0GPBfAC=1wu0J;T0UEny@k7!-MP$MK#sDj@vh1j11D+g&-3WQg10C#FsCakdA`lh
zZccsE3}hf2XqsGPp}s)Q0OfcPFebGZ*3hrlkI-{NmQsdm0Cg-{PD}R8<VlxEQg{~m
zNm5;MWbK@W*H~X{C+aV=(d*pefe#wR{Z#8NI@+?CG{r-1#YZLiUy&lY$uJD^dcEXJ
zbMYG|lcMo^$4+EP`j^%4goTg+z`k`QvNEGz%0?_5Rz~Ionr}4F;LJQ4(RZrAPSMT@
z!dc;$v*lJJbxYNV7lIwgOeMN;F}RA^$wk0_7tpg{Q~s3RgZ<S`lR-`Hh0U0iHkAIp
z$urOeu%0p_N`uI8zt$X_`^nrNzhN;fP#on!50D9*xH)6*!X0DZ@1Eg)0}cR~DEtU2
zzI6U@vOIKbm}&54eAAlQhd+!)h2a=;;*5q6;e#_xjw6wkzo*+fyZnj59{qjeJZ^P}
zq{^8rOSWO%i0Q_;wwCb0?d7NU2HSKIEwf-$7-ouph2-k<Il0Bi$jQo?GTada0s<f>
zY#59H@iYLPyU3aENrnGA!<b{#p^$UHanhCI?0`7`2mIV$&j!IWZ2$lO07*qoM6N<$
Eg4}7(qW}N^

literal 0
HcmV?d00001

diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig
index de3d0f4316..abd96a7641 100644
--- a/templates/web/prod/WorkZone/Macros.html.twig
+++ b/templates/web/prod/WorkZone/Macros.html.twig
@@ -16,9 +16,10 @@
           <a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}">
             <span>
               {% if not basket.isRead() %}
-                <img src='/assets/common/images/icons/basket_push_unread.png' title=''/>
+                <img src='/assets/common/images/icons/basket_feedback_unread.png' title=''/>
+              {%  else %}
+                <img src='/assets/common/images/icons/basket_feedback_read.png' title=''/>
               {% endif %}
-              <img src='/assets/common/images/icons/basket.png' title=''/>
               {{basket.getName()|e}}
             </span>
           </a>
@@ -26,11 +27,9 @@
               <table>
                   <tr>
                       <td>
-                          <img
-                              title="{{ basket.getDescription() }}"
-                              class="basketTips basket_title"
-                              src="/assets/common/images/icons/valid.png"
-                            />
+                          <img title="{{ basket.getDescription()|e }}"
+                               class="basket_title"
+                               src="/assets/common/images/icons/valid.png" />
                       </td>
                       <td>
                           <a class="contextMenuTrigger icon-display-grid" href="#"></a>