From b707c79d6d211637825b4544749083c8d854073d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 6 Jan 2023 15:46:17 +0100 Subject: [PATCH] FIX look and feel v17 (always a message instead of empty lists) --- htdocs/core/tpl/contacts.tpl.php | 15 +++++++++++---- htdocs/langs/en_US/main.lang | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 9d9bd226fd6..25e0f914807 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -280,9 +280,6 @@ print ''; print '
'."\n"; print ''; -//print ''; -//print ''; - print ''; print_liste_field_titre($arrayfields['thirdparty']['label'], $_SERVER["PHP_SELF"], "thirdparty_name", "", $param, "", $sortfield, $sortorder); print_liste_field_titre($arrayfields['contact']['label'], $_SERVER["PHP_SELF"], "contact_name", "", $param, "", $sortfield, $sortorder); @@ -316,7 +313,17 @@ foreach ($list as $entry) { print ""; } - +if (empty($list)) { + $colspan = 5 + ($permission ? 1 : 0); + print ''; +} print "
'; + if (is_object($object) && !empty($object->thirdparty)) { + print $form->textwithpicto($langs->trans("NoSpecificContactAddress"), $langs->trans("NoSpecificContactAddressBis")); + } else { + print $langs->trans("NoSpecificContactAddress"); + } + print ''; + print '
"; print '
'; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index ebdbfce73fa..73dfee80a69 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1211,3 +1211,6 @@ CreatedByPublicPortal=Created from Public portal UserAgent=User Agent InternalUser=Internal user ExternalUser=External user +NoSpecificContactAddress=No specific contact or address +NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate. +