diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index a9ebafc4769..31147bc8a6a 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -325,6 +325,7 @@ class FormMail extends Form if ($this->withform == 1) { $out.= '
'."\n"; + $out.= ''; $out.= ''; $out.= ''; @@ -421,7 +422,7 @@ class FormMail extends Form { if (! empty($this->withfromreadonly)) { - $out.= ''.$langs->trans("MailFrom").''; + $out.= ''.$langs->trans("MailFrom").''; if (! ($this->fromtype === 'user' && $this->fromid > 0) && ! ($this->fromtype === 'company') @@ -499,7 +500,7 @@ class FormMail extends Form } } } - $out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', '', 0, '', $disablebademails); + $out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200onsmartphone', 0, '', $disablebademails); //$out.= ajax_combobox('fromtype'); } @@ -508,9 +509,9 @@ class FormMail extends Form else { $out.= ''.$langs->trans("MailFrom").""; - $out.= $langs->trans("Name").':'; + $out.= $langs->trans("Name").':'; $out.= '    '; - $out.= $langs->trans("EMail").':<>'; + $out.= $langs->trans("EMail").':<>'; $out.= "\n"; } } @@ -518,7 +519,7 @@ class FormMail extends Form // To if (! empty($this->withto) || is_array($this->withto)) { - $out.= ''; + $out.= ''; if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); else $out.= $langs->trans("MailTo"); $out.= ''; @@ -585,12 +586,15 @@ class FormMail extends Form // withoptiononeemailperrecipient if (! empty($this->withoptiononeemailperrecipient)) { - $out.= ''; + $out.= ''; $out.= $langs->trans("GroupEmails"); $out.= ''; $out.=' withoptiononeemailperrecipient > 0?' checked="checked"':'').'> '; - $out.= $langs->trans("OneEmailPerRecipient").' - '; + $out.= $langs->trans("OneEmailPerRecipient"); + $out.=''; + $out.=' - '; $out.= $langs->trans("WarningIfYouCheckOneRecipientPerEmail"); + $out.=''; $out.= ''; } @@ -606,7 +610,7 @@ class FormMail extends Form } else { - $out.= 'withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />'; + $out.= 'withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />'; if (! empty($this->withtocc) && is_array($this->withtocc)) { $out.= " ".$langs->trans("and")."/".$langs->trans("or")." "; @@ -762,7 +766,7 @@ class FormMail extends Form if (is_numeric($this->withfile)) { - // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript + // TODO Trick to have param removedfile containing nb of file to delete. But this does not works without javascript $out.= ''."\n"; $out.= '