Qual: Uniformisation du style des messages d'erreur (3 styles dans les feuilles de style sont dispo: ok, warning, error)
This commit is contained in:
parent
f001d08c8e
commit
fc03f4bf81
@ -2,6 +2,7 @@
|
|||||||
ErrorBadEMail=EMail %s is wrong
|
ErrorBadEMail=EMail %s is wrong
|
||||||
ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
|
ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
|
||||||
ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
|
ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
|
||||||
|
ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited informations ?
|
||||||
MenuNewCompany=New company
|
MenuNewCompany=New company
|
||||||
MenuNewCustomer=New customer
|
MenuNewCustomer=New customer
|
||||||
MenuNewProspect=New prospect
|
MenuNewProspect=New prospect
|
||||||
@ -38,9 +39,12 @@ CustomerDiscount=Customer Discount
|
|||||||
Supplier=Supplier
|
Supplier=Supplier
|
||||||
CompanyList=Companies' list
|
CompanyList=Companies' list
|
||||||
AddContact=Add new contact
|
AddContact=Add new contact
|
||||||
|
AddCompany=Add company
|
||||||
|
DeleteACompany=Delete a company
|
||||||
PersonalInformations=Personal data
|
PersonalInformations=Personal data
|
||||||
CustomerCode=Customer code
|
CustomerCode=Customer code
|
||||||
SupplierCode=Supplier code
|
SupplierCode=Supplier code
|
||||||
CustomerAccount=Customer account
|
CustomerAccount=Customer account
|
||||||
SupplierAccount=Supplier account
|
SupplierAccount=Supplier account
|
||||||
LastProspect=Last
|
LastProspect=Last
|
||||||
|
CompanyDeleted=Company "%s" deleted from database.
|
||||||
@ -2,6 +2,7 @@
|
|||||||
ErrorBadEMail=EMail %s invalide
|
ErrorBadEMail=EMail %s invalide
|
||||||
ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Choisissez-en une autre.
|
ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Choisissez-en une autre.
|
||||||
ErrorPrefixAlreadyExists=Le prefix %s existe déjà. Choisissez-en un autre.
|
ErrorPrefixAlreadyExists=Le prefix %s existe déjà. Choisissez-en un autre.
|
||||||
|
ConfirmDeleteCompany=Etes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ?
|
||||||
MenuNewCompany=Nouvelle société
|
MenuNewCompany=Nouvelle société
|
||||||
MenuNewCustomer=Nouveau client
|
MenuNewCustomer=Nouveau client
|
||||||
MenuNewProspect=Nouveau prospect
|
MenuNewProspect=Nouveau prospect
|
||||||
@ -38,9 +39,12 @@ CustomerDiscount=Remise client
|
|||||||
Supplier=Fournisseur
|
Supplier=Fournisseur
|
||||||
CompanyList=Liste des sociétés
|
CompanyList=Liste des sociétés
|
||||||
AddContact=Ajouter contact
|
AddContact=Ajouter contact
|
||||||
|
AddCompany=Ajouter sociétés
|
||||||
|
DeleteACompany=Supprimer une société
|
||||||
PersonalInformations=Informations personnelles
|
PersonalInformations=Informations personnelles
|
||||||
CustomerCode=Code client
|
CustomerCode=Code client
|
||||||
SupplierCode=Code fournisseur
|
SupplierCode=Code fournisseur
|
||||||
CustomerAccount=Compte client
|
CustomerAccount=Compte client
|
||||||
SupplierAccount=Compte fournisseur
|
SupplierAccount=Compte fournisseur
|
||||||
LastProspect=Derniers
|
LastProspect=Derniers
|
||||||
|
CompanyDeleted=La société "%s" a été supprimée de la base.
|
||||||
@ -112,7 +112,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes' && $user-
|
|||||||
if ($result == 0)
|
if ($result == 0)
|
||||||
{
|
{
|
||||||
llxHeader();
|
llxHeader();
|
||||||
print "Société $soc->nom supprimée de la base";
|
print '<div class="ok">'.$langs->trans("CompanyDeleted",$soc->nom).'</div>';
|
||||||
llxFooter();
|
llxFooter();
|
||||||
exit ;
|
exit ;
|
||||||
}
|
}
|
||||||
@ -151,7 +151,7 @@ if ($_GET["action"] == 'create')
|
|||||||
|
|
||||||
if ($soc->error)
|
if ($soc->error)
|
||||||
{
|
{
|
||||||
print '<div class="errormessage">';
|
print '<div class="error">';
|
||||||
print nl2br($soc->error);
|
print nl2br($soc->error);
|
||||||
print '</div>';
|
print '</div>';
|
||||||
}
|
}
|
||||||
@ -386,21 +386,19 @@ else
|
|||||||
/*
|
/*
|
||||||
* Fiche société en mode visu
|
* Fiche société en mode visu
|
||||||
*/
|
*/
|
||||||
$html = new Form($db);
|
|
||||||
/*
|
// Confirmation de la suppression de la facture
|
||||||
* Confirmation de la suppression de la facture
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
if ($_GET["action"] == 'delete')
|
if ($_GET["action"] == 'delete')
|
||||||
{
|
{
|
||||||
$html->form_confirm("soc.php?socid=".$soc->id,"Supprimer la société","Etes-vous sûr de vouloir supprimer cette société et tous ses contacts associés ?","confirm_delete");
|
$html = new Form($db);
|
||||||
|
$html->form_confirm("soc.php?socid=".$soc->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete");
|
||||||
print "<br />\n";
|
print "<br />\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($soc->error)
|
if ($soc->error)
|
||||||
{
|
{
|
||||||
print '<div class="errormessage">';
|
print '<div class="error">';
|
||||||
print $soc->error;
|
print $soc->error;
|
||||||
print '</div>';
|
print '</div>';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -101,15 +101,29 @@ div.FicheSubmit {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.message {
|
/*
|
||||||
background: #dee7ec;
|
* Ok, Warning, Error
|
||||||
padding: 0em 1.5em;
|
*/
|
||||||
margin: 0em 0em 0em 0em;
|
.ok { color: #114466; }
|
||||||
border-top: 1px solid #8CACBB;
|
.warning { color: #777711; }
|
||||||
border-left: 1px solid #8CACBB;
|
.error { color: #550000; font-weight: bold; }
|
||||||
border-right: 1px solid #8CACBB;
|
|
||||||
|
div.ok {
|
||||||
|
color: #114466;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.warning {
|
||||||
|
color: #777711;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.error {
|
||||||
|
color: #550000; font-weight: bold;
|
||||||
|
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||||
|
margin: 0.5em 0em 0.5em 0em;
|
||||||
|
border: 1px solid #6C7C8B;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
a.tabAction {
|
a.tabAction {
|
||||||
background: white;
|
background: white;
|
||||||
border: 1px outset #8CACBB;
|
border: 1px outset #8CACBB;
|
||||||
|
|||||||
@ -561,26 +561,25 @@ font: helvetica, verdana, arial, sans-serif;
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Normal, warning, erreurs
|
* Ok, Warning, Error
|
||||||
*/
|
*/
|
||||||
.ok { color: #114466; }
|
.ok { color: #114466; }
|
||||||
.warning { color: #777711; }
|
.warning { color: #777711; }
|
||||||
.error { color: #550000; font-weight: bold; }
|
.error { color: #550000; font-weight: bold; }
|
||||||
|
|
||||||
div.message {
|
div.ok {
|
||||||
background: #dee7ec;
|
color: #114466;
|
||||||
padding: 0em 1.5em;
|
|
||||||
margin: 0em 0em 0em 0em;
|
|
||||||
border-top: 1px solid #8CACBB;
|
|
||||||
border-left: 1px solid #8CACBB;
|
|
||||||
border-right: 1px solid #8CACBB;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
div.errormessage {
|
div.warning {
|
||||||
|
color: #777711;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.error {
|
||||||
color: #550000; font-weight: bold;
|
color: #550000; font-weight: bold;
|
||||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||||
margin: 0.5em 0em 0.5em 0em;
|
margin: 0.5em 0em 0.5em 0em;
|
||||||
border: 1px solid #000000;
|
border: 1px solid #6C7C8B;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -332,15 +332,6 @@ div.FicheSubmit {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.message {
|
|
||||||
background: #dee7ec;
|
|
||||||
padding: 0em 1.5em;
|
|
||||||
margin: 0em 0em 0em 0em;
|
|
||||||
border-top: 1px solid #9999BB;
|
|
||||||
border-left: 1px solid #9999BB;
|
|
||||||
border-right: 1px solid #9999BB;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.tab {
|
a.tab {
|
||||||
background: white;
|
background: white;
|
||||||
border: 1px solid #9999BB;
|
border: 1px solid #9999BB;
|
||||||
@ -508,16 +499,15 @@ div.leftmenu {
|
|||||||
.warning { color: #777711; }
|
.warning { color: #777711; }
|
||||||
.error { color: #550000; }
|
.error { color: #550000; }
|
||||||
|
|
||||||
div.message {
|
div.ok {
|
||||||
background: #dee7ec;
|
color: #114466;
|
||||||
padding: 0em 1.5em;
|
|
||||||
margin: 0em 0em 0em 0em;
|
|
||||||
border-top: 1px solid #8CACBB;
|
|
||||||
border-left: 1px solid #8CACBB;
|
|
||||||
border-right: 1px solid #8CACBB;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
div.errormessage {
|
div.warning {
|
||||||
|
color: #777711;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.error {
|
||||||
color: #550000; font-weight: bold;
|
color: #550000; font-weight: bold;
|
||||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||||
margin: 0.5em 0em 0.5em 0em;
|
margin: 0.5em 0em 0.5em 0em;
|
||||||
|
|||||||
@ -336,15 +336,6 @@ div.FicheSubmit {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.message {
|
|
||||||
background: #dee7ec;
|
|
||||||
padding: 0em 1.5em;
|
|
||||||
margin: 0em 0em 0em 0em;
|
|
||||||
border-top: 1px solid #8CACBB;
|
|
||||||
border-left: 1px solid #8CACBB;
|
|
||||||
border-right: 1px solid #8CACBB;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.tab {
|
a.tab {
|
||||||
background: white;
|
background: white;
|
||||||
border: 1px solid #999999;
|
border: 1px solid #999999;
|
||||||
@ -510,16 +501,15 @@ div.leftmenu {
|
|||||||
.warning { color: #777711; }
|
.warning { color: #777711; }
|
||||||
.error { color: #550000; }
|
.error { color: #550000; }
|
||||||
|
|
||||||
div.message {
|
div.ok {
|
||||||
background: #dee7ec;
|
color: #114466;
|
||||||
padding: 0em 1.5em;
|
|
||||||
margin: 0em 0em 0em 0em;
|
|
||||||
border-top: 1px solid #8CACBB;
|
|
||||||
border-left: 1px solid #8CACBB;
|
|
||||||
border-right: 1px solid #8CACBB;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
div.errormessage {
|
div.warning {
|
||||||
|
color: #777711;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.error {
|
||||||
color: #550000; font-weight: bold;
|
color: #550000; font-weight: bold;
|
||||||
padding: 0.2em 0.2em 0.2em 0.2em;
|
padding: 0.2em 0.2em 0.2em 0.2em;
|
||||||
margin: 0.5em 0em 0.5em 0em;
|
margin: 0.5em 0em 0.5em 0em;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user