From 53b36435d040ab6ef75b64b3583174d21c22dc29 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 20:50:18 +0100 Subject: [PATCH] Fix on smartphone --- htdocs/comm/mailing/card.php | 2 +- htdocs/core/class/html.form.class.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index efae8bd8e80..cedd04c46c1 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -1095,7 +1095,7 @@ else $htmltext.=''; // Print mail content - print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic'); + print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto(''.$langs->trans("AvailableVariables").'', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic'); dol_fiche_head('', '', '', -1); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8d513fae9bf..65b68f613f5 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -523,8 +523,13 @@ class Form } } - // If info or help with smartphone, show only text (tooltip can't works) - if (! empty($conf->dol_no_mouse_hover)) + // If info or help with smartphone, show only text (tooltip hover can't works) + if (! empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger)) + { + if ($type == 'info' || $type == 'help') return $text; + } + // If info or help with smartphone, show only text (tooltip on lick does not works with dialog on smaprtphone) + if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger)) { if ($type == 'info' || $type == 'help') return $text; }