From 9694d926e63f57c7e62a99c2a801231ebe1c7f95 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 4 May 2009 19:02:32 +0000 Subject: [PATCH] Qual: Factorize code. Removed useless code. --- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/admin/commande.php | 4 +-- htdocs/admin/company.php | 2 +- htdocs/admin/dons.php | 2 +- htdocs/admin/expedition.php | 2 +- htdocs/admin/facture.php | 4 +-- htdocs/admin/fichinter.php | 4 +-- htdocs/admin/fournisseur.php | 4 +-- htdocs/admin/ihm.php | 4 +-- htdocs/admin/limits.php | 8 ++--- htdocs/admin/livraison.php | 4 +-- htdocs/admin/menus.php | 8 ++--- htdocs/admin/propale.php | 4 +-- htdocs/admin/security.php | 2 +- htdocs/admin/security_other.php | 4 +-- htdocs/admin/societe.php | 2 +- htdocs/admin/syslog.php | 2 +- htdocs/admin/system/database.php | 2 +- htdocs/admin/system/dolibarr.php | 2 +- htdocs/admin/triggers.php | 2 +- htdocs/comm/fiche.php | 2 +- htdocs/comm/prospect/fiche.php | 2 +- htdocs/compta/facture.php | 30 ++++++++--------- htdocs/compta/fiche.php | 2 +- htdocs/ecm/index.php | 8 ++--- htdocs/fourn/fiche.php | 2 +- htdocs/html.form.class.php | 33 +++++++------------ htdocs/html.formmail.class.php | 8 ++--- .../modules/commande/mod_commande_saphir.php | 2 +- .../facture/mercure/mercure.modules.php | 4 +-- .../includes/modules/fichinter/mod_arctic.php | 2 +- .../livraison/mod_livraison_saphir.php | 2 +- .../modules/propale/mod_propale_saphir.php | 2 +- .../societe/mod_codeclient_elephant.php | 4 +-- .../mod_commande_fournisseur_orchidee.php | 2 +- htdocs/product/price.php | 8 ++--- htdocs/soc.php | 16 ++++----- htdocs/societe.php | 8 ++--- htdocs/user/clicktodial.php | 4 +-- htdocs/user/fiche.php | 8 ++--- 40 files changed, 103 insertions(+), 114 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index f1b334574b7..64cd3ba0788 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -478,7 +478,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer) $s2=$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.'
'; $s2.=$langs->trans("MailRecipient").': '.$adh->email.''; //$s2.='
'.$langs->trans("Content").': '.nl2br($conf->global->ADHERENT_MAIL_COTIS); - print $html->textwithhelp($s1,$s2,1); + print $html->textwithpicto($s1,$s2,1); } print ''; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index be92b4aeb37..ce87464e740 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -269,7 +269,7 @@ if ($handle) } print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; @@ -392,7 +392,7 @@ while (($file = readdir($handle))!==false) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'order').''; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 8de21f6b6de..a614d3a8c25 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -680,7 +680,7 @@ else if ($conf->use_javascript_ajax) { $s.=''.$langs->trans("VATIntraCheck").''; - print $form->textwithhelp($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); + print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); } else { diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index 8c558525619..185d98e679d 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -244,7 +244,7 @@ while (($file = readdir($handle))!==false) $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'generic').''; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 4c3892a6e79..07d9d1ffb90 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -361,7 +361,7 @@ if(is_dir($dir)) $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'sending').''; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index a3688e6b0ba..69e47850a2c 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -325,7 +325,7 @@ while (($file = readdir($handle))!==false) } print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print "\n"; @@ -448,7 +448,7 @@ while (($file = readdir($handle))!==false) print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'bill').''; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index d8cf86159a0..36599421595 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -241,7 +241,7 @@ if ($handle) $htmltooltip.=''.$langs->trans("NextValue").': '.$nextval; } print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; @@ -359,7 +359,7 @@ while (($file = readdir($handle))!==false) $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'intervention').''; diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 10e4eee0f96..481700cb4cf 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -252,7 +252,7 @@ if ($handle) } print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; @@ -372,7 +372,7 @@ while (($file = readdir($handle))!==false) $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'order').''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index e41ba8a04cd..7eec85959e8 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -159,7 +159,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') print $html->selectyesno('main_confirm_ajax',isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0,1); print ' ('.$langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled").')'; print ''; - print ''.$html->textwithhelp('',$langs->trans("FeatureDevelopment")).''; + print ''.$html->textwithpicto('',$langs->trans("FeatureDevelopment")).''; print ''; } @@ -300,7 +300,7 @@ else print ''.$langs->trans("ConfirmAjax").''; if ($conf->global->MAIN_DISABLE_JAVASCRIPT) print $langs->trans("No").' ('.$langs->trans("JavascriptDisabled").')'; else print yn(isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0).""; - print ''.$html->textwithhelp('',$langs->trans("FeatureDevelopment")).''; + print ''.$html->textwithpicto('',$langs->trans("FeatureDevelopment")).''; print ""; } diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 61ec30c808f..bec24430847 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -81,12 +81,12 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') $var=!$var; print ''; - print $html->textwithhelp($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly")); + print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''; $var=!$var; print ''; - print $html->textwithhelp($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); + print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''; $var=!$var; @@ -117,12 +117,12 @@ else $var=!$var; print ''; - print $html->textwithhelp($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly")); + print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''.$conf->global->MAIN_MAX_DECIMALS_UNIT.''; $var=!$var; print ''; - print $html->textwithhelp($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); + print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''.$conf->global->MAIN_MAX_DECIMALS_TOT.''; $var=!$var; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 32ac1f6fa2d..a327c43c55a 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -266,7 +266,7 @@ if ($handle) } print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; @@ -386,7 +386,7 @@ if(is_dir($dir)) $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); print ''; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'sending').''; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 193c463068c..71c02abf4f1 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -123,10 +123,10 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') print ''; print ''; print ''; print ''; print ''; @@ -168,10 +168,10 @@ else print '
'.$langs->trans("Menu").''; - print $html->textwithhelp($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); + print $html->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); print ''; - print $html->textwithhelp($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); + print $html->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); print '
'; print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index 4b1b1532219..dd0b2e506dc 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -272,7 +272,7 @@ if ($handle) } print ''; print "\n"; @@ -396,7 +396,7 @@ while (($file = readdir($handle))!==false) print ''; print '"; print ''; print ''; print ''; print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index c499c191c89..cfb409a1380 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -126,7 +126,7 @@ print "'; $htmltext = $langs->trans("SyslogFilenameDesc",$conf->syslog->dir_output); -print "'; print "
'.$langs->trans("Menu").''; - print $html->textwithhelp($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); + print $html->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); print ''; - print $html->textwithhelp($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); + print $html->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); print '
'; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print '
'; - print $html->textwithhelp('',$htmltooltip,1,0); + print $html->textwithpicto('',$htmltooltip,1,0); print ''; print ''.img_object($langs->trans("Preview"),'propal').''; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 0ebcd584314..ed9b99793a9 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -358,7 +358,7 @@ $var=!$var; print "
'; $text = $langs->trans("ProtectAndEncryptPdfFiles"); -$desc = $html->textwithhelp($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1); +$desc = $html->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1); print $desc; print ''; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 7a2f49b6b29..e33de19220a 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -138,7 +138,7 @@ $var=!$var; print '
'; print '
'.$langs->trans("UMask").''; -print $form->textwithhelp('',$langs->trans("UMaskExplanation")); +print $form->textwithpicto('',$langs->trans("UMaskExplanation")); print ''; print ''; @@ -153,7 +153,7 @@ if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIME print ''; print '
'.$langs->trans("SessionTimeOut").''; -print $form->textwithhelp('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); +print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); print ''; print ' '.$langs->trans("seconds"); diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index 07bac4d97d8..59f989ab88b 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -155,7 +155,7 @@ if ($handle) print ''; $s=$modCodeTiers->getToolTip($langs,$soc,-1); - print $form->textwithhelp('',$s,1); + print $form->textwithpicto('',$s,1); print '
'.$langs->trans("SyslogFilename").': '; print '".$html->textwithhelp('',$htmltext); +print "".$html->textwithpicto('',$htmltext); print '
\n"; diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index b86bfdba126..132a0374dc4 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -127,7 +127,7 @@ else $show=1; } if ($show==0) print $row[1]; - if ($show==1) print $html->textwithhelp($row[1],$text); + if ($show==1) print $html->textwithpicto($row[1],$text); if ($show==2) print $html->textwithpicto($row[1],$text,1,'warning'); print ''; print "\n"; diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index a4ceb746e82..5c5d1801b60 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -67,7 +67,7 @@ print "".$langs->trans("SessionId").'".$langs->trans("CurrentSessionTimeOut").''.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds"); print ''; -print $form->textwithhelp('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); +print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); print "\n"; $var=!$var; print "".$langs->trans("CurrentTheme").''.$conf->theme."\n"; diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index 06a11724e25..0206fd42e70 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -230,7 +230,7 @@ foreach ($orders as $key => $value) if ($disabledbymodule == 1) $text.=$langs->trans("TriggerActiveAsModuleActive",$module).'
'; if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'
'; } - print $html->textwithhelp('',$text); + print $html->textwithpicto('',$text); print "\n"; print "\n"; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index d26849d8959..4fbbf23aad4 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -184,7 +184,7 @@ if ($socid > 0) // Country print ''.$langs->trans("Country").''; - if ($objsoc->isInEEC()) print $form->textwithhelp($objsoc->pays,$langs->trans("CountryIsInEEC"),1,0); + if ($objsoc->isInEEC()) print $form->textwithpicto($objsoc->pays,$langs->trans("CountryIsInEEC"),1,0); else print $objsoc->pays; print ''; diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index cecf2711f02..261e5325f2e 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -106,7 +106,7 @@ if ($socid > 0) // Country print ''.$langs->trans("Country").''; - if ($societe->isInEEC()) print $form->textwithhelp($societe->pays,$langs->trans("CountryIsInEEC"),1,0); + if ($societe->isInEEC()) print $form->textwithpicto($societe->pays,$langs->trans("CountryIsInEEC"),1,0); else print $societe->pays; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 5622b5dc3f1..c06d69e1e6b 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1530,7 +1530,7 @@ if ($_GET['action'] == 'create') print ''; print ''; print ''; - $desc=$html->textwithhelp($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); + $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); print $desc; print ''."\n"; @@ -1538,7 +1538,7 @@ if ($_GET['action'] == 'create') print ''; print ''; print ''; - $desc=$html->textwithhelp($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); + $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); print $desc; print ''."\n"; @@ -1548,7 +1548,7 @@ if ($_GET['action'] == 'create') print ''; print ''; print ''; - $desc=$html->textwithhelp($langs->trans("InvoiceProformat"),$langs->transnoentities("InvoiceProformatDesc"),1); + $desc=$html->textwithpicto($langs->trans("InvoiceProformat"),$langs->transnoentities("InvoiceProformatDesc"),1); print $desc; print ''."\n"; } @@ -1573,7 +1573,7 @@ if ($_GET['action'] == 'create') $text.=''; } $text.=''; - $desc=$html->textwithhelp($text,$langs->transnoentities("InvoiceReplacementDesc"),1); + $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1); print $desc; print ''."\n"; @@ -1598,7 +1598,7 @@ if ($_GET['action'] == 'create') $text.=''; } $text.=''; - $desc=$html->textwithhelp($text,$langs->transnoentities("InvoiceAvoirDesc"),1); + $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1); //.' ('.$langs->trans("FeatureNotYetAvailable").')',$langs->transnoentities("InvoiceAvoirDesc"),1); print $desc; print ''."\n"; @@ -2068,8 +2068,8 @@ else $close[$i]['label']=$langs->trans("ConfirmClassifyPayedPartiallyReasonBadCustomerDesc");$i++; // Texte $i=0; - $close[$i]['reason']=$html->textwithhelp($langs->transnoentities("ConfirmClassifyPayedPartiallyReasonDiscountVat",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++; - $close[$i]['reason']=$html->textwithhelp($langs->transnoentities("ConfirmClassifyPayedPartiallyReasonBadCustomer",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++; + $close[$i]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyPayedPartiallyReasonDiscountVat",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++; + $close[$i]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyPayedPartiallyReasonBadCustomer",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++; // arrayreasons[code]=reason foreach($close as $key => $val) { @@ -2111,8 +2111,8 @@ else $close[1]['label']=$langs->trans("ConfirmClassifyPayedPartiallyReasonBadCustomerDesc"); $close[2]['label']=$langs->trans("ConfirmClassifyAbandonReasonOtherDesc"); // Texte - $close[1]['reason']=$html->textwithhelp($langs->transnoentities("ConfirmClassifyPayedPartiallyReasonBadCustomer",$fac->ref),$close[1]['label'],1); - $close[2]['reason']=$html->textwithhelp($langs->transnoentities("ConfirmClassifyAbandonReasonOther"),$close[2]['label'],1); + $close[1]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyPayedPartiallyReasonBadCustomer",$fac->ref),$close[1]['label'],1); + $close[2]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyAbandonReasonOther"),$close[2]['label'],1); // arrayreasons $arrayreasons[$close[1]['code']]=$close[1]['reason']; $arrayreasons[$close[2]['code']]=$close[2]['reason']; @@ -2263,7 +2263,7 @@ else else { $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); - print $html->textwithhelp($text,$langs->trans("AbsoluteDiscountUse")); + print $html->textwithpicto($text,$langs->trans("AbsoluteDiscountUse")); } } else @@ -2282,7 +2282,7 @@ else if ($fac->statut == 0 && $fac->type != 3) { $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)); - print $html->textwithhelp($text,$langs->trans("CreditNoteDepositUse")); + print $html->textwithpicto($text,$langs->trans("CreditNoteDepositUse")); } else print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'.'; } @@ -2498,7 +2498,7 @@ else if (($fac->statut == 2 || $fac->statut == 3) && $fac->close_code == 'discount_vat') { print ''; - print $html->textwithhelp($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1); + print $html->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1); print ''.price($fac->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; $resteapayeraffiche=0; } @@ -2506,7 +2506,7 @@ else if (($fac->statut == 2 || $fac->statut == 3) && $fac->close_code == 'badcustomer') { print ''; - print $html->textwithhelp($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1); + print $html->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1); print ''.price($fac->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; //$resteapayeraffiche=0; } @@ -2514,7 +2514,7 @@ else if (($fac->statut == 2 || $fac->statut == 3) && $fac->close_code == 'product_returned') { print ''; - print $html->textwithhelp($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1); + print $html->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1); print ''.price($fac->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; $resteapayeraffiche=0; } @@ -2524,7 +2524,7 @@ else print ''; $text=$langs->trans("HelpAbandonOther"); if ($fac->close_note) $text.='

'.$langs->trans("Reason").':'.$fac->close_note; - print $html->textwithhelp($langs->trans("Abandoned").':',$text,-1); + print $html->textwithpicto($langs->trans("Abandoned").':',$text,-1); print ''.price($fac->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; $resteapayeraffiche=0; } diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index c11027955c0..f9f2c82bb64 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -136,7 +136,7 @@ if ($socid > 0) // Country print ''.$langs->trans('Country').''; - if ($societe->isInEEC()) print $form->textwithhelp($societe->pays,$langs->trans("CountryIsInEEC"),1,0); + if ($societe->isInEEC()) print $form->textwithpicto($societe->pays,$langs->trans("CountryIsInEEC"),1,0); else print $societe->pays; print ''; diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index ef65c732023..f005b61522f 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -278,7 +278,7 @@ if (empty($action) || $action == 'file_manager' || eregi('refresh',$action) || $ print ' '; print ''; $htmltooltip=$langs->trans("ECMAreaDesc2"); - print $form->textwithhelp('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; //print ''.$langs->trans("ECMNbOfDocsSmall").' '.img_picto($langs->trans("Refresh"),'refresh').''; print ''; @@ -342,7 +342,7 @@ if (empty($action) || $action == 'file_manager' || eregi('refresh',$action) || $ $htmltooltip=''.$langs->trans("Type").': '.$langs->trans("ECMSectionAuto").'
'; $htmltooltip.=''.$langs->trans("ECMCreationUser").': '.$langs->trans("ECMTypeAuto").'
'; $htmltooltip.=''.$langs->trans("Description").': '.$val['desc']; - print $form->textwithhelp('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print "\n"; @@ -383,7 +383,7 @@ if (empty($action) || $action == 'file_manager' || eregi('refresh',$action) || $ print ' '; print ''; $htmltooltip=$langs->trans("ECMAreaDesc2"); - print $form->textwithhelp('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''; @@ -544,7 +544,7 @@ if (empty($action) || $action == 'file_manager' || eregi('refresh',$action) || $ $htmltooltip.=''.$langs->trans("ECMNbOfFilesInDir").': '.$val['cachenbofdoc'].'
'; if ($nbofsubdir) $htmltooltip.=''.$langs->trans("ECMNbOfFilesInSubDir").': '.$nboffilesinsubdir; else $htmltooltip.=''.$langs->trans("ECMNbOfSubDir").': '.$nbofsubdir.'
'; - print $form->textwithhelp('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ""; print "\n"; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 28e26979565..94de948446b 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -88,7 +88,7 @@ if ( $societe->fetch($socid) ) // Country print ''.$langs->trans("Country").''; - if ($societe->isInEEC()) print $form->textwithhelp($societe->pays,$langs->trans("CountryIsInEEC"),1,0); + if ($societe->isInEEC()) print $form->textwithpicto($societe->pays,$langs->trans("CountryIsInEEC"),1,0); else print $societe->pays; print ''; diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 8584d8d8fd3..fe05e7147e4 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Eric Seigne @@ -51,8 +51,8 @@ class Form /** - \brief Constructeur - \param DB handler d'accès base de donnée + * \brief Constructor + * \param DB Database handler */ function Form($DB) { @@ -149,32 +149,21 @@ class Form * \param text Text to show * \param htmltooltip Content of tooltip * \param direction 1=Icon is after text, -1=Icon is before text - * \param usehelpcursor 1=Use a help cursor, 0=Use default cursor - * \return string HTML code of text, picto, tooltip - */ - function textwithhelp($text,$htmltext,$direction=1,$usehelpcursor=1) - { - global $conf; - $alt=''; - if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)'; - return $this->textwithtooltip($text,$htmltext,2,$direction,img_help($usehelpcursor,$alt)); - } - - /** - * \brief Show a text with a picto and a tooltip on picto - * \param text Text to show - * \param htmltooltip Content of tooltip - * \param direction 1=Icon is after text, -1=Icon is before text + * \param type Type of picto (info, help, warning, superadmin...) * \return string HTML code of text, picto, tooltip */ function textwithpicto($text,$htmltext,$direction=1,$type='help') { global $conf; + + if ("$type" == "0") $type='info'; // For backward compatibility + $alt=''; if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)'; - $img=img_help(1,$alt); - if ($type == 'warning') $img=img_warning($alt); - if ($type == 'superadmin') $img=img_redstar($alt); + if ($type == 'info') $img=img_help(0,$alt); + if ($type == 'help' || $type ==1) $img=img_help(1,$alt); + if ($type == 'warning') $img=img_warning($alt); + if ($type == 'superadmin') $img=img_redstar($alt); return $this->textwithtooltip($text,$htmltext,2,$direction,$img); } diff --git a/htdocs/html.formmail.class.php b/htdocs/html.formmail.class.php index 7c2f1396e1e..eab47db8d84 100644 --- a/htdocs/html.formmail.class.php +++ b/htdocs/html.formmail.class.php @@ -192,7 +192,7 @@ class FormMail { $help.=$key.' -> '.$langs->trans($val).'
'; } - print $form->textwithhelp($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help); + print $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help); print "\n"; } @@ -276,7 +276,7 @@ class FormMail if ($this->withto || is_array($this->withto)) { print ''; - print $form->textwithhelp($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); + print $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); print ''; if ($this->withtoreadonly) { @@ -298,7 +298,7 @@ class FormMail if ($this->withtocc || is_array($this->withtocc)) { print ''; - print $form->textwithhelp($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); + print $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); print ''; if ($this->withtoccreadonly) { @@ -320,7 +320,7 @@ class FormMail if ($this->withtoccc || is_array($this->withtoccc)) { print ''; - print $form->textwithhelp($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); + print $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); print ''; if ($this->withtocccreadonly) { diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/includes/modules/commande/mod_commande_saphir.php index 4ce573f98b8..90ad538d2ec 100644 --- a/htdocs/includes/modules/commande/mod_commande_saphir.php +++ b/htdocs/includes/modules/commande/mod_commande_saphir.php @@ -66,7 +66,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= '  '; diff --git a/htdocs/includes/modules/facture/mercure/mercure.modules.php b/htdocs/includes/modules/facture/mercure/mercure.modules.php index d3adb1e43bd..6d4c8edb0f0 100644 --- a/htdocs/includes/modules/facture/mercure/mercure.modules.php +++ b/htdocs/includes/modules/facture/mercure/mercure.modules.php @@ -66,7 +66,7 @@ class mod_facture_mercure extends ModeleNumRefFactures // Parametrage du prefix $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= '  '; @@ -74,7 +74,7 @@ class mod_facture_mercure extends ModeleNumRefFactures // Parametrage du prefix des avoirs $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= ''; $texte.= ''; diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php index a0dc5c63c5b..dfb8a4c6073 100644 --- a/htdocs/includes/modules/fichinter/mod_arctic.php +++ b/htdocs/includes/modules/fichinter/mod_arctic.php @@ -71,7 +71,7 @@ class mod_arctic extends ModeleNumRefFicheinter // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= '  '; diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/includes/modules/livraison/mod_livraison_saphir.php index 575e328dd8e..9bf9247e8b7 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/includes/modules/livraison/mod_livraison_saphir.php @@ -64,7 +64,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= '  '; diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/includes/modules/propale/mod_propale_saphir.php index 7035538be7c..5b4ddad22f2 100644 --- a/htdocs/includes/modules/propale/mod_propale_saphir.php +++ b/htdocs/includes/modules/propale/mod_propale_saphir.php @@ -66,7 +66,7 @@ class mod_propale_saphir extends ModeleNumRefPropales // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= '  '; diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php index 19e2615a392..bb784aeb029 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.php @@ -89,7 +89,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode // Parametrage du prefix customers $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= '  '; @@ -97,7 +97,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode // Parametrage du prefix suppliers $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= ''; $texte.= ''; diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php index 7ebe1ce4208..9b2db4cce99 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -66,7 +66,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithhelp('',$tooltip,1,1).''; + $texte.= ''.$form->textwithpicto('',$tooltip,1,1).''; $texte.= '  '; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index e4423039a12..ba004a567a6 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -260,7 +260,7 @@ if ($_GET["action"] == 'edit_price' && $user->rights->produit->creer) // Price print ''; $text=$langs->trans('SellingPrice'); - print $html->textwithhelp($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); + print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); print ''; if ($product->price_base_type == 'TTC') { @@ -274,7 +274,7 @@ if ($_GET["action"] == 'edit_price' && $user->rights->produit->creer) print '' ; $text=$langs->trans('MinPrice') ; - print $html->textwithhelp($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); + print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); if ($product->price_base_type == 'TTC') { print ''; @@ -305,7 +305,7 @@ if ($_GET["action"] == 'edit_price' && $user->rights->produit->creer) print ''; print '
'; $text=$langs->trans('SellingPrice').' '.$i; - print $html->textwithhelp($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); + print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); print ''; if ($product->multiprices_base_type["$i"] == 'TTC') { @@ -320,7 +320,7 @@ if ($_GET["action"] == 'edit_price' && $user->rights->produit->creer) print '
'; $text=$langs->trans('MinPrice').' '.$i; - print $html->textwithhelp($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); + print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); if ($product->multiprices_base_type["$i"] == 'TTC') { print ''; diff --git a/htdocs/soc.php b/htdocs/soc.php index 8aae6b0db36..5951b8162ad 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -412,7 +412,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; print ''; $s=$modCodeClient->getToolTip($langs,$soc,0); - print $form->textwithhelp('',$s,1); + print $form->textwithpicto('',$s,1); print '
'; print ''; @@ -429,7 +429,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; print ''; $s=$modCodeFournisseur->getToolTip($langs,$soc,1); - print $form->textwithhelp('',$s,1); + print $form->textwithpicto('',$s,1); print ''; print ''; @@ -581,7 +581,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') if ($conf->use_javascript_ajax) { $s.=''.$langs->trans("VATIntraCheck").''; - print $form->textwithhelp($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); + print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); } else { @@ -754,7 +754,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') } print ''; $s=$modCodeClient->getToolTip($langs,$soc,0); - print $form->textwithhelp('',$s,1); + print $form->textwithpicto('',$s,1); print ''; print ''; @@ -784,7 +784,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') } print ''; $s=$modCodeFournisseur->getToolTip($langs,$soc,1); - print $form->textwithhelp('',$s,1); + print $form->textwithpicto('',$s,1); print ''; print ''; @@ -902,7 +902,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') if ($conf->use_javascript_ajax) { $s.=''.$langs->trans("VATIntraCheck").''; - print $form->textwithhelp($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); + print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); } else { @@ -1009,7 +1009,7 @@ else // Country print ''.$langs->trans("Country").''; - if ($soc->isInEEC()) print $form->textwithhelp($soc->pays,$langs->trans("CountryIsInEEC"),1,0); + if ($soc->isInEEC()) print $form->textwithpicto($soc->pays,$langs->trans("CountryIsInEEC"),1,0); else print $soc->pays; print ''; @@ -1118,7 +1118,7 @@ else if ($conf->use_javascript_ajax) { $s.=''.$langs->trans("VATIntraCheck").''; - print $form->textwithhelp($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); + print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); } else { diff --git a/htdocs/societe.php b/htdocs/societe.php index 62f34ce7153..4d1a61d073b 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -244,10 +244,10 @@ if ($resql) print ''; print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom","",$params,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville","",$params,'',$sortfield,$sortorder); - print_liste_field_titre($form->textwithhelp($langs->trans("ProfId1Short"),$textprofid[1],1,0),"societe.php","s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithhelp($langs->trans("ProfId2Short"),$textprofid[2],1,0),"societe.php","s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithhelp($langs->trans("ProfId3Short"),$textprofid[3],1,0),"societe.php","s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithhelp($langs->trans("ProfId4Short"),$textprofid[4],1,0),"societe.php","s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),"societe.php","s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),"societe.php","s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),"societe.php","s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),"societe.php","s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder); print ' '; print "\n"; diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 9c1dab4ca1d..6bea01650f2 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -104,7 +104,7 @@ if ($_GET["id"]) { print "".'ClickToDial URL'; print ''; - print $form->textwithhelp($conf->global->CLICKTODIAL_URL,$langs->trans("ClickToDialUrlDesc")); + print $form->textwithpicto($conf->global->CLICKTODIAL_URL,$langs->trans("ClickToDialUrlDesc")); print ''; print ''; } @@ -140,7 +140,7 @@ if ($_GET["id"]) { print "".'ClickToDial URL'; print ''; - print $form->textwithhelp($conf->global->CLICKTODIAL_URL,$langs->trans("ClickToDialUrlDesc")); + print $form->textwithpicto($conf->global->CLICKTODIAL_URL,$langs->trans("ClickToDialUrlDesc")); print ''; print ''; } diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 5c43b6f5a34..3fa599c0608 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -595,7 +595,7 @@ if (($action == 'create') || ($action == 'adduserldap')) // Type print ''.$langs->trans("Type").''; print ''; - print $html->textwithhelp($langs->trans("Internal"),$langs->trans("InternalExternalDesc")); + print $html->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc")); print ''; // Tel @@ -908,7 +908,7 @@ else print ''; if ($fuser->societe_id) { - print $html->textwithhelp($langs->trans("External"),$langs->trans("InternalExternalDesc")); + print $html->textwithpicto($langs->trans("External"),$langs->trans("InternalExternalDesc")); } else if ($fuser->ldap_sid) { @@ -916,11 +916,11 @@ else } else if ($fuser->entity!=0) { - print $html->textwithhelp($langs->trans("Internal"),$langs->trans("InternalExternalDesc")); + print $html->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc")); } else { - print $html->textwithhelp($langs->trans("SuperAdministrator"),$langs->trans("SuperAdministratorDesc")); + print $html->textwithpicto($langs->trans("SuperAdministrator"),$langs->trans("SuperAdministratorDesc")); } print '';