diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 49078936a49..4088f9204d9 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3780,13 +3780,14 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $mor * @param string $email EMail to show (only email, without 'Name of recipient' before) * @param int $cid Id of contact if known * @param int $socid Id of third party if known - * @param int|string $addlink 0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on), 'thirdparty'=link to the thirdparty + * @param int|string $addlink 0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on), 'thirdparty'=link to the thirdparty presend email * @param int $max Max number of characters to show. Use -1 to hide the mail text and show only the picto. * @param int $showinvalid 1=Show warning if syntax email is wrong - * @param int|string $withpicto Show picto + * @param int|string $withpicto 0=Show email, 1=Show picto of email + email, 2=Show only picto + * @param string $morecss More CSS * @return string HTML Link */ -function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0) +function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0, $morecss = 'paddingrightonly') { global $user, $langs, $hookmanager; @@ -3804,7 +3805,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, } if ($addlink == 1) { - $newemail = ''; - $newemail .= ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '').$newemail; - $newemail .= ''; + $tmpnewemail = ''; + $tmpnewemail .= ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : ''); + if ($withpicto == 1) { + $tmpnewemail .= $newemail; + } + $tmpnewemail .= ''; + + $newemail = $tmpnewemail; } else { $newemail = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '').$newemail; @@ -4055,7 +4061,7 @@ function dol_print_profids($profID, $profIDtype, $countrycode = '', $addcpButton * @param string $morecss Add more css * @return string Formatted phone number */ -function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addlink = '', $separ = " ", $withpicto = '', $titlealt = '', $adddivfloat = 0, $morecss = '') +function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addlink = '', $separ = " ", $withpicto = '', $titlealt = '', $adddivfloat = 0, $morecss = 'paddingright') { global $conf, $user, $langs, $mysoc, $hookmanager; @@ -4358,9 +4364,9 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli } } if ($adddivfloat == 1) { - $rep .= '
'; + $rep .= '
'; } elseif (empty($adddivfloat)) { - $rep .= ''; + $rep .= ''; } $rep .= $newphoneastart; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 5600ab8efa4..396f57e85b5 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -2545,12 +2545,12 @@ class Project extends CommonObject $return .= '
'; if (!empty($this->thirdparty->phone)) { $return .= '
'; - $return .= dol_print_phone($this->thirdparty->phone, $this->thirdparty->country_code, 0, $this->thirdparty->id, 'tel', 'hidenum', 'phone', $this->thirdparty->phone, 0, 'marginleftonly'); + $return .= dol_print_phone($this->thirdparty->phone, $this->thirdparty->country_code, 0, $this->thirdparty->id, 'tel', 'hidenum', 'phone', $this->thirdparty->phone, 0, 'paddingleft paddingright'); $return .= '
'; } if (!empty($this->thirdparty->email)) { $return .= '
'; - $return .= dol_print_email($this->thirdparty->email, 0, $this->thirdparty->id, 'thirdparty', -1, 1, 1); + $return .= dol_print_email($this->thirdparty->email, 0, $this->thirdparty->id, 'thirdparty', -1, 1, 2, 'paddingleft paddingright'); $return .= '
'; } } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 5896b5be527..a1bb13331df 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -5213,7 +5213,18 @@ class Societe extends CommonObject $return .= img_picto('', $this->picto); $return .= ''; $return .= '
'; - $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref); + $return .= '
'; + if (!empty($this->phone)) { + $return .= '
'; + $return .= dol_print_phone($this->phone, $this->country_code, 0, $this->id, 'tel', 'hidenum', 'phone', $this->phone, 0, 'paddingleft paddingright'); + $return .= '
'; + } + if (!empty($this->email)) { + $return .= '
'; + $return .= dol_print_email($this->email, 0, $this->id, 'thirdparty', -1, 1, 2, 'paddingleft paddingright'); + $return .= '
'; + } if ($selected >= 0) { $return .= ''; } @@ -5223,7 +5234,7 @@ class Societe extends CommonObject if (method_exists($this, 'getLibStatut')) { $return .= '
'.$this->getLibStatut(3).'
'; } - $return .= '
'; + $return .= '
'; // end info-box-content $return .= ''; $return .= ''; diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 31278757e57..cbe876ebe21 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -1755,6 +1755,9 @@ while ($i < $imaxinloop) { $companystatic->client = $obj->client; $companystatic->status = $obj->status; $companystatic->email = $obj->email; + $companystatic->phone = $obj->phone; + $companystatic->phone_mobile = $obj->phone_mobile; + $companystatic->fax = $obj->fax; $companystatic->address = $obj->address; $companystatic->zip = $obj->zip; $companystatic->town = $obj->town; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 3309a4c35d7..a8d9e41328e 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -220,7 +220,7 @@ body { 100 ? 'zoom: '.getDolUserInt('MAIN_OPTIMIZEFORTEXTBROWSER').'%;' : 'zoom: 150%;') : ''; ?> - /* zoom: 110%; */ + zoom: 105%; /* not supported by al browsers */ } /* Style used to protect html content in output to avoid attack by replacing full page with js content */ @@ -4221,7 +4221,7 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.nobor table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td { padding: 6px 10px 6px 12px; /* t r b l */ /* line-height: 22px; This create trouble on cell login on list of last events of a contract*/ - height: 28px; + height: 30px; } table.liste tr.trkanban td { padding: 12px 15px 12px 15px; /* t r b l */