From d0a1c4c599cfa6fc322c891122d332802c1f54d7 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Thu, 14 Dec 2017 11:32:08 +0400 Subject: [PATCH 1/2] PORT PHRAS-1614 to 4.1 --- templates/web/prod/index.html.twig | 36 +++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 6e8d7118d6..eb57320317 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -200,39 +200,53 @@
  • - - {{ 'action:: nouveau panier' | trans }} + + {{ 'action:: nouveau panier' | trans }}
    - {{ 'Browse Baskets' | trans }} + + {{ 'Browse Baskets' | trans }}
    {% if app['conf'].get(['registry', 'modules', 'stories']) and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADDRECORD')) %} -
    +
    +
    - - {{ 'action:: nouveau reportage' | trans }} + + {{ 'action:: nouveau reportage' | trans }} +
    {% endif %}
  • - - {{ 'phraseanet:: tri par date' | trans }} + + + {{ 'phraseanet:: tri par date' | trans }} +
  • - - {{ 'phraseanet:: tri par nom' | trans }} + + + {{ 'phraseanet:: tri par nom' | trans }} +
  • - {{ 'Preferences' | trans }} + + {{ 'Preferences' | trans }} +
    • From d49ef51a9aae472dbe09e6582403b20845d2ff7a Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Thu, 14 Dec 2017 11:32:30 +0400 Subject: [PATCH 2/2] add images --- .../www/common/images/icons/browse_basket.png | Bin 0 -> 995 bytes .../common/images/icons/icon_collection_bin.png | Bin 0 -> 2275 bytes .../www/common/images/icons/icon_empty_bin.png | Bin 0 -> 4009 bytes resources/www/common/images/icons/new_basket.png | Bin 0 -> 2260 bytes resources/www/common/images/icons/new_report.png | Bin 0 -> 1824 bytes resources/www/common/images/icons/sort_alpha.png | Bin 0 -> 552 bytes resources/www/common/images/icons/sort_date.png | Bin 0 -> 321 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/www/common/images/icons/browse_basket.png create mode 100644 resources/www/common/images/icons/icon_collection_bin.png create mode 100644 resources/www/common/images/icons/icon_empty_bin.png create mode 100644 resources/www/common/images/icons/new_basket.png create mode 100644 resources/www/common/images/icons/new_report.png create mode 100644 resources/www/common/images/icons/sort_alpha.png create mode 100644 resources/www/common/images/icons/sort_date.png diff --git a/resources/www/common/images/icons/browse_basket.png b/resources/www/common/images/icons/browse_basket.png new file mode 100644 index 0000000000000000000000000000000000000000..585684376effb90c57422ef4d208e31dff0c4ef5 GIT binary patch literal 995 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 literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/icon_empty_bin.png b/resources/www/common/images/icons/icon_empty_bin.png new file mode 100644 index 0000000000000000000000000000000000000000..240aa01118c175caf68a5b818451cd187833a586 GIT binary patch literal 4009 zcmV;a4_5GrP)*8)JLK?wwA{Ri*1cPv&b%Ybw zap^)AFGC)0K`!pUZA25eh0Y@6CR`mPE`aB6905|HS%*X>T72hYw4h}YMzI*(T=p0h`!jQ}w?LGTj#_yqx$wIGo9duwj6!2lEyPa;sSX1co3=dgrWK(E>wBwPa)4FIT++RWm3Nee8tr*Vt8ud zF`#RACjwN=R7>yOZ3B#ClV`{(x=_*y4Z}Pv2}Buutv<4sTh9_?n*|h-=g?WShb{Le z#sU`EYi^-_q#x*f>P0}RU6tghMJ2ibVby1lUIaw5cxq`X4v;@wFrkzYl29rYGV2Es z5S_nN3$19zxnK?6e2soU46Yyo*2q4dT1-zqZs-E1yDKKJ+00n zfYo_iXcUnIGBztGiTUZ5kX|37Sr45kFlSX3k(CRE^i+bz6FLBB`Um5m$)M{}dyo{e zj%vB60(8L{5~>5)askwzIkTb&@G%+}KGqA(kV{b2XTOnt1=2=sRay^46|#SyAg|o4 z^t;-Y3!wIM(WR-!a%QFq`An@>h-^jV-4m?&uJep8G*R!YbF7%Gi;~nDa@JS-Om$BzX%=!qae}Ig-G;8(qW>1o? zUxlZ5*YwN<&~dZBJ)}uNTxfif)TwAaiy84Iq`!S!_*sfHoo;Q;tg{v%4}pG80n*mp zVbY~TSzUaRt0YM^xVm1UA9xTcq>yAc<|pwKg z79s637r=wYRjiPxT%>hxZ$R5u=;sB{uLpL*vD&9ee_V;6q&GzxcVCVs%XS2?k#!t@qb*L-(#mq(Rnwf7?z zz(a>UNQLAWuNu-j(QdcVu?b$^hFru#qICs{P8?QT=_NAWQqd1EzuEqPwUjhoFpRt7 ze7KeR=#wC8l7XiI4Yyxmpz^`CqZ7TiL-X6EAKO6ItCy-@VxTj9;Fo4~Sn2FbjsRKv z4EjtUOso7t*HmF}Y3M}1Ql~1mOPpu?0#XuBxX>iG7EcU*rH+&?_f7pkKTtzT6M7?V zl3fK8Lm2fQrjJ82+2q3`{Xn05CK1vxP<(8+G-RW|^;4j^xtcOcTnZiT?G!&2SC|q> z7tNvVF!1vn82U`mgG}}Eg3|sSX=Nbr@28L(nFZ}zNq5BtxWfY%0KIw%tTDAkIFk2b zs7&AZ+|RrS`Qug#^0!-B6KghmZ-_c{ZnmLp1vv}k(?A}xUs{wKe5`8NADtt;SLHS6 zZ!T2Qd&T&i!b&Sh#UwYHYodwrIwZgG7K$*gw4TSN452Z%kie*t9y+~B%jy=N6Vb-H z_D{rfXKDYpS0Ep^K)2DY9rF?y*{h_ZkNhoVI-6>Hx{XoeF z9tOA6(Rg;FZBQwcsnW!Bc8voghSyf*J@lAB_aHZtmyy$ayJzGBG00diLdsg5PAyWQ3_ZKF zJGHGozzpBPgU*iM17yleoQ$5iXD{7m3OkphOJpn-EYM?uK4jilFwRfKiK*Kh%P86R zz?dj3C7`o=D-No7WQ_whmBop%+l*ey-3l@mYrdez1pSVL9ZH-tBTlggOB6g#W$F9( zAV)m%GJj zNtF}OIXm(KBrP9lLt`CE>y@S@b>>5d30{CK)7jL6A<>Q@RF*VD_yweR=#zb>NTWjL zYBA-=(km7R@wC&Sx)e(yHe^I%o=mhUeN1N%10wm%Funk3(Ucn znm0Z|mZzjdtCuc)LV|3WU~r9xG+3_la^S;JCVzehiJgDEIG?&7v9wyQEGwJ3M4bn< z%8Y_0pXwQ}t(TX|?^@VGv>|>~KLI%8Ko_~D5s9DCThpNeFKpJ7?n(ZLkfa}g_S`HA z8k4srFch6&6CtO(@m;1R@{TmkeQ21#x#-A;cQEcT9Nil&5Z;gr>QO4E=~MP4L!zMB zNSEwP3zAyjTgJtwC)py%O7z^T7)!r82~!l zj(Ly7`_jER{F|eit-C~F@~5YO$ut6L@)>-evk(d~xaI}V|0JjKZEGTb`j8~~p<)8x z*UafaVUjPGTgdE8w*{w?ztA($un#-ZWU^F41{#>}>X52N#Wp(g>9U)aicZ56VyP|e z1I`4V29`YZpb0&pt@q^AZk6dZ!(GTg1EV&n%+jzhdvvPEqR%ZqnS}z|tcf&WQ*I5F zcHXRaYD(EvhE#oF<4<@oCWth!CCIhy+*LVRIqD}!+oK;~``&>D_OfANrA-TvH-?|v znc_d7OyFobj*gOTwvmRxc3kve=k^)oKYAhk!1_-iy}C3177`D&9RC*5#R;hYJfurT z*#AA`@NXe4IhKMn5aq_!PF*IF(hJ#Dd*=n!c3{>W^%Ry%BYS@iY4QxrSb(b1>pUe- z#J_$4l0JCW9efIVr=1@qPoRDYS$RjFQFqWOY%qq`f5#UfeZ|^npOtk-p2CL7sAaoq z??Z-)WqF^Kbw`MoW~lq>{02^;$^3=egy9T-9dN6IQ-%6g^=5H-?z0I@w>D0lpJ`yi$(?UaXZ&AJSch4`ATwQbY60DzXu$eyrzH*z z-J4$6f*;|P`8a1fU01U%4WM6?ccv==7(K2OEM3Tz8j$CI-o6v`tUMja_XsT8lW7yRl+_-}wPCaez5)2@T+ReHERVz})Lp1D+nszwagg z^vy}eh%Z5+zFlgLGq_`L2?+6!r~Bkmej=??zWfTZo+7xx!LPrn5jGOevlI}6|`vxFXoKql&a$neNb z?=e$0Ei8edy`|FfHl$dY7^fGODE19u`z~b2G+vpe!fPaOO8Jg)_co+ZnQZ2C!V*_Z z%zIs9+`SLkR;DE}ROp8iPsPE;hL{7KKlq_)K zwdpg+oA(~dn=nv5Pt0;n;obI1^}m@g;TBBAm2N9mDR=6niSdXE7&0&SI;I-9p-&c~2} zXjgW6FyFqImk6`ZAw$^W4o{NMISG^Z?$msK3o`W{%X;%9%(9wf&X*uV#Ks9xxqUV- z$(*l25~AfC*Ho{sL6#xUl>TLdBCA#XFT8vQG7+sww_lTaS@Zc-$V9Y@%yEAL$yxvw zIOhH4|R P00000NkvXXu0mjffAgZ_ literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/new_basket.png b/resources/www/common/images/icons/new_basket.png new file mode 100644 index 0000000000000000000000000000000000000000..a85a564919abcc94f51fdda7662343d0720f462e GIT binary patch literal 2260 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 TfuK1B00000NkvXXu0mjfr~Qlf literal 0 HcmV?d00001