diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 1ff84f9ed29de4a50fd64ed8af7d8910a5c0f08f..dbc56bc6394c7456aa9c19abc1371d9cdcbd59ce 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -692,7 +692,7 @@ if ($action == 'edit')
// Physique-Moral
$morphys["phy"] = $langs->trans("Physical");
$morphys["mor"] = $langs->trans("Morale");
- print "<tr><td>".$langs->trans("Person").'*</td><td colspan="2">';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Person").'</span></td><td colspan="2">';
$html->select_array("morphy", $morphys, $adh->morphy);
print "</td></tr>";
@@ -700,7 +700,7 @@ if ($action == 'edit')
print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2"><input type="text" name="societe" size="40" value="'.$adh->societe.'"></td></tr>';
// Nom
- print '<tr><td>'.$langs->trans("Lastname").'*</td><td><input type="text" name="nom" size="40" value="'.$adh->nom.'"></td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td><td><input type="text" name="nom" size="40" value="'.$adh->nom.'"></td>';
// Photo
print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
@@ -716,17 +716,17 @@ if ($action == 'edit')
print '</tr>';
// Prenom
- print '<tr><td width="20%">'.$langs->trans("Firstname").'*</td><td width="35%"><input type="text" name="prenom" size="40" value="'.$adh->prenom.'"></td>';
+ print '<tr><td width="20%"><span class="fieldrequired">'.$langs->trans("Firstname").'</span></td><td width="35%"><input type="text" name="prenom" size="40" value="'.$adh->prenom.'"></td>';
print '</tr>';
// Login
- print '<tr><td>'.$langs->trans("Login").'*</td><td><input type="text" name="login" size="30" value="'.$adh->login.'"></td></tr>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td><td><input type="text" name="login" size="30" value="'.$adh->login.'"></td></tr>';
// Password
- print '<tr><td>'.$langs->trans("Password").'*</td><td><input type="password" name="pass" size="30" value="'.$adh->pass.'"></td></tr>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td><input type="password" name="pass" size="30" value="'.$adh->pass.'"></td></tr>';
// Type
- print '<tr><td>'.$langs->trans("Type").'*</td><td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Type").'</span></td><td>';
if ($user->rights->adherent->creer)
{
$html->select_array("typeid", $adht->liste_array(), $adh->typeid);
@@ -760,7 +760,7 @@ if ($action == 'edit')
print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.$adh->phone_mobile.'"></td></tr>';
// EMail
- print '<tr><td>'.$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="email" size="40" value="'.$adh->email.'"></td></tr>';
+ print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.$adh->email.'"></td></tr>';
// Date naissance
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
@@ -844,7 +844,7 @@ if ($action == 'create')
// Moral-Physique
$morphys["phy"] = "Physique";
$morphys["mor"] = "Morale";
- print "<tr><td>".$langs->trans("Person")."*</td><td>\n";
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Person")."</span></td><td>\n";
$html->select_array("morphy", $morphys, $adh->morphy, 1);
print "</td>\n";
@@ -852,15 +852,15 @@ if ($action == 'create')
print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$adh->societe.'"></td></tr>';
// Nom
- print '<tr><td>'.$langs->trans("Lastname").'*</td><td><input type="text" name="nom" value="'.$adh->nom.'" size="40"></td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td><td><input type="text" name="nom" value="'.$adh->nom.'" size="40"></td>';
print '</tr>';
// Prenom
- print '<tr><td>'.$langs->trans("Firstname").'*</td><td><input type="text" name="prenom" size="40" value="'.$adh->prenom.'"></td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Firstname").'</span></td><td><input type="text" name="prenom" size="40" value="'.$adh->prenom.'"></td>';
print '</tr>';
// Login
- print '<tr><td>'.$langs->trans("Login").'*</td><td><input type="text" name="member_login" size="40" value="'.$adh->login.'"></td></tr>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").'</span></td><td><input type="text" name="member_login" size="40" value="'.$adh->login.'"></td></tr>';
// Mot de passe
$generated_password='';
@@ -873,12 +873,12 @@ if ($action == 'create')
$genhandler=new $nomclass($db,$conf,$langs,$user);
$generated_password=$genhandler->getNewGeneratedPassword();
}
- print '<tr><td>'.$langs->trans("Password").'*</td><td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
print '</td></tr>';
// Type
- print '<tr><td>'.$langs->trans("MemberType").'*</td><td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("MemberType").'</span></td><td>';
$listetype=$adht->liste_array();
if (sizeof($listetype))
{
@@ -888,7 +888,7 @@ if ($action == 'create')
}
print "</td>\n";
- // Adresse
+ // Address
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td>';
print '<textarea name="adresse" wrap="soft" cols="40" rows="2">'.$adh->adresse.'</textarea></td></tr>';
@@ -910,7 +910,7 @@ if ($action == 'create')
print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.$adh->phone_mobile.'"></td></tr>';
// EMail
- print '<tr><td>'.$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'*':'').'</td><td><input type="text" name="member_email" size="40" value="'.$adh->email.'"></td></tr>';
+ print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.$adh->email.'"></td></tr>';
// Date naissance
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index d2dfa7338c3e77cd22eed5ca0ab5f0fb0ce69c00..03be6951ccc94189806847cd644ab1fcc99f6c99 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -112,7 +112,7 @@ print "</tr>\n";
// DN Pour les contacts
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPContactDn").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactDn").'</span></td><td>';
print '<input size="48" type="text" name="contactdn" value="'.$conf->global->LDAP_CONTACT_DN.'">';
print '</td><td>'.$langs->trans("LDAPContactDnExample").'</td>';
print '<td> </td>';
@@ -120,7 +120,7 @@ print '</tr>';
// List of object class used to define attributes in structure
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPContactObjectClassList").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPContactObjectClassList").'</span></td><td>';
print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_CONTACT_OBJECT_CLASS.'">';
print '</td><td>'.$langs->trans("LDAPContactObjectClassListExample").'</td>';
print '<td> </td>';
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 6415b4495648ce4210f7baa174116fbf99c83340..d3ef9c12a4f48ac07a725e70e4bdc73c5fecfbbf 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -104,7 +104,7 @@ print "</tr>\n";
// DN pour les groupes
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPGroupDn").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupDn").'</span></td><td>';
print '<input size="48" type="text" name="group" value="'.$conf->global->LDAP_GROUP_DN.'">';
print '</td><td>'.$langs->trans("LDAPGroupDnExample").'</td>';
print '<td> </td>';
@@ -112,7 +112,7 @@ print '</tr>';
// List of object class used to define attributes in structure
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPGroupObjectClassList").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPGroupObjectClassList").'</span></td><td>';
print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_GROUP_OBJECT_CLASS.'">';
print '</td><td>'.$langs->trans("LDAPGroupObjectClassListExample").'</td>';
print '<td> </td>';
@@ -132,7 +132,7 @@ print "</tr>\n";
// Filtre
/*
$var=!$var;
-print '<tr '.$bc[$var].'><td><b>'.$langs->trans("LDAPFilterConnection").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td><span class="fieldrequired">'.$langs->trans("LDAPFilterConnection").'</span></td><td>';
print '<input size="38" type="text" name="filterconnection" value="'.$conf->global->LDAP_FILTER_CONNECTION.'">';
print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
print '</tr>';
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 6f41480e58311947be6872ec6a0e1d67cda6545c..32e42609a301b7ffaafc2a8788e9052124fdb5a2 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -127,7 +127,7 @@ print "</tr>\n";
// DN Pour les adherents
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPMemberDn").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberDn").'</span></td><td>';
print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_MEMBER_DN.'">';
print '</td><td>'.$langs->trans("LDAPMemberDnExample").'</td>';
print '<td> </td>';
@@ -135,7 +135,7 @@ print '</tr>';
// List of object class used to define attributes in structure
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPMemberObjectClassList").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPMemberObjectClassList").'</span></td><td>';
print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_MEMBER_OBJECT_CLASS.'">';
print '</td><td>'.$langs->trans("LDAPMemberObjectClassListExample").'</td>';
print '<td> </td>';
@@ -155,7 +155,7 @@ print "</tr>\n";
// Filtre
/*
$var=!$var;
-print '<tr '.$bc[$var].'><td><b>'.$langs->trans("LDAPFilterConnection").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td><span class="fieldrequired">'.$langs->trans("LDAPFilterConnection").'</span></td><td>';
print '<input size="38" type="text" name="filterconnection" value="'.$conf->global->LDAP_FILTER_CONNECTION.'">';
print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
print '</tr>';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 59c37b0b361c36ffa0bcb3de165435b09b9fca40..39cdfcb1187ed8559f9018b9c6736bcd941bdaf4 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -115,7 +115,7 @@ print "</tr>\n";
// DN Pour les utilisateurs
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPUserDn").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_USER_DN.'">';
print '</td><td>'.$langs->trans("LDAPUserDnExample").'</td>';
print '<td> </td>';
@@ -123,7 +123,7 @@ print '</tr>';
// List of object class used to define attributes in structure
$var=!$var;
-print '<tr '.$bc[$var].'><td width="25%"><b>'.$langs->trans("LDAPUserObjectClassList").picto_required().'</b></td><td>';
+print '<tr '.$bc[$var].'><td width="25%"><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_USER_OBJECT_CLASS.'">';
print '</td><td>'.$langs->trans("LDAPUserObjectClassListExample").'</td>';
print '<td> </td>';
diff --git a/htdocs/admin/paybox.php b/htdocs/admin/paybox.php
index f89c85f1146d88a5c4eeb6a4ff1ae92311c7bf4e..0ca81c631a64f705b4331bd60c2bccdc2724b70e 100644
--- a/htdocs/admin/paybox.php
+++ b/htdocs/admin/paybox.php
@@ -125,28 +125,28 @@ print '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_CGI_URL_V2").'*</td><td>';
+print '<span class="fieldrequired">'.$langs->trans("PAYBOX_CGI_URL_V2").'</span></td><td>';
print '<input size="64" type="text" name="PAYBOX_CGI_URL_V2" value="'.$conf->global->PAYBOX_CGI_URL_V2.'">';
print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi';
print '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_PBX_SITE").'*</td><td>';
+print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_SITE").'</span></td><td>';
print '<input size="32" type="text" name="PAYBOX_IBS_SITE" value="'.$conf->global->PAYBOX_IBS_SITE.'">';
print '<br>'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')';
print '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_PBX_RANG").'*</td><td>';
+print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_RANG").'</span></td><td>';
print '<input size="32" type="text" name="PAYBOX_IBS_RANG" value="'.$conf->global->PAYBOX_IBS_RANG.'">';
print '<br>'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')';
print '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_PBX_IDENTIFIANT").'*</td><td>';
+print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_IDENTIFIANT").'</span></td><td>';
print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf->global->PAYBOX_PBX_IDENTIFIANT.'">';
print '<br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')';
print '</td></tr>';
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 6e103f6354e30007718c67232a4a436a04d3aa5c..3417ac6309683d5b796a5ebc535847c4cd100f34 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -455,7 +455,7 @@ if ($_GET["action"] == 'create')
print '<table class="border" width="100%">';
// Type d'action actifs
- print '<tr><td width="30%"><b>'.$langs->trans("Type").'*</b></td><td>';
+ print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
if ($_GET["actioncode"])
{
print '<input type="hidden" name="actioncode" value="'.$_GET["actioncode"].'">'."\n";
@@ -537,7 +537,7 @@ if ($_GET["action"] == 'create')
}
// Date start
- print '<tr><td width="30%" nowrap="nowrap"><b>'.$langs->trans("DateActionStart").'*</b></td><td>';
+ print '<tr><td width="30%" nowrap="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>';
if ($_REQUEST["afaire"] == 1) $html->select_date($actioncomm->datep,'ap',1,1,0,"action",1,1);
else if ($_REQUEST["afaire"] == 2) $html->select_date($actioncomm->datep,'ap',1,1,1,"action",1,1);
else $html->select_date($actioncomm->datep,'ap',1,1,1,"action",1,1);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index a4fffd54ec517c91304cf385e03c294242edacfb..416cdb918018ca788a21a53c02d891fef2593942 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
*
@@ -274,17 +274,17 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P
print '<table class="border" width="100%">';
- print '<tr><td>'.$langs->trans('Company').'</td><td colspan="2">'.$facture->client->getNomUrl(4)."</td></tr>\n";
+ print '<tr><td><span class="fieldrequired">'.$langs->trans('Company').'</span></td><td colspan="2">'.$facture->client->getNomUrl(4)."</td></tr>\n";
// Date payment
- print '<tr><td>'.$langs->trans('Date').'</td><td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
$datepayment = dol_mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0) : $datepayment);
$html->select_date($datepayment,'','','',0,"add_paiement");
print '</td>';
print '<td>'.$langs->trans('Comments').'</td></tr>';
- print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
$html->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid');
print "</td>\n";
@@ -294,8 +294,8 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P
print '<tr>';
if ($conf->banque->enabled)
{
- if ($facture->type != 2) print '<td>'.$langs->trans('AccountToCredit').'</td>';
- if ($facture->type == 2) print '<td>'.$langs->trans('AccountToDebit').'</td>';
+ if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
+ if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
print '<td>';
$html->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',1);
print '</td>';
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 1d2410581008066d21701c7fdc5912a4d23f7e63..e942be72bfc82ab6cfff26422a5791a135ff217c 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -494,16 +494,16 @@ if ($_GET["action"] == 'create')
print '</td></tr>';
// Commercial suivi
- print '<tr><td width="20%" nowrap>'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'*</td><td>';
+ print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
print $form->select_users($_REQUEST["commercial_suivi_id"],'commercial_suivi_id',1,'');
print '</td></tr>';
// Commercial signature
- print '<tr><td width="20%" nowrap>'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'*</td><td>';
+ print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
print $form->select_users($_REQUEST["commercial_signature_id"],'commercial_signature_id',1,'');
print '</td></tr>';
- print '<tr><td>'.$langs->trans("Date").'*</td><td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
$form->select_date($datecontrat,'',0,0,'',"contrat");
print "</td></tr>";
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 6745e21336488ec7a9f26557c8517df46cc6a883..a72d60094186ae700588b87da12ffeed872cebc5 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -848,7 +848,7 @@ if ($step == 4 && $datatoimport)
$more='';
if (preg_match('/\*$/',$label))
{
- $text='<b>'.$text.'*</b>';
+ $text='<span class="fieldrequired">'.$text.'</span>';
$more=((! empty($valforsourcefieldnb[$i]) && $valforsourcefieldnb[$i] <= sizeof($fieldssource)) ? '' : img_warning($langs->trans("FieldNeedSource")));
if ($mandatoryfieldshavesource) $mandatoryfieldshavesource=(! empty($valforsourcefieldnb[$i]) && ($valforsourcefieldnb[$i] <= sizeof($fieldssource)));
//print 'xx'.($i).'-'.$valforsourcefieldnb[$i].'-'.$mandatoryfieldshavesource;
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index d9d4ebdd324c1421df117fe041f4c3742ebb546a..4eafc97c777f0ad49750c925428e0bb84c6d11bc 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -2719,7 +2719,7 @@ function create_exdir($dir)
*/
function picto_required()
{
- return '<b>*</b>';
+ return '<span class="fieldrequired">*</span>';
}
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index de4a26f8f517f13853709038b73aefa3ef850249..eee1341bdcbe57cc90575c0b4d50fcd8ae97f6c8 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -265,10 +265,10 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
}
// Ref
- print '<tr><td>'.$langs->trans("Ref").'*</td><td><input size="12" type="text" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$defaultref).'"></td></tr>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$defaultref).'"></td></tr>';
// Label
- print '<tr><td>'.$langs->trans("Label").'*</td><td><input size="30" type="text" name="title" value="'.$_POST["title"].'"></td></tr>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="30" type="text" name="title" value="'.$_POST["title"].'"></td></tr>';
// Customer
print '<tr><td>'.$langs->trans("Company").'</td><td>';
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 77a82226a1215001f14ced356a5700fe61880b7b..daf38f74d625a718143ff2c5e1e5ff8cfe40f707 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -410,7 +410,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
if ($soc->particulier)
{
- print '<tr><td>'.$langs->trans('LastName').'</td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans('LastName').'</span></td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>';
print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
print '<tr><td>'.$langs->trans('FirstName').'</td><td><input type="text" size="30" name="prenom" value="'.$soc->firstname.'"></td>';
print '<td colspan=2> </td></tr>';
@@ -420,12 +420,12 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
}
else
{
- print '<tr><td>'.$langs->trans('Name').'</td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>';
print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
}
// Prospect/Customer
- print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
+ print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
@@ -446,7 +446,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
// Fournisseur
print '<tr>';
- print '<td>'.$langs->trans('Supplier').'</td><td>';
+ print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
print $form->selectyesno("fournisseur",$soc->fournisseur,1);
print '</td>';
print '<td>'.$langs->trans('SupplierCode').'</td><td>';
@@ -739,7 +739,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '<table class="border" width="100%">';
// Name
- print '<tr><td>'.$langs->trans('Name').'</td><td colspan="3"><input type="text" size="40" name="nom" value="'.$soc->nom.'"></td></tr>';
+ print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td colspan="3"><input type="text" size="40" name="nom" value="'.$soc->nom.'"></td></tr>';
// Prefix
print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
@@ -756,7 +756,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '</td>';
// Prospect/Customer
- print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
+ print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
print '<option value="3"'.($soc->client==3?' selected="true"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
@@ -789,7 +789,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
// Fournisseur
print '<tr>';
- print '<td>'.$langs->trans('Supplier').'</td><td>';
+ print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
print $form->selectyesno("fournisseur",$soc->fournisseur,1);
print '</td>';
print '<td>'.$langs->trans('SupplierCode').'</td><td>';
diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php
index a2f90db604974806a093326dfabb40c19facc959..d9862bf77e65c44a0dcc118f3c5b66f676cdcb1d 100644
--- a/htdocs/theme/auguria/auguria.css.php
+++ b/htdocs/theme/auguria/auguria.css.php
@@ -913,6 +913,8 @@ a.impayee:hover { font-weight: bold; color: #550000; }
* Other
*/
+.fieldrequired { font-weight: bold; color: #000055; }
+
#pictotitle {
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
}
diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/bluelagoon.css.php
index 147fdbf2826d51526e3a9791a094e12a91bb96e6..22344ed86744f385bb724f7daa9be0408ce25364 100644
--- a/htdocs/theme/bluelagoon/bluelagoon.css.php
+++ b/htdocs/theme/bluelagoon/bluelagoon.css.php
@@ -628,6 +628,8 @@ a.impayee:hover { font-weight: bold; color: #550000; }
* Other
*/
+.fieldrequired { font-weight: bold; color: #000055; }
+
#pictotitle {
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
}
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index a0d461054fa1b12464fa65a9b7e0341b7832dd4c..2835cb1b731260e3d0c07e50228a62d7b2d093e7 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -1011,6 +1011,8 @@ a.impayee:hover { font-weight: bold; color: #550000; }
* Other
*/
+.fieldrequired { font-weight: bold; color: #000055; }
+
#pictotitle {
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
}
diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php
index d3ce0237c76bf5522e6fa2d50efc53f714e0da3e..40fa12f478d178f7c0b60a1793380f0dc0cc4967 100644
--- a/htdocs/theme/freelug/freelug.css.php
+++ b/htdocs/theme/freelug/freelug.css.php
@@ -727,6 +727,8 @@ a.impayee:hover { font-weight: bold; color: #550000; }
* Other
*/
+.fieldrequired { font-weight: bold; color: #000055; }
+
#pictotitle {
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
}
diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php
index ebebabf68a003f38ff09e3fc6b75c11f241dccda..e369f1de082eb0aa777998a98b0568ab1af096d8 100644
--- a/htdocs/theme/yellow/yellow.css.php
+++ b/htdocs/theme/yellow/yellow.css.php
@@ -717,6 +717,8 @@ a.impayee:hover { font-weight: bold; color: #550000; }
* Other
*/
+.fieldrequired { font-weight: bold; color: #442200; }
+
#pictotitle {
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
}
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index b45f63f881a221c815fd3f76a113d53b5a79aef1..02de3862d31e2872d84de5e92e090daa91a3f948 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -512,7 +512,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<tr>';
// Nom
- print '<td valign="top" width="160">'.$langs->trans("Lastname").'*</td>';
+ print '<td valign="top" width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
print '<td>';
if ($ldap_nom)
{
@@ -540,7 +540,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td></tr>';
// Login
- print '<tr><td valign="top">'.$langs->trans("Login").'*</td>';
+ print '<tr><td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
print '<td>';
if ($ldap_login)
{
@@ -1290,7 +1290,7 @@ else
print '</tr>';
// Nom
- print "<tr>".'<td valign="top">'.$langs->trans("Name").'*</td>';
+ print "<tr>".'<td valign="top">'.$langs->trans("Name").'</span></td>';
print '<td colspan="2">';
if ($caneditfield && !$fuser->ldap_sid)
{
@@ -1304,7 +1304,7 @@ else
print '</td></tr>';
// Prenom
- print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>';
+ print "<tr>".'<td valign="top"><span class="fieldrequired">'.$langs->trans("Firstname").'</td>';
print '<td colspan="2">';
if ($caneditfield && !$fuser->ldap_sid)
{
@@ -1318,7 +1318,7 @@ else
print '</td></tr>';
// Login
- print "<tr>".'<td valign="top">'.$langs->trans("Login").'*</td>';
+ print "<tr>".'<td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
print '<td>';
if ($user->admin && !$fuser->ldap_sid)
{
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index bdfe1814c8378af5fcd98f95a035ad7fa96e92d9..d707496e605a7642745fc2b73f8f8a20ab4a280f 100644
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -78,9 +78,7 @@ if ($resql)
$replyto = $obj->email_replyto;
$errorsto = $obj->email_errorsto;
- // Le message est-il en html
- $msgishtml=-1; // Inconnu par defaut
- if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+ $msgishtml=-1;
$i++;
}