Mutualisation code

This commit is contained in:
Laurent Destailleur 2007-06-16 10:07:20 +00:00
parent 5771bdefca
commit 09ca372bce
2 changed files with 7 additions and 17 deletions

View File

@ -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/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/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/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/dict.php", $langs->trans("DictionnarySetup"));
if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));

View File

@ -718,13 +718,14 @@ function img_object($alt, $object)
/** /**
\brief Affiche picto (fonction générique) \brief Affiche picto (fonction générique)
\param alt Texte sur le alt de l'image \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 \return string Retourne tag img
*/ */
function img_picto($alt, $picto, $options='') function img_picto($alt, $picto, $options='')
{ {
global $conf,$langs; global $conf;
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$picto.'.png" border="0" alt="'.$alt.'" title="'.$alt.'"'.($options?' '.$options:'').'>'; if (! eregi('(\.png|\.gif)$',$picto)) $picto.='.png';
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$picto.'" border="0" alt="'.$alt.'" title="'.$alt.'"'.($options?' '.$options:'').'>';
} }
/** /**
@ -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 '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$picto.'.gif" border="0" alt="'.$alt.'" title="'.$alt.'"'.($options?' '.$options:'').'>';
}
/** /**
\brief Affiche info admin \brief Affiche info admin
@ -2718,7 +2707,7 @@ function num_lines($texte)
function ajax_updater_indicator($htmlname,$indicator='working') function ajax_updater_indicator($htmlname,$indicator='working')
{ {
$script.='<span id="indicator'.$htmlname.'" style="display: none">'.img_gif('Working...',$indicator).'</span>'; $script.='<span id="indicator'.$htmlname.'" style="display: none">'.img_picto('Working...',$indicator.'.gif').'</span>';
return $script; return $script;
} }
@ -2774,7 +2763,7 @@ function ajax_updater($htmlname,$keysearch,$url,$option='',$indicator='working')
*/ */
function ajax_autocompleter($selected='',$htmlname,$url,$indicator='working') function ajax_autocompleter($selected='',$htmlname,$url,$indicator='working')
{ {
$script.= '<span id="indicator'.$htmlname.'" style="display: none">'.img_gif('Working...',$indicator).'</span>'; $script.= '<span id="indicator'.$htmlname.'" style="display: none">'.img_picto('Working...',$indicator.'.gif').'</span>';
$script.= '<input type="hidden" name="'.$htmlname.'_id" id="'.$htmlname.'_id" value="'.$selected.'" />'; $script.= '<input type="hidden" name="'.$htmlname.'_id" id="'.$htmlname.'_id" value="'.$selected.'" />';
$script.= '</div>'; $script.= '</div>';
$script.= '<div id="result'.$htmlname.'" class="autocomplete"></div>'; $script.= '<div id="result'.$htmlname.'" class="autocomplete"></div>';