From a22259907b31aacfb80186375ac4f56ae09d5ed6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 5 Apr 2012 20:12:11 +0200 Subject: [PATCH] Fix: possibility to custom helpdoc image --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/main.inc.php | 2 +- htdocs/theme/{common => auguria/img}/helpdoc.png | Bin htdocs/theme/bureau2crea/img/helpdoc.png | Bin 0 -> 693 bytes htdocs/theme/cameleo/img/helpdoc.png | Bin 0 -> 693 bytes htdocs/theme/eldy/img/helpdoc.png | Bin 0 -> 693 bytes 6 files changed, 2 insertions(+), 2 deletions(-) rename htdocs/theme/{common => auguria/img}/helpdoc.png (100%) create mode 100644 htdocs/theme/bureau2crea/img/helpdoc.png create mode 100644 htdocs/theme/cameleo/img/helpdoc.png create mode 100644 htdocs/theme/eldy/img/helpdoc.png diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4b2644d33d8..c98df1da5e6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1705,7 +1705,7 @@ function img_picto_common($alt, $picto, $options='', $pictoisfullpath=0) global $conf; if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png'; if ($pictoisfullpath) return ''.dol_escape_htmltag($alt).''; - if (! empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS) && file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/'.$picto)) return ''.dol_escape_htmltag($alt).''; + if (! empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS) && file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/'.$picto)) return ''.dol_escape_htmltag($alt).''; return ''.dol_escape_htmltag($alt).''; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index a3bfc1f222f..309b93c9984 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1446,7 +1446,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me print '" href="'; print sprintf($helpbaseurl,urlencode(html_entity_decode($helppage))); print '">'; - print img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1).' '; + print img_picto('', 'helpdoc').' '; print $langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help'); //if ($mode == 'wiki') print ' ('.dol_trunc(strtr($helppage,'_',' '),8).')'; print ''; diff --git a/htdocs/theme/common/helpdoc.png b/htdocs/theme/auguria/img/helpdoc.png similarity index 100% rename from htdocs/theme/common/helpdoc.png rename to htdocs/theme/auguria/img/helpdoc.png diff --git a/htdocs/theme/bureau2crea/img/helpdoc.png b/htdocs/theme/bureau2crea/img/helpdoc.png new file mode 100644 index 0000000000000000000000000000000000000000..8cd950e7be1aabd9b452c150ddd128e6223f72e1 GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3-n?Kj!QJQtTz3zOL*yIm8(h1*R4sQwIuh z7I;J!Gca%qfiUBxyLEqnf-LEdzK#qG8~eHcB(gFvFbW3vgt#WhMCT+Y<)x(*q^A{T zq!(wTmtW@nYe1b)pXa_PHJtQ(%w3?qit$u`?Ri(ncbbUdwb^e_0F5nw|MI0)pKU8nKygW z;ssllEZVwc(Y9racPwAJW5u$aE0^tBxqSD^<$G4G*t2@&-Zd-tty#5i?dtvO)*Rlr z{>Y~FN4IP|wr$Jt?ORXo*mi2yj?=q$p5C+T%--GS5AHvI=)i@;2QM5sboJ!%tEWy} zKXdBl`LlN}UATMs(u3>Q9^Sn1=+@20w{JbUd;96VyHD@md-3Sui^q>%J$dr_>C+Fd zUw?Z4?(>KDUp{{L{_W$>@85s_{8_O+r3V;T(Ir8C!T)In80P%iu?J|)0Z$jl5RU7< z{l|rx92lIhx4M>XOnBe4_xrj8ap`RvdH?)xf6>tQY|@$CDvY~U8m*eeI3ujYSz1p6?#fDol7fyyMQn;~@~bO(*jkIbo15g5+^oDJ*!SLv-94?NHTAgq&26>YkF*?h z-hD;pQ=P-MV|}4EcJ*1?o$qh^rx$wU$|uW5X7%wRialj+Rg5pQ^%CbiI4TMB3xlVt KpUXO@geCx!B8$ub literal 0 HcmV?d00001 diff --git a/htdocs/theme/cameleo/img/helpdoc.png b/htdocs/theme/cameleo/img/helpdoc.png new file mode 100644 index 0000000000000000000000000000000000000000..8cd950e7be1aabd9b452c150ddd128e6223f72e1 GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3-n?Kj!QJQtTz3zOL*yIm8(h1*R4sQwIuh z7I;J!Gca%qfiUBxyLEqnf-LEdzK#qG8~eHcB(gFvFbW3vgt#WhMCT+Y<)x(*q^A{T zq!(wTmtW@nYe1b)pXa_PHJtQ(%w3?qit$u`?Ri(ncbbUdwb^e_0F5nw|MI0)pKU8nKygW z;ssllEZVwc(Y9racPwAJW5u$aE0^tBxqSD^<$G4G*t2@&-Zd-tty#5i?dtvO)*Rlr z{>Y~FN4IP|wr$Jt?ORXo*mi2yj?=q$p5C+T%--GS5AHvI=)i@;2QM5sboJ!%tEWy} zKXdBl`LlN}UATMs(u3>Q9^Sn1=+@20w{JbUd;96VyHD@md-3Sui^q>%J$dr_>C+Fd zUw?Z4?(>KDUp{{L{_W$>@85s_{8_O+r3V;T(Ir8C!T)In80P%iu?J|)0Z$jl5RU7< z{l|rx92lIhx4M>XOnBe4_xrj8ap`RvdH?)xf6>tQY|@$CDvY~U8m*eeI3ujYSz1p6?#fDol7fyyMQn;~@~bO(*jkIbo15g5+^oDJ*!SLv-94?NHTAgq&26>YkF*?h z-hD;pQ=P-MV|}4EcJ*1?o$qh^rx$wU$|uW5X7%wRialj+Rg5pQ^%CbiI4TMB3xlVt KpUXO@geCx!B8$ub literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/helpdoc.png b/htdocs/theme/eldy/img/helpdoc.png new file mode 100644 index 0000000000000000000000000000000000000000..8cd950e7be1aabd9b452c150ddd128e6223f72e1 GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3-n?Kj!QJQtTz3zOL*yIm8(h1*R4sQwIuh z7I;J!Gca%qfiUBxyLEqnf-LEdzK#qG8~eHcB(gFvFbW3vgt#WhMCT+Y<)x(*q^A{T zq!(wTmtW@nYe1b)pXa_PHJtQ(%w3?qit$u`?Ri(ncbbUdwb^e_0F5nw|MI0)pKU8nKygW z;ssllEZVwc(Y9racPwAJW5u$aE0^tBxqSD^<$G4G*t2@&-Zd-tty#5i?dtvO)*Rlr z{>Y~FN4IP|wr$Jt?ORXo*mi2yj?=q$p5C+T%--GS5AHvI=)i@;2QM5sboJ!%tEWy} zKXdBl`LlN}UATMs(u3>Q9^Sn1=+@20w{JbUd;96VyHD@md-3Sui^q>%J$dr_>C+Fd zUw?Z4?(>KDUp{{L{_W$>@85s_{8_O+r3V;T(Ir8C!T)In80P%iu?J|)0Z$jl5RU7< z{l|rx92lIhx4M>XOnBe4_xrj8ap`RvdH?)xf6>tQY|@$CDvY~U8m*eeI3ujYSz1p6?#fDol7fyyMQn;~@~bO(*jkIbo15g5+^oDJ*!SLv-94?NHTAgq&26>YkF*?h z-hD;pQ=P-MV|}4EcJ*1?o$qh^rx$wU$|uW5X7%wRialj+Rg5pQ^%CbiI4TMB3xlVt KpUXO@geCx!B8$ub literal 0 HcmV?d00001