From 316d578320820c28583f90b86f74d839fd9e447d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=AFeul=20Rouquette?= Date: Sat, 12 Feb 2022 16:34:43 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20#7=20=20=20-=20=20Le=20"logo"=20dans=20le?= =?UTF-8?q?s=20`.yaml`=20ne=20servait=20en=20pratique=20pas=20->=20on=20su?= =?UTF-8?q?pprime=20=20=20-=20=20En=20revanche=20on=20garde=20icone=5Fbarr?= =?UTF-8?q?e=20=20=20-=20=20On=20cherche=20dans:=20=20=20=20=20*=20dossier?= =?UTF-8?q?=20`barres=5Ficones`=20=20=20=20=20*=20dossier=20`images=20du?= =?UTF-8?q?=20th=C3=A8me=20courant,=20et=20donc=20possibilit=C3=A9=20d'avo?= =?UTF-8?q?ir=20une=20=20=20=20=20alternance=20png/svg=20pour=20les=20vieu?= =?UTF-8?q?x=20plugins=20=20=20=20=20*=20`find=5Fin=5Fpath()`=20=20=20-=20?= =?UTF-8?q?On=20r=C3=A9duit=20=C3=A0=2016px=20l'icone=20pour=20s'assurer?= =?UTF-8?q?=20que=20cela=20passe=20dans=20la=20barre=20=20=20typo=20=20=20?= =?UTF-8?q?-=20On=20passe=20les=20icones=20en=20svg=20=20=20-=20Lorsqu'on?= =?UTF-8?q?=20a=20choisi=20le=20mod=C3=A8le=20qu'on=20veut=20ins=C3=A9rer,?= =?UTF-8?q?=20on=20ins=C3=A8re=20l'icone=20en=20=20=20titre=20de=20formula?= =?UTF-8?q?ire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- formulaires/inserer_modeles.html | 25 +++++++++++---------- formulaires/inserer_modeles.php | 4 +++- icones_barre/inserer_modeles.png | Bin 406 -> 0 bytes icones_barre/media.png | Bin 329 -> 0 bytes inc/inserer_modeles.php | 24 +++++++++++++++++++- inserer_modeles_pipelines.php | 2 +- modeles/media.yaml | 3 +-- paquet.xml | 2 +- prive/themes/spip/images/modele-16.png | Bin 406 -> 0 bytes prive/themes/spip/images/modele-24.png | Bin 664 -> 0 bytes prive/themes/spip/images/modele-32.png | Bin 889 -> 0 bytes prive/themes/spip/images/modele-add-16.png | Bin 502 -> 0 bytes prive/themes/spip/images/modele-add-24.png | Bin 970 -> 0 bytes prive/themes/spip/images/modele-add-24.svg | 1 + prive/themes/spip/images/modele-add-32.png | Bin 1334 -> 0 bytes prive/themes/spip/images/modele-xx.svg | 11 +-------- 16 files changed, 44 insertions(+), 28 deletions(-) delete mode 100644 icones_barre/inserer_modeles.png delete mode 100644 icones_barre/media.png delete mode 100644 prive/themes/spip/images/modele-16.png delete mode 100644 prive/themes/spip/images/modele-24.png delete mode 100644 prive/themes/spip/images/modele-32.png delete mode 100644 prive/themes/spip/images/modele-add-16.png delete mode 100644 prive/themes/spip/images/modele-add-24.png create mode 100644 prive/themes/spip/images/modele-add-24.svg delete mode 100644 prive/themes/spip/images/modele-add-32.png diff --git a/formulaires/inserer_modeles.html b/formulaires/inserer_modeles.html index 39ed1a3..bfcfb34 100644 --- a/formulaires/inserer_modeles.html +++ b/formulaires/inserer_modeles.html @@ -1,9 +1,10 @@
[(#ENV{formulaire_modele}|non)

- + <:inserer_modeles:titre_inserer_modeles:>

] [(#ENV{formulaire_modele}|oui)

+ [(#ENV{icone_barre}|balise_img|liens_absolus) ] <:inserer_modeles:titre_inserer{modele=#ENV{_nom}}:>

] [

(#ENV*{message_ok})

] @@ -30,22 +31,22 @@ ]
- #GENERER_SAISIES{#ENV{_saisies}} + #GENERER_SAISIES{#ENV{_saisies}}

- - [(#ENV{ne_pas_afficher_bouton_annuler}|non)] + + [(#ENV{ne_pas_afficher_bouton_annuler}|non)]

- - <:inserer_modeles:choisir_modele:> -
+ + <:inserer_modeles:choisir_modele:> +
- -
- #SET{id,#CLE|concat{#ENV{modalbox}|?{'_modalbox',''}}} - - + +
+ #SET{id,#CLE|concat{#ENV{modalbox}|?{'_modalbox',''}}} + +
diff --git a/formulaires/inserer_modeles.php b/formulaires/inserer_modeles.php index 105338b..c2c82f0 100644 --- a/formulaires/inserer_modeles.php +++ b/formulaires/inserer_modeles.php @@ -36,7 +36,9 @@ function formulaires_inserer_modeles_charger_dist($formulaire_modele, $modalbox, $contexte['formulaire_modele'] = $formulaire_modele; $contexte['_nom'] = _T_ou_typo($infos_modele['nom']); - $contexte['logo'] = $infos_modele['logo']; + if (isset($infos_modele['icone_barre'])) { + $contexte['icone_barre'] = inserer_modeles_find_icone_barre_path($infos_modele['icone_barre']); + } $contexte['_saisies'] = $infos_modele['parametres']; if (_request('_code_modele')) { $contexte['_code_modele'] = _request('_code_modele'); diff --git a/icones_barre/inserer_modeles.png b/icones_barre/inserer_modeles.png deleted file mode 100644 index b94f2229cadb418a4d8ad5a441453cc6406aa229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKV2t&2aSW+ooI5GGjMY)3rCK+i z^QL#s?QL7T3m7+k)%UAAzU{47{l>VE=T{!wTmSCMnJu0@T{rqUIm1#49?bV?ThqzM zC$wvq#pSP8Tl3cG?KkDoQOZ_oVruzxIVfbx%yo~}@Vq{w@5|37HqlhDkWwBt-m6WIHDV@t1*8B5E^K*hFbgIlBeEW9m+?3WmrDYoy1@GD4vvZjn zKijv@4R@xfJYAl?Vwr}I?^3xeouX>6tK!*Pj33PBs^8r-=ZVX`Uj09F6BFXY57hlz we`3~z0}~kaW_%N$teCw<=9=FBEsy2Od>%HweYyD@FuWN&UHx3vIVCg!0G+eB0RR91 diff --git a/icones_barre/media.png b/icones_barre/media.png deleted file mode 100644 index 2233159440551b10fcce52c3e4d23fa354af90b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$P)uYktG@^0++Clv^=fK?^+}xk|#NXDUv7&@rQ~yUaU>Gx=s@ zeZV4*SFZAK=^5(%?^~DGG8V7Nx}NYXqQQTG#~T+uB-?x3TOL(QfLQUJVKF{4-EX@H zp}4+Dui|9^*g3(f-izICI*XzCzMMO6Ys!`w)gWun%dYpFWUvHpGH;|;z $yaml_data['nom'], - 'icone_barre' => isset($yaml_data['icone_barre']) ? find_in_path('icones_barre/'.$yaml_data['icone_barre']) : '' + 'icone_barre' => isset($yaml_data['icone_barre']) ? inserer_modeles_find_icone_barre_path($yaml_data['icone_barre']) : '' ); } } @@ -99,3 +99,25 @@ function inserer_modeles_definir_defaut($saisies) { } return $saisies; } + +/** + * Retrouver l'icone : + * - d'abord dans icones_barre + * - sinon dans le thème / images (et du coup on peut jouer avec png/svg) + * - à défaut dans find_in_path + * S'assure que l'icone ne fait pas plus de 16 px, pour tenir dans la barre du porte plume. + * @param string $nom + * @return string chemin +**/ +function inserer_modeles_find_icone_barre_path(string $nom): string { + if (!$chemin = find_in_path("icones_barre/$nom")) { + if (!$chemin = find_in_theme("images/$nom")) { + if(!$chemin = find_in_path($nom)) { + return ''; + } + } + } + include_spip('inc/filtres'); + include_spip('inc/filtres_images_mini'); + return extraire_attribut(image_reduire($chemin, 16), 'src'); +} diff --git a/inserer_modeles_pipelines.php b/inserer_modeles_pipelines.php index 4ad0b37..692b026 100644 --- a/inserer_modeles_pipelines.php +++ b/inserer_modeles_pipelines.php @@ -87,7 +87,7 @@ function inserer_modeles_porte_plume_lien_classe_vers_icone($flux) { $formulaires_modeles = inserer_modeles_lister_formulaires_modeles(); if (count($formulaires_modeles) > 0) { $icones = array(); - $icones['outil_inserer_modeles'] = 'inserer_modeles.png'; + $icones['outil_inserer_modeles'] = inserer_modeles_find_icone_barre_path('modele-xx.svg'); foreach ($formulaires_modeles as $nom => $formulaire) { if (substr($nom, -5) == '.yaml') { $nom = substr($nom, 0, -5); diff --git a/modeles/media.yaml b/modeles/media.yaml index c63e1d7..13f03c3 100644 --- a/modeles/media.yaml +++ b/modeles/media.yaml @@ -1,6 +1,5 @@ nom: '<:inserer_modeles:nom_media:>' -logo: 'images/media-24.png' -icone_barre: 'media.png' +icone_barre: 'document-xx.svg' parametres: - saisie: 'hidden' diff --git a/paquet.xml b/paquet.xml index a707d71..422560c 100644 --- a/paquet.xml +++ b/paquet.xml @@ -4,7 +4,7 @@ version="2.0.0" etat="stable" compatibilite="[4.0.0;4.1.*]" - logo="prive/themes/spip/images/modele-32.png" + logo="prive/themes/spip/images/modele-xx.svg" documentation="https://contrib.spip.net/?article3631" > diff --git a/prive/themes/spip/images/modele-16.png b/prive/themes/spip/images/modele-16.png deleted file mode 100644 index b94f2229cadb418a4d8ad5a441453cc6406aa229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKV2t&2aSW+ooI5GGjMY)3rCK+i z^QL#s?QL7T3m7+k)%UAAzU{47{l>VE=T{!wTmSCMnJu0@T{rqUIm1#49?bV?ThqzM zC$wvq#pSP8Tl3cG?KkDoQOZ_oVruzxIVfbx%yo~}@Vq{w@5|37HqlhDkWwBt-m6WIHDV@t1*8B5E^K*hFbgIlBeEW9m+?3WmrDYoy1@GD4vvZjn zKijv@4R@xfJYAl?Vwr}I?^3xeouX>6tK!*Pj33PBs^8r-=ZVX`Uj09F6BFXY57hlz we`3~z0}~kaW_%N$teCw<=9=FBEsy2Od>%HweYyD@FuWN&UHx3vIVCg!0G+eB0RR91 diff --git a/prive/themes/spip/images/modele-24.png b/prive/themes/spip/images/modele-24.png deleted file mode 100644 index 3536c405544ae6d11c9832e9a2180cb8a95d08ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 664 zcmV;J0%!e+P)2$0^2aeo0ynB}p z?Ajr8aEXd>V8XTz?b<2E>v75Fb<6MbEJ-k6F|e)uJGYCeDK1ofX|Wp0N|q!Tuo&3Z z{vDBm-j2T-?CH=@Z`YCp0~P~2Wdoj|vAj$TixXKG#trP|PL1^UXmp@gBLjUJ9_ZKL zz`%Tjmke1Lu+ldOsk*2@++TfJsp=~#bguEBZZvPw^`?!vga5(=~5C1cXGdy_7kc9y&QLvAKXfu=8 zV57KSuX98m$B4N^#cb zX0)|1r|rf0kq9;!95TtKz*#q5RV(1O{VBi8rhwZq62T^eLnhg^0{>fpraMcE+8(Z8 z!Zs~HwrK&s%dU{urLfPfkk6x_&nv&rH;7=sf(e_9Rtr?MHapFA($?aFww9Om$j;4r zW$zNbynAs!!V3cyOxR?QWnF+D((*9qQ#2gVVdPM+9bBqh(yL6&)sOJPfCUpa8DzCy zV6(o!=JKjxz6_AQdE;Jv`{sT6t~>F!c<{o2RbzHqfR^#YuoBUT;_;+j-Mtb?X@Nh#dRc#e{fePi zyVNUqObft-O-9QFXqn5TRLEtN%NJ@3M4kHQ+c#wU?#-Tr2QLg*FkzEnU4R0O1?FZ< z3jlHa^sbygz1NHI;597(n~W9(M9bQ$`hYq=a{ZO9YKJH0)@WOxv6E+!~ zBNkYhzMIEtZOqSUeQ~K-!1w3p{ism@7EIV=v@Sr)N~Nf3wW3P3S}$N%(DtnY|9st( z@Zg033npwb+AlCWZCW4|u`A;KNfFl%y$BCp(*m&DE>NwO`N)@?dI6hazTXt}{@Ro9 z;DymRu*qmyV0r2;t<6qpeQs83^NY<(kc=1#|I?H3;DrGTCTub+1#YMnF#Y$n1uo{n zM1@R9`E;Ns;lT^Td}m^o152zo7d~5oeTBi=J|SI0ZFQ zlyM(2n+5K;;rbLmpw&1;7MYC#rx-fh&^coknPeYz9AD68%p#NQ$)0}!bKujv)=PiC P00000NkvXXu0mjfrueur diff --git a/prive/themes/spip/images/modele-add-16.png b/prive/themes/spip/images/modele-add-16.png deleted file mode 100644 index 2394d66790f7843b2f602e16e44aaa53c611f075..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmVs<6@K%AL}4)S;*nRi>Nie zZqp5#>#Eh-Sg+QmCN-}BIXrj~wKI1xIeiBS3A&o)ulqR`-OE0<0Al3u;H75n4%l?H zx2mVRM-TI?8tQG(Kv(Soh>^pCmzpJakQ$$$2f0>J@bl?K{d#^0SQ8_MXZbrA8tB*X z$f&s0fzBG0eSM(vZ_}_QMh*|&xjSG$$x#tXiH#Rm!Q52##ldF*>$5MdvYj!qoHk;< z_`!E!gNcbTO-hai77cdSYXG|H1ZQ8_6n?|#+&`m#9Wi2N?~%QGzCluCxKd(bbt&Cj zce9S@PWquaY-f#5d^0NfWQ3U66E{9ISVPt`M&BA@7R1;SpSy#^h%lZ5Pk0ITb4G=) zjMASPA!hc(Xa0rNRd{>9{I3~hKQVe&6(eT$)|4$Wo^GD6X~LbXg!RxtS&}!4D{^jT siVyBT_{kV!wmI0d4)!{*IKh6~f2JwM3dzkA#Q*>R07*qoM6N<$g4YV_)Bpeg diff --git a/prive/themes/spip/images/modele-add-24.png b/prive/themes/spip/images/modele-add-24.png deleted file mode 100644 index 2a074790f86584b5b15462a30944982e8d791ff9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 970 zcmV;*12z1KP)+LV^q~G=|#&fH_n%fuWy!%Eb zJvDPiMnXKP@v(xm`VrERrnF6Zd>o2vS1)t@+7)hGzgjP(AuWZpO-fu0ipIr-G;xDF=rI7Yr7w8FExLq`_BifZlMHg7khd6uU zDCbTd1kGwkyV8)>y%z*%R8*k%M>Cg`W*!eCTBI?fRXEdIhE<7X zG^-u$N<&%@D8E1-DNn$fIwv?~p1LE!!in%WmM z^)$4WA|=4)1w+}gaCk*ny|$$^b?DrEnLSs?@MXjd8)ULf}p??uW=e3X`5 z);CYf9NE5@qdS(~i&bC3;-$UFAM!3=wK0PHp&zhe*IZo@y1+Jo1_gOEww#+difQa} z%Yc&ehd8}|9jErMy^G^}R?~9y&-~T>LHaL`X4TOiLb+;0G#Xn4K`WI80{3#ga{DrUE80PHH!ZFWKS*WKO%^JO@n#P$kXZWtI zq16gQvt^YVsHYjt+6KBHhlc-OkZ)69eGY!TO<_hFzchS~f@y}fs|_vhF;cFYdYbvc z^;GRH@Or&WSvZtmyBa#IF|=Q6XuT?Apj \ No newline at end of file diff --git a/prive/themes/spip/images/modele-add-32.png b/prive/themes/spip/images/modele-add-32.png deleted file mode 100644 index deb9d948fe3a6346de4df1b8e71e6312c5d7513d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1334 zcmV-619J+% z`nt92&#PChs%lrQEKuhv0d9a6nrLI-=DJm@h$_g>RbfG%iVE|u3gAYALKAHa++C|m zB~dM%cD0Fcs%@m}ssL^@C^XT=z`eC9dkmaDc35$zjw$~1iK_y*(V);o+hf3&08Z5| zDpGB)FyMsSKLHH*5-<*rEAi|pCB>drV(b|u#GX}LZ0uzL4!Gci8;uYNxYfd86OU7y z$OyHGj@Gz#bu_O-SXN`N9B{!2HyUV#OrW(lf!5K@&2o7`v~AIFZC^Y>J1z{&vcoPMaCtb-mjEu)Q<9XC znymEnOwI3DPLS+cK32O|j@O=*6E6tNvcoPMaKQ;T8sQUgIfUC*QPHIa_N|$$1M8+; z6xi_^fD2Bz!zX~ttn^gnWMwEjCs#a)AUUvph7N63r@Jv2uz^ze-d!o{StuW#Gd6kxo5@2fE{-I5`Y_x5C()x&!=HgfeMR@J&#|? z37y`*T4xTd4F@x`Myu8iQiCCH=*v!)zUb%yy>0AA+H+#H_#{Mw3TmL4t%-QAZsl^S zWn@&Tf!Movi={WI)=W!)o-^*4={Bdb zii?ZGB;c_5C6JYTT*;^RDEZW`03@B94*wYyGKi>az9`*%nx;KgZI!qUVe| zW|-X>vnsd&x4W3X@|M@YF{Q;GQ0m$J0f;}bOZ5l8sgWD1s^7*JntvyDf+ry3P21RCJ+Y2j$9mQIISxFSm*g3M%tq?iDliP@>II$2tDw1HepEZK}u z;{_)A***jGoN>ntv+PtUTgGRgCI&>gMfnmaBi>93auSuF9Up)*C-&)ULpFNPJ8~NG z^A$79vQzP&zXJ_KH8Ba;n~3-87EYH&x2~Z%?f%y6)_-bNt3LuT+VP{lF=YL>J*3EG z=QqF%v+PvxGf=6bE~OF@67+3nOC8o(YO}^t^m0qirIs2l^qHaOj5}tSWv9a5e+3vY z2{cl35^yy2!p1un{|1GCgU_dTcS+W~s9gYPTNHbLP2Y=2!cZI)41P|I3hHDVI`iw_6z*8QQ&jx17Vi)33cu z{PQjKG=hD10ea6Fcg!%$4w|I~8rH0l#Q{lNEO_{c^Ut4u()WM7t#6%o=$p%=LX*!lrgAn(AdBR=sDw#8D_mZXrgUhPlKDw#C--2 s89Z(9g29V`o-^*4@y(-&_WxY}0<5A_p~T|ag8%>k07*qoM6N<$g1qmVasU7T diff --git a/prive/themes/spip/images/modele-xx.svg b/prive/themes/spip/images/modele-xx.svg index a9d90b7..f95b6b5 100644 --- a/prive/themes/spip/images/modele-xx.svg +++ b/prive/themes/spip/images/modele-xx.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file