From 4fc3158962b0686fe8ee46b042ee9eb9306f974a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 Feb 2020 20:20:02 +0100 Subject: [PATCH] Clean code --- htdocs/modulebuilder/template/img/mymodule.png | Bin 683 -> 0 bytes .../template/img/object_mymodule_over.png | Bin 0 -> 323 bytes htdocs/takepos/css/pos.css.php | 1 + htdocs/theme/eldy/dropdown.inc.php | 12 +++++------- htdocs/theme/eldy/global.inc.php | 13 ++++--------- htdocs/theme/md/style.css.php | 11 +++-------- 6 files changed, 13 insertions(+), 24 deletions(-) delete mode 100644 htdocs/modulebuilder/template/img/mymodule.png create mode 100644 htdocs/modulebuilder/template/img/object_mymodule_over.png diff --git a/htdocs/modulebuilder/template/img/mymodule.png b/htdocs/modulebuilder/template/img/mymodule.png deleted file mode 100644 index 2681ccc1d3a7d33593e8502daa447b8c816ddb08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 683 zcmV;c0#yBpP)&bpol<(u!rW?;H+EQ%enXNbFO(BxM6em zT6?Xvzwg`ooU^Y){|U(ZFQBI!m!$&}L7j!5{;fYTRT7^Ei2`otSo}~$jn`>$_0GV8{|=a0ceV}S zT##S2)dC>kW)OEac4ad=0PF{D)D5n&1&hE|5*Fn>+!87O7%&6uq>(Lac(63vU3r8dAUkz5(vJ*$kYi!M+3>2Chh&smne_ z0k^l4oC%S=;mTvomp7S=zUfMq-Pa*-4U* z(fYvM9@LwZ^Z;0LC%nYcD^%FWV(tM!t@kx*iR5*SB+L^EYlZ(WSOrixfZrRuvN}?F RO?LnQ002ovPDHLkV1iP-B{u*7 diff --git a/htdocs/modulebuilder/template/img/object_mymodule_over.png b/htdocs/modulebuilder/template/img/object_mymodule_over.png new file mode 100644 index 0000000000000000000000000000000000000000..72d9d7fe28e5dd6ca08b65caac403e2b30ad0ff3 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xawj^(N7l!{JxM1({$v_d#0*}aI zppNSx%;=;sy8s$p+#`y=WTBlYDNUwGFxOY&gb#AOw{Gmf?3pzT&7WF1fbTL0GEAvUcMMN@!ug$hB zt!#D22F|jaj=f**CCT4^@o4+9@($%Q7X$@&9uqX|@5np&G|T;nj?z1$a8bGAKaOzr zeGK>6?YWJwAnJKxgYz8G81DFrXwh@l>k2!y3dLXOb1!$1?|<file->dol_document_root as $dirroot) { - if (file_exists($dirroot."/".$val."/img/".$val."_over.png")) - { - $url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1); - $found = 1; - break; - } - elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité + if (file_exists($dirroot."/".$val."/img/".$val.".png")) { $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $found = 1; @@ -2000,10 +1994,11 @@ a.tmenuimage:hover{ if (!$found) { if (!defined('DISABLE_FONT_AWSOME')) { - print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; + print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n"; + print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n"; print 'div.mainmenu.'.$val.'::before { content: "\f249"; - }'; + }'."\n"; } else { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 597ffb1d9f7..1305bdc6418 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2051,13 +2051,7 @@ div.mainmenu.website { $found = 0; $url = ''; foreach ($conf->file->dol_document_root as $dirroot) { - if (file_exists($dirroot."/".$val."/img/".$val."_over.png")) - { - $url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1); - $found = 1; - break; - } - elseif (file_exists($dirroot."/".$val."/img/".$val.".png")) // Retro compatibilité + if (file_exists($dirroot."/".$val."/img/".$val.".png")) { $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $found = 1; @@ -2075,7 +2069,8 @@ div.mainmenu.website { } else { - print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; + print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n"; + print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n"; $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1); print "div.mainmenu.".$val." {\n"; print " background-image: url(".$url.");\n";