From 1b2826f476e6efcb0aeb909b17dfb34caa3d4a5f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Mar 2019 13:26:26 +0100 Subject: [PATCH] Look and feel v10 --- htdocs/adherents/document.php | 2 +- htdocs/asset/document.php | 2 +- htdocs/comm/propal/document.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/compta/bank/document.php | 2 +- htdocs/compta/bank/various_payment/document.php | 2 +- htdocs/compta/deplacement/document.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/salaries/document.php | 2 +- htdocs/compta/sociales/document.php | 2 +- htdocs/compta/tva/document.php | 2 +- htdocs/contact/document.php | 2 +- htdocs/contrat/document.php | 2 +- htdocs/don/document.php | 2 +- htdocs/expedition/document.php | 4 ++-- htdocs/expensereport/document.php | 2 +- htdocs/fichinter/document.php | 2 +- htdocs/fourn/commande/document.php | 2 +- htdocs/fourn/facture/document.php | 4 ++-- htdocs/holiday/document.php | 4 ++-- htdocs/loan/document.php | 2 +- htdocs/product/document.php | 2 +- htdocs/projet/document.php | 2 +- htdocs/projet/tasks/document.php | 6 +++--- htdocs/resource/document.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/supplier_proposal/document.php | 2 +- htdocs/user/document.php | 2 +- 28 files changed, 33 insertions(+), 33 deletions(-) diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index d88d775e0c1..2de98e1b96a 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -113,7 +113,7 @@ if ($id > 0) print '
'; print '
'; - print ''; + print '
'; $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php index 3359d5539b5..61be1ad51d6 100644 --- a/htdocs/asset/document.php +++ b/htdocs/asset/document.php @@ -117,7 +117,7 @@ if ($object->id) print '
'; print '
'; - print '
'; + print '
'; // Number of files print ''; diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 18d7edd1f03..4c464db4693 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -155,7 +155,7 @@ if ($object->id > 0) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'; + print '
'; // Files infos print ''; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 9c706bda200..37cbc70cd40 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -160,7 +160,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'; + print '
'; print ''; print ''; diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index 06fc4752d31..5b887f0bd8e 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) { print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; + print '
'; print ''; print ''; print "
' . $langs->trans("NbOfAttachedFiles") . '' . count($filearray) . '
' . $langs->trans("TotalSizeOfAttachedFiles") . '' .dol_print_size($totalsize, 1, 1).'
\n"; diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php index 58cb526d566..36e8546a897 100644 --- a/htdocs/compta/bank/various_payment/document.php +++ b/htdocs/compta/bank/various_payment/document.php @@ -131,7 +131,7 @@ if ($object->id) $totalsize+=$file['size']; } - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php index c94a527d575..8cba95e283b 100644 --- a/htdocs/compta/deplacement/document.php +++ b/htdocs/compta/deplacement/document.php @@ -100,7 +100,7 @@ if ($object->id) } - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
'; + print '
'; $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 9ddefd0ede4..44f69f512bd 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -165,7 +165,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print '
'; + print '
'; print ''; print ''; diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php index 5335b8fc39e..3ff92d23c1c 100644 --- a/htdocs/compta/salaries/document.php +++ b/htdocs/compta/salaries/document.php @@ -114,7 +114,7 @@ if ($object->id) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; + print '
'; print ''; print ''; print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 87bef4e69d1..1025f7b11ed 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -145,7 +145,7 @@ if ($object->id) } - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php index bb8819f9588..78a1029b2f4 100644 --- a/htdocs/compta/tva/document.php +++ b/htdocs/compta/tva/document.php @@ -131,7 +131,7 @@ if ($object->id) } - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; + print '
'; print ''; print ''; diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 1f2f895fed8..86f2dc8c3c9 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -124,7 +124,7 @@ if ($object->id) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; + print '
'; // Company /* diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 64ecff642f7..27d97572529 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -178,7 +178,7 @@ if ($object->id) print '
'; - print '
'; + print '
'; print ''; print ''; print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; diff --git a/htdocs/don/document.php b/htdocs/don/document.php index d0308ab89f4..fcb3c87ad9d 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -157,7 +157,7 @@ if ($object->id) print '
'; print '
'; - print ''; + print '
'; // Ref /* diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php index cacc6a874ac..5c178cbdaf2 100644 --- a/htdocs/expedition/document.php +++ b/htdocs/expedition/document.php @@ -94,7 +94,7 @@ if ($id > 0 || ! empty($ref)){ $head = shipping_prepare_head($object); dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending'); - + // Build file list $filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1); @@ -159,7 +159,7 @@ if ($id > 0 || ! empty($ref)){ print '
'; print '
'; - print '
'; + print '
'; print ''; print ''; diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index b1be48ffc76..f5295118bda 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -114,7 +114,7 @@ if ($object->id) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; + print '
'; $linkback = ''.$langs->trans("BackToList").''; diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index a23eab2ae2c..d5aed88079a 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -154,7 +154,7 @@ if ($object->id) print '
'; print '
'; - print '
'; + print '
'; print ''; print ''; print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index 2c1fce8f6d2..f933ecfdb5f 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -160,7 +160,7 @@ if ($object->id > 0) print '
'; print '
'; - print ''; + print '
'; print ''; print ''; print "
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
\n"; diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index ec4003dcfb7..55075a5014f 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -160,7 +160,7 @@ if ($object->id > 0) print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1); } - print ''; + print '
'; // Type print '
'.$langs->trans('Type').''; @@ -232,7 +232,7 @@ if ($object->id > 0) print '
'; - print ''; + print '
'; // Nb of files print ''; diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php index 942b6cb98fb..a594a920e74 100644 --- a/htdocs/holiday/document.php +++ b/htdocs/holiday/document.php @@ -118,7 +118,7 @@ if ($object->id) //print '
'; print '
'; - print '
'.$langs->trans('NbOfAttachedFiles').''.count($filearray).'
'; + print '
'; print ''; print ''; @@ -223,7 +223,7 @@ if ($object->id) print '
'; // Info workflow - print '
'.$langs->trans("User").'
'."\n"; + print '
'."\n"; print ''; if (! empty($object->fk_user_create)) diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index eeee232befb..0b7e23bbd3f 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -143,7 +143,7 @@ if ($object->id) } - print '
'; + print '
'; print ''; print ''; print "
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
\n"; diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 9c2f45c0159..94db650a519 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -223,7 +223,7 @@ if ($object->id) print '
'; print '
'; - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 20b2bd708dd..51469b8d2f6 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -135,7 +135,7 @@ if ($object->id > 0) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; + print '
'; // Files infos print ''; diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 49bf3d02ad8..2b2f6ab4176 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -163,7 +163,7 @@ if ($object->id > 0) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'; + print '
'; // Visibility print '
'.$langs->trans("Visibility").''; @@ -197,7 +197,7 @@ if ($object->id > 0) print '
'; print '
'; - print ''; + print '
'; // Description print '
'.$langs->trans("Description").''; @@ -266,7 +266,7 @@ if ($object->id > 0) print '
'; print '
'; - print ''; + print '
'; // Files infos print ''; diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index 5bef25f9824..5e6227a9e1d 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -113,7 +113,7 @@ if ($object->id) print '
'; print '
'; - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'; + print '
'; // Resource type print ''; diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index 2337763032c..6886c631e37 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -118,7 +118,7 @@ if ($object->id) print '
'; print '
'; - print '
'; + print '
'; // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index f226391e3f7..458ade41309 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -148,7 +148,7 @@ if ($object->id > 0) print '
'; print '
'; - print '
'; + print '
'; print ''; print ''; diff --git a/htdocs/user/document.php b/htdocs/user/document.php index 8d96157416a..63d527dc33c 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -149,7 +149,7 @@ if ($object->id) } - print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.dol_print_size($totalsize, 1, 1).'
'; + print '
'; // Login print '';
'.$langs->trans("Login").''.$object->login.'