From d789f6af932bf5b61890e9f7248d9efce38b7cbd Mon Sep 17 00:00:00 2001 From: "kent1@arscenic.info" <> Date: Tue, 24 May 2016 15:08:11 +0000 Subject: [PATCH] Bricoles --- lang/paquet-roles_fr.php | 6 +++--- lang/roles_fr.php | 6 +++--- prive/themes/spip/images/inserer-8.png | Bin 2965 -> 229 bytes prive/themes/spip/images/roles-128.png | Bin 1907 -> 1452 bytes prive/themes/spip/images/roles-32.png | Bin 1403 -> 1143 bytes prive/themes/spip/images/roles-64.png | Bin 1907 -> 1452 bytes roles_fonctions.php | 13 ++++++++----- roles_pipelines.php | 10 ++++------ 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lang/paquet-roles_fr.php b/lang/paquet-roles_fr.php index bfc8b6f..5c83fdd 100644 --- a/lang/paquet-roles_fr.php +++ b/lang/paquet-roles_fr.php @@ -1,7 +1,9 @@ 'Rôles', 'roles_slogan' => 'Typer des liaisons', ); - -?> \ No newline at end of file diff --git a/lang/roles_fr.php b/lang/roles_fr.php index 6b4f1ff..a4b0f41 100644 --- a/lang/roles_fr.php +++ b/lang/roles_fr.php @@ -1,7 +1,9 @@ 'Indiquer un rôle…', 'saisir_valeur' => 'Valeur', ); - -?> diff --git a/prive/themes/spip/images/inserer-8.png b/prive/themes/spip/images/inserer-8.png index cfccfdd887756375fd17e3a1af3890b374c46c89..b442bf9453a2f0a6e6cbe9ea3c279da88787d403 100644 GIT binary patch delta 202 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 delta 1893 zcmV-r2b%b-3-b<;BYy`vNkl-sOS{U+Ul~Ot=;&D9|fgo@QtrMM_ zr(AMo3yD$8*s>!rn_#>q-n?bza+&cmqnFg%%-xc+=5l%qDp5e@Ht`qUDcZG=&R-|~ zItElYEUgGsp?#j-AO0Fqpgh(w_x|f?pYP}WdB2|@-_Pgyet#7Xhl6JsswW8+j~{h7LSFeo5N0sxXE5DY%#z5Dy&@%?dvASu$)E~@6u`<#e~VYwRQ8Swif?^IMA5uMJt zauYwGN=>~M_35XtDw2}g<-`keg2dCOi^CxvK zM^gtRNs8?3>|A)`#*O?yAP_T|qDF&Cr5a33Ol+ApZGYNfK@f)Fo&m4dn|0{Wq1_&j zCwp=wh6asBb8gY1MWyla@fQS96r&m%8mgZa@cCe18fH3z?cSgPQa3M<;CjCCr&Khl2+X%HkD8G4hEk@o0#NiFqJeH$8*8|0pmw zLE|-$?p2Posj$Lil5GIO&`Nw45fKp-78YVO8qxnWllqGSYrlr0RS*y#9lz@gtY4H$ za&j_VU0t$rhSfl6X(_p;`Mk3azSsl9fw9N`*M9@H4ltQa)YjI@${E&PsIRY&_M1?9 zethxwvHJ`djYbp-g{+)mHDI&Z$Vq}1wV}sUp9QTpk+iflSvkXMpr@yYwzf8wPhes; z#6u8d8wmR>WV6{=zA%jqM@Ju%kqAp?!qOag-hZ9_bzjre)Fdlk*bUh2c9tz$Mt+Kd z7Jt{n|I-s-Sq?18h8Kh$>~=f5{$j`Fa*a+F0>W;fudk2R)>eKyFN2Sc!Qza&S34!b zjoogi=5Ka7Iy%CZ@2M2B#>PfguFPQJG%t3$odbV&(AL&Q@c!~j81YmLG&eW1X3ZJ~ z1_nlmo;!CgCXT25CWv!w-f+wDZ;(y}em_L6$Wo2c=#60{C>hJF#A>L#%@%Ec< zqPud1_bMyN$q7#nDeDe=x6jcVbT~Xmn3b5z;Nak6D{5wDCgtVjTwb}7E~}N;++5zN zuVTuz@bC6@YhzIZv_2B3| zg3)LMK&4V)Hk%PooZxar#ba}b0|T5dDM5GQ1Z&r>MXgqc&wx&+!>_o_`^_aZcJE_I zyge@2q3cx?6ciu`0&2CIq@*NzKKqQI_?TY$9)hCCmDQ^eKly}pAACScN`Fdt3^X@4 zGesFkhPohRvg6$~JQo{5W@aY6y}fMTzMV9S1$9x;xUroU3*9SL@H?}atgO&K(ML6K zzoHiF-w2uPwm3-7?GAEtbAh{k(bkloe=Nz*R*lacy zCYK^8lw*>l#=OX{(|^xD=YO5yxxuNlw6r`pcj?k4Hf`BL!p9#oecie-d8VYNqg}cb zo6Q!ofiY*HmX;RE%F4)3cm;?1$cS_LXam1UUdBRwDe*(ou-onI+`ad)6}G#(n~yeb zWYwxw%t%k?(!1{x^!rDQiPY(s`Q?|KX>Vum-o4>5;Pd%7d-g29N`HA9hx-UGOqqUH zbaE*=(SXC@pnC5YA@w-}0|Qtr7Rt-ZnfcXMTv)P%z|ETgC}U&EK5&3pjI-#Cv z+(LHh)F~<}E0`HShgg3CcDsYx+QVGCc5TAVncwec+qP|#l$7vFQxoSFFJ`E-ldS4$ zZt3;>b<-vSfe^n%Lw_~kbULwGx8wDCxqSKZ6L*xsV33-c8hVO~c%!))(e37rR?D9^ zZp7#FO_*<71HoW$LN8UQIC=6UZnvA+vuAT~#}2$+uPmOYwy+fnT3cIbZEbxbj>+9( z3IhbCQaOH)@B@WXsT>xxTCH=kg~)|gt91%`y}nVS(VUxXFmCNN?;PH6!{C@ura+5D2B4SXZ(Ku65QjQ9O f5P%=SHtYWZp=0D!Mak3W00000NkvXXu0mjfiHo!= diff --git a/prive/themes/spip/images/roles-32.png b/prive/themes/spip/images/roles-32.png index 0a816077adb6096f9643c2a11f89c0c52ff75664..93050bdce549464fb4058ffc29d21855607d9938 100644 GIT binary patch delta 1123 zcmV-p1f2W(3ik+*BYy-wNkl5LeQlgXB{+qYW`Q>T8-?%Zi&_wLmR+OvmbxTM{?4eYL6hQ1XmUN(#x1+$Awm^cP{ zdsnhsw(tbty1Lf#YV}+}D%E^JO65Xcp;%~*in`Y@VZx8*yYEgH&%m~A7UPj4a$c{$ zWm;{8g{S)#E`NO2eDA%fj2MeI8YkO|icZ?f%a8I_>-by7YczB1@u%%gxv_tD$Z_Lk zGTHvDtgPJl`1tm?xVX;Y6fuZJOky)qsq~<~zyI?OKm0I8Qp6-SlbxNNE5?S8Jn{(q z{QQuXmPVWR>l$J+iHV7=LjgNDI3Ok_1~P>TP5M{Sz<+;-Zi&2K*V@_5OhQ7!fDL$i zdm|$=3l+^$)SEv;nBottP65V+0BceJ%?sba+1dG)`w)A;27-fw!CE+YcYcr4rGH>v z41onvTGtExj&WD8p;7 zy^er@0DtifknFRJs>lDp4PLnY_1}L@ci=X3k3E-60m+MXD1Uo73Xi{Sq#h9BVq;_Rn#F?0wr+)a z?p(am(13!RoWUC)Fr`x}lR*AhJJOzThl}L|&MRl(kd#5r^S-F7ucKJFxw+9@DSOuq;_}jR|(*M0}{z z(Jy5G4NzU5c5Kp7BbyzA{EL_B^cnjbHQ)~FKZ{YLc+4-W??k>JV0hY5~X{rq6j>8KG0 zK8Bv2o{-8VC@CvOXlN*$oSgbKR&@4r9Ub_fqy*0hXF@-xKrB&d3JMC~;o%|nQCuv( zh|Q#@rS|-OUEY;L_%tw#52%BwY z5rDL$t?Q^RSAX;TJMVnJ>}+mI@3a5_Bq=E@mZ-?d`AgVrD^9B@Ec{dC<|;^%mX5VZ zwF&iDEK?gC+=kJZlPSn)Yd}g=XJ@VAl)IHtZ-5-ZSp?|vdO#E++kB{%%v13Pzp`oGS zEx+IYo8XpG6xXwnD7z~F09v~D75t;JSP_}%`)i4wmI>^q>PU*MmCD1gD z-rinbdTcwrV}gVV88Y0t5$fy-wiirLEXL^U?0+E?3jOy00ApigJeV1xu`G`&JKSG< z9T9LdH!;Mp$H%Xs5UQ%C<#k&Cs;V;T`i8gbYjL~X{Pyz*`T6wRbP^K!AO%t(;U8&JGOR9)J*nqM{-i8n+>BoaYaz8`t~* z7p@F2mk6=9Vh(4;7JNP*85tQow{s`))>a~eg8&4N9HHsZA@nU<@OV6=I_Pc!c=owx z(d+->lZ$V1A64egea31Alw=?7?vSIDz)|h5mWJpTNO`G#@=m*+UQU zV^0t9`0_XSP3J&39OnGBKE@&=Hzfxci;SS=&XJdw$Hj{m$*8Qvkd?JGNY}ag?z>c- zI>qD7%~&j!^Z|yw!)!G_e#>B!ltH<*231W`Qc^-sPY*w2XOsWldzeZ}mc**zFn`l+ zZEVfX#_4pX4-g0h*bs40XenR#W|gyfx~zpmHShCiSobnZziYxbNQk$&@y*%XWar#C}4(5`Etd zGCFXHz(jy#G6{gL>jZ;AE+v!HwtuvcdHFK&$w`V{e;sAlE5DgcN?B7F75*DDUZ zm4d+_pPo8JU0ogCjt-*HXv#6Sbri3pSS-fbvuD$em&|7KOzN=pk=bmXkzyPU#~E3c zSAIdRgJfBbIUJ5Na%E*@r>d%^;o;#|;_>)~|0B7{WSXt5tvy~@S=lMvZa2EFOOZ&V rG?7Ty{*NCMqtO_)TCINyA+)~%`Ex)Z{ZLfZ00000NkvXXu0mjfbpXRZ diff --git a/prive/themes/spip/images/roles-64.png b/prive/themes/spip/images/roles-64.png index 4953089a1e283bdaef22ffe3a973359daf68c21e..eff6aecaf14c058ed8499d53465ea86008e6ccda 100644 GIT binary patch delta 1435 zcmV;M1!Vg34y+51BYy>RNklA?za&P1E(Q!9py4ADJ^J4g<_e3G|){dReMy7cOKo0Wzpbl*_W1aVe-BQ}L{VIPTv1qfT%MnQLY|lR5vQCSPkDCsNluxW zUUISc6p5Bk>wk_N?V#WP3?6GTR zAT%@-#l^+w>FI%C!h-w`;Ijf?n-FjjEGqVQK%>z(j)8!H02CAy;K`FGFikF?_&)GO z5wJamfPbxZI0bBriHUIx11&8r7@Y>bE(P9L3abM2 zdOdu7eK+2KKp+6MqiMDqcsmiWSb*!-uRF#j?(gqMg2Z+Mo>{bw{s`Eq?Agf{qw+$8#gdJI}7P> zCBDCZ4kzoj6X>#PAE`rQVZbZsaj0|NsCltb)ifY#^a zoEax-UL!c0^kdg0n9XKd67=u02~Bn3f=%b6&%(oDG#Dtk*~I{tQNL?@-(~}+>VMzD z%)%5zA`usPrgb_z^zg9BM7Os$CQT-!rKPRf0GCnA`b9Py@Tl1W&BRkQH8pX4Bqb$b z+-QXA{CS&9XvJcTj*i;L03{y7jF!Nb1^=ey9b`WhqJO-bt#eXRQkL{16bhkdzV8f&MrFWbEv)6DhG&Q1!&_R9kgm{?sq_zMf|-LwxGs;f|qb--ve{^vS}o|zR21xA@j z)wXNbl5jfS(Ltvc6us=5$i!kX01E~u|72qND3~KXiuEfl&gj1C>S|0fS$|x9-~c-t zrrKJ1E}$8=dnTpHeeXr;5j6Du+Q^CjQw%#?hZ ppPwH|8`}{@Y{W>cy#Gu43lu}E0(7nuReS&d002ovPDHLkV1iE^v*G{% delta 1893 zcmV-r2b%b-3-b<;BYy`vNkl-sOS{U+Ul~Ot=;&D9|fgo@QtrMM_ zr(AMo3yD$8*s>!rn_#>q-n?bza+&cmqnFg%%-xc+=5l%qDp5e@Ht`qUDcZG=&R-|~ zItElYEUgGsp?#j-AO0Fqpgh(w_x|f?pYP}WdB2|@-_Pgyet#7Xhl6JsswW8+j~{h7LSFeo5N0sxXE5DY%#z5Dy&@%?dvASu$)E~@6u`<#e~VYwRQ8Swif?^IMA5uMJt zauYwGN=>~M_35XtDw2}g<-`keg2dCOi^CxvK zM^gtRNs8?3>|A)`#*O?yAP_T|qDF&Cr5a33Ol+ApZGYNfK@f)Fo&m4dn|0{Wq1_&j zCwp=wh6asBb8gY1MWyla@fQS96r&m%8mgZa@cCe18fH3z?cSgPQa3M<;CjCCr&Khl2+X%HkD8G4hEk@o0#NiFqJeH$8*8|0pmw zLE|-$?p2Posj$Lil5GIO&`Nw45fKp-78YVO8qxnWllqGSYrlr0RS*y#9lz@gtY4H$ za&j_VU0t$rhSfl6X(_p;`Mk3azSsl9fw9N`*M9@H4ltQa)YjI@${E&PsIRY&_M1?9 zethxwvHJ`djYbp-g{+)mHDI&Z$Vq}1wV}sUp9QTpk+iflSvkXMpr@yYwzf8wPhes; z#6u8d8wmR>WV6{=zA%jqM@Ju%kqAp?!qOag-hZ9_bzjre)Fdlk*bUh2c9tz$Mt+Kd z7Jt{n|I-s-Sq?18h8Kh$>~=f5{$j`Fa*a+F0>W;fudk2R)>eKyFN2Sc!Qza&S34!b zjoogi=5Ka7Iy%CZ@2M2B#>PfguFPQJG%t3$odbV&(AL&Q@c!~j81YmLG&eW1X3ZJ~ z1_nlmo;!CgCXT25CWv!w-f+wDZ;(y}em_L6$Wo2c=#60{C>hJF#A>L#%@%Ec< zqPud1_bMyN$q7#nDeDe=x6jcVbT~Xmn3b5z;Nak6D{5wDCgtVjTwb}7E~}N;++5zN zuVTuz@bC6@YhzIZv_2B3| zg3)LMK&4V)Hk%PooZxar#ba}b0|T5dDM5GQ1Z&r>MXgqc&wx&+!>_o_`^_aZcJE_I zyge@2q3cx?6ciu`0&2CIq@*NzKKqQI_?TY$9)hCCmDQ^eKly}pAACScN`Fdt3^X@4 zGesFkhPohRvg6$~JQo{5W@aY6y}fMTzMV9S1$9x;xUroU3*9SL@H?}atgO&K(ML6K zzoHiF-w2uPwm3-7?GAEtbAh{k(bkloe=Nz*R*lacy zCYK^8lw*>l#=OX{(|^xD=YO5yxxuNlw6r`pcj?k4Hf`BL!p9#oecie-d8VYNqg}cb zo6Q!ofiY*HmX;RE%F4)3cm;?1$cS_LXam1UUdBRwDe*(ou-onI+`ad)6}G#(n~yeb zWYwxw%t%k?(!1{x^!rDQiPY(s`Q?|KX>Vum-o4>5;Pd%7d-g29N`HA9hx-UGOqqUH zbaE*=(SXC@pnC5YA@w-}0|Qtr7Rt-ZnfcXMTv)P%z|ETgC}U&EK5&3pjI-#Cv z+(LHh)F~<}E0`HShgg3CcDsYx+QVGCc5TAVncwec+qP|#l$7vFQxoSFFJ`E-ldS4$ zZt3;>b<-vSfe^n%Lw_~kbULwGx8wDCxqSKZ6L*xsV33-c8hVO~c%!))(e37rR?D9^ zZp7#FO_*<71HoW$LN8UQIC=6UZnvA+vuAT~#}2$+uPmOYwy+fnT3cIbZEbxbj>+9( z3IhbCQaOH)@B@WXsT>xxTCH=kg~)|gt91%`y}nVS(VUxXFmCNN?;PH6!{C@ura+5D2B4SXZ(Ku65QjQ9O f5P%=SHtYWZp=0D!Mak3W00000NkvXXu0mjfiHo!= diff --git a/roles_fonctions.php b/roles_fonctions.php index 6e3d558..0f368b6 100644 --- a/roles_fonctions.php +++ b/roles_fonctions.php @@ -5,12 +5,14 @@ * Licence GNU/GPL */ -if (!defined('_ECRIRE_INC_VERSION')) return; +if (!defined('_ECRIRE_INC_VERSION')) { + return; +} include_spip('inc/roles'); /** - * Retrouve la traduction d'un rôle dans un objet donné + * Retrouve la traduction d'un rôle dans un objet donné * * @param string $role * Le role dans la base de donnée @@ -18,11 +20,12 @@ include_spip('inc/roles'); * L'objet sur lequel est le rôle * @return string * Le texte du rôle dans la langue en cours - * + * **/ function filtre_role_dist($role, $objet) { - if (!$role) return ''; - if (!$objet) return $role; + if (!$role or !$objet) { + return ''; + } $roles = roles_presents(table_objet(objet_type($objet))); if (isset($roles['titres'][$role])) { return _T($roles['titres'][$role]); diff --git a/roles_pipelines.php b/roles_pipelines.php index ec44853..8176f65 100644 --- a/roles_pipelines.php +++ b/roles_pipelines.php @@ -9,10 +9,9 @@ if (!defined('_ECRIRE_INC_VERSION')) { return; } - /** * Ajoute Bootstrap dropdown aux plugins chargés - * + * * @param array $flux * Liste des js chargés * @return array @@ -27,10 +26,9 @@ function roles_jquery_plugins($flux) { return $flux; } - /** * Ajoute Bootstrap dropdown aux css chargées dans le privé - * + * * @param string $flux Contenu du head HTML concernant les CSS * @return string Contenu du head HTML concernant les CSS **/ @@ -50,11 +48,11 @@ function roles_header_prive_css($flux) { * @return string Contenu du head HTML concernant les CSS **/ function roles_insert_head_css($flux) { - + $config = lire_config('chosen', array()); if (isset($config['active']) and $config['active']=='oui') { $css = find_in_path('css/bootstrap-button-dropdown.css'); $flux .= '' . "\n"; } return $flux; -} \ No newline at end of file +}