From 6d81bc77cba9f43f6e2901ee175294fd43e4434b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Dec 2019 11:00:09 +0100 Subject: [PATCH] Fix look and feel v11 --- htdocs/blockedlog/lib/blockedlog.lib.php | 2 +- htdocs/comm/card.php | 14 +++++++------- htdocs/comm/index.php | 6 +++--- htdocs/compta/index.php | 4 ++-- htdocs/contrat/index.php | 2 +- htdocs/core/lib/agenda.lib.php | 2 +- htdocs/core/lib/bank.lib.php | 2 +- htdocs/core/lib/company.lib.php | 2 +- htdocs/core/lib/project.lib.php | 2 +- htdocs/fourn/card.php | 8 ++++---- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php index 0d7c69a6d00..13c7ac61d1a 100644 --- a/htdocs/blockedlog/lib/blockedlog.lib.php +++ b/htdocs/blockedlog/lib/blockedlog.lib.php @@ -46,7 +46,7 @@ function blockedlogadmin_prepare_head() $b=new BlockedLog($db); if ($b->alreadyUsed()) { - $head[$h][1].=' ...'; + $head[$h][1].='...'; } $head[$h][2] = 'fingerprints'; $h++; diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 6e42b1068c1..010a3c6785a 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -695,7 +695,7 @@ if ($object->id > 0) print ''; print ''; - print '
'; + print ''; print ''; @@ -780,7 +780,7 @@ if ($object->id > 0) print '
'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllPropals").' '.$num.''; print ''; print '
'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllPropals").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; print ''; - print '
'; + print '
'.$langs->trans("LastCustomerOrders", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''; print ''; //if($num2 > 0) print ''; //else print ''; @@ -856,7 +856,7 @@ if ($object->id > 0) print '
'.$langs->trans("LastCustomerOrders", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllOrders").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'
'; print ''; - print '
'; + print ''; print ''; @@ -921,7 +921,7 @@ if ($object->id > 0) print ''; print ''; print ''; @@ -990,7 +990,7 @@ if ($object->id > 0) print '
'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllSendings").' '.$num.''; print ''; print '
'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllSendings").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; - print ''; + print ''; //print ''; print '
'.$langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllContracts").' '.$num.''.$langs->trans("AllContracts").''.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'; print ''; - print '
'; + print ''; print ''; @@ -1063,7 +1063,7 @@ if ($object->id > 0) print '
'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllInterventions").' '.$num.''; print ''; print '
'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllInterventions").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; print ''; - print '
'; + print ''; print ''; } @@ -1168,7 +1168,7 @@ if ($object->id > 0) print '
'.$langs->trans("LatestCustomerTemplateInvoices", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllCustomerTemplateInvoices").' '.$num.''; print '
'.$langs->trans("LatestCustomerTemplateInvoices", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllCustomerTemplateInvoices").''.$num.'
'; print ''; - print '
'; + print ''; print ''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 6e26e732010..9243ee361c1 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -251,7 +251,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa print '
'; print '
'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllBills").' '.$num.''; print ''; print '
'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllBills").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; print ''; - print ''; + print ''; if ($num > 0) { @@ -333,7 +333,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) print '
'; print '
'.$langs->trans("SupplierProposalsDraft").($num ? ' '.$num.'' : '').'
'.$langs->trans("SupplierProposalsDraft").($num ? ''.$num.'' : '').'
'; print ''; - print ''; + print ''; if ($num > 0) { @@ -422,7 +422,7 @@ if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande- print '
'; print '
'.$langs->trans("DraftOrders").($num ? ' '.$num.'' : '').'
'.$langs->trans("DraftOrders").($num ? ''.$num.'' : '').'
'; print ''; - print ''; + print ''; if ($num > 0) { diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 37400ab25a3..ae6b0855f39 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -170,7 +170,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) print '
'; print '
'.$langs->trans("DraftSuppliersOrders").($num ? ' '.$num.'' : '').'
'.$langs->trans("DraftSuppliersOrders").($num ? ''.$num.'' : '').'
'; print ''; - print ''; + print ''; if ($num) { $companystatic = new Societe($db); @@ -257,7 +257,7 @@ if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-> print '
'; print '
'.$langs->trans("CustomersDraftInvoices").($num ? ' '.$num.'' : '').'
'.$langs->trans("CustomersDraftInvoices").($num ? ''.$num.'' : '').'
'; print ''; - print ''; + print ''; if ($num) { $companystatic = new Societe($db); diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 98af77f2627..2b19050c5b9 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -260,7 +260,7 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) print '
'; print '
'.$langs->trans("SuppliersDraftInvoices").($num ? ' '.$num.'' : '').'
'.$langs->trans("SuppliersDraftInvoices").($num ? ''.$num.'' : '').'
'; print ''; - print ''; + print ''; if ($num) { $companystatic = new Societe($db); diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index ed228294bf5..d9bfc7986c1 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -486,7 +486,7 @@ function actions_prepare_head($object) $nbLinks=Link::count($db, $object->element, $object->id); $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); - if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' '.($nbFiles+$nbLinks).''; + if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ''.($nbFiles+$nbLinks).''; $head[$h][2] = 'documents'; $h++; diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index fb9c607eb72..0cb6163aa49 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -185,7 +185,7 @@ function account_statement_prepare_head($object, $num) $head[$h][0] = DOL_URL_ROOT."/compta/bank/account_statement_document.php?account=".$object->id."&num=".$num; $head[$h][1] = $langs->trans("Documents"); - if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' '.($nbFiles + $nbLinks).''; + if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; $head[$h][2] = 'document'; $h++; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 90ea0e4fbf6..8435271380f 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -228,7 +228,7 @@ function societe_prepare_head(Societe $object) $head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id; $head[$h][1] = $title; - if ($foundonexternalonlinesystem) $head[$h][1] .= ' ...'; + if ($foundonexternalonlinesystem) $head[$h][1] .= '...'; elseif ($nbBankAccount > 0) $head[$h][1] .= ''.$nbBankAccount.''; $head[$h][2] = 'rib'; $h++; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 9b7f9c76efb..962d3ec9766 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -111,7 +111,7 @@ function project_prepare_head($object) if (!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id; $head[$h][1] = $langs->trans('Notes'); - if ($nbNote > 0) $head[$h][1] .= ' '.$nbNote.''; + if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.''; $head[$h][2] = 'notes'; $h++; } diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 2fabe28728d..9056d1217ca 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -468,7 +468,7 @@ if ($object->id > 0) print '
'.$langs->trans("DraftContracts").($num ? ' '.$num.'' : '').'
'.$langs->trans("DraftContracts").($num ? ''.$num.'' : '').'
'; print ''; print ''; $return = array(); @@ -542,7 +542,7 @@ if ($object->id > 0) print ''; print ''; @@ -653,7 +653,7 @@ if ($object->id > 0) print ''; print ''; @@ -725,7 +725,7 @@ if ($object->id > 0) print ''; print '';
'.$langs->trans("ProductsAndServices").''; - print ''.$langs->trans("AllProductReferencesOfSupplier").' '.$object->nbOfProductRefs().''; + print ''.$langs->trans("AllProductReferencesOfSupplier").''.$object->nbOfProductRefs().''; print '
'; print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("LastSupplierProposals", ($num < $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllPriceRequests").' '.$num.''.$langs->trans("AllPriceRequests").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; print '
'; print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("LastSupplierOrders", ($num < $MAXLIST ? "" : $MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.$langs->trans("AllOrders").''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; print '
'; - print ''; + print '
'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans('AllBills').' '.$num.'
'; print ''; print '
'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).''.$langs->trans('AllBills').''.$num.''.img_picto($langs->trans("Statistics"), 'stats').'
'; print '