diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 86d38682841..eaa78947784 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -135,6 +135,7 @@ class MenuLeft { if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails")); + if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup")); diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 01e63dc35dc..8cf82ebe0c6 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -718,13 +718,14 @@ function img_object($alt, $object) /** \brief Affiche picto (fonction générique) \param alt Texte sur le alt de l'image - \param picto Nom de l'image a afficher + \param picto Nom de l'image a afficher (Si pas d'extension, on met '.png') \return string Retourne tag img */ function img_picto($alt, $picto, $options='') { - global $conf,$langs; - return ''.$alt.''; + global $conf; + if (! eregi('(\.png|\.gif)$',$picto)) $picto.='.png'; + return ''.$alt.''; } /** @@ -1075,18 +1076,6 @@ function img_allow($allow) } } -/** - \brief Affiche image gif (fonction générique) - \param alt Texte sur le alt de l'image - \param picto Nom de l'image a afficher - \return string Retourne tag img -*/ -function img_gif($alt, $picto, $options='') -{ - global $conf,$langs; - return ''.$alt.''; -} - /** \brief Affiche info admin @@ -2718,7 +2707,7 @@ function num_lines($texte) function ajax_updater_indicator($htmlname,$indicator='working') { - $script.=''; + $script.=''; return $script; } @@ -2774,7 +2763,7 @@ function ajax_updater($htmlname,$keysearch,$url,$option='',$indicator='working') */ function ajax_autocompleter($selected='',$htmlname,$url,$indicator='working') { - $script.= ''; + $script.= ''; $script.= ''; $script.= ''; $script.= '
';