';
- $filterfound = 0;
foreach ($fieldlist as $field => $value)
{
if ($value == 'label') {
print ' | ';
} elseif ($value == 'lang') {
print '';
- print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
+ print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
print ' | ';
} elseif ($value == 'fk_user') {
print '';
- $restrictid = array();
- if (!$user->admin) $restrictid = array($user->id);
- //var_dump($restrictid);
- print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
+ print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth150');
print ' | ';
} elseif ($value == 'topic') {
print ' | ';
} elseif ($value == 'type_template') {
- print ''.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').' | ';
+ print '';
+ print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1, '', 0, 1);
+ print ' | ';
} elseif (!in_array($value, array('content', 'content_lines'))) {
print ' | ';
}
@@ -819,22 +806,26 @@ if ($resql)
{
if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
$showfield = 1;
- $align = "left";
+ $align = "";
+ $class = "tddict";
$valuetoshow = $obj->{$fieldlist[$field]};
- if ($value == 'label' || $value == 'topic')
- {
+ if ($value == 'label' || $value == 'topic') {
$valuetoshow = dol_escape_htmltag($valuetoshow);
}
- if ($value == 'type_template')
- {
- $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+ if ($value == 'label') {
+ $class .= ' tdoverflowmax100';
}
- if ($value == 'lang' && $valuetoshow)
- {
+ /*if ($value == 'topic') {
+ $class .= ' tdoverflowmax300';
+ }*/
+ if ($value == 'type_template') {
+ $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+ $align = "center";
+ }
+ if ($value == 'lang' && $valuetoshow) {
$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
}
- if ($value == 'fk_user')
- {
+ if ($value == 'fk_user') {
if ($valuetoshow > 0)
{
$fuser = new User($db);
@@ -842,29 +833,25 @@ if ($resql)
$valuetoshow = $fuser->getNomUrl(1);
}
}
- if ($value == 'private')
- {
+ if ($value == 'private') {
$align = "center";
if ($valuetoshow) $valuetoshow = yn($valuetoshow);
else $valuetoshow = '';
}
- if ($value == 'position')
- {
+ if ($value == 'position') {
$align = "center";
}
- if ($value == 'joinfiles')
- {
+ if ($value == 'joinfiles') {
$align = "center";
if ($valuetoshow) $valuetoshow = 1;
else $valuetoshow = '';
}
+ if ($align) $class .= ' '.$align;
- $class = 'tddict';
// Show value for field
- if ($showfield)
- {
+ if ($showfield) {
print '';
- print ''.$valuetoshow.' | ';
+ print ''.$valuetoshow.' | ';
}
}
}
@@ -963,7 +950,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
{
global $conf, $langs, $user, $db;
global $form;
- global $elementList, $sourceList;
+ global $elementList;
$formadmin = new FormAdmin($db);
@@ -1017,14 +1004,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
// Le type de template
elseif ($fieldlist[$field] == 'type_template')
{
- print '';
+ print ' | ';
if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList)))
{
// Current tempalte type is an unknown type, so we must keep it as it is.
print '';
print $obj->{$fieldlist[$field]};
} else {
- print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
+ print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1, '', 0, 1);
}
print ' | ';
} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 5be25002079..196656b983f 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -321,7 +321,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
if ($action == 'send' || $action == 'relance')
{
- $actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
+ $actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('at').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
if ($message)
{
$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index e2749c5e183..200b50cd512 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -296,6 +296,7 @@ class FormMail extends Form
* @param string $addfileaction Name of action when posting file attachments
* @param string $removefileaction Name of action when removing file attachments
* @return void
+ * @deprecated
*/
public function show_form($addfileaction = 'addfile', $removefileaction = 'removefile')
{
@@ -434,18 +435,20 @@ class FormMail extends Form
{
setEventMessages($this->error, $this->errors, 'errors');
}
+ $langs->trans("members");
foreach ($this->lines_model as $line)
{
- $langs->trans("members");
- if (preg_match('/\((.*)\)/', $line->label, $reg))
- {
- $modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
+ $reg = array();
+ if (preg_match('/\((.*)\)/', $line->label, $reg)) {
+ $labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
} else {
- $modelmail_array[$line->id] = $line->label;
+ $labeltouse = $line->label;
}
- if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
- if ($line->private) $modelmail_array[$line->id] .= ' - '.$langs->trans("Private");
- //if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
+
+ // We escape the $labeltouse to store it into $modelmail_array.
+ $modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
+ if ($line->lang) $modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);
+ if ($line->private) $modelmail_array[$line->id] .= ' - '.dol_escape_htmltag($langs->trans("Private")).'';
}
}
@@ -454,7 +457,8 @@ class FormMail extends Form
{
// If list of template is filled
$out .= ''."\n";
- $out .= ''.$langs->trans('SelectMailModel').': '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+ $out .= ''.$langs->trans('SelectMailModel').': ';
+ $out .= $this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
$out .= ' ';
$out .= '';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a7103a99daa..e59a4c54f07 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1897,7 +1897,7 @@ MailToSendReception=Receptions
MailToThirdparty=Third parties
MailToMember=Members
MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
MailToTicket=Tickets
ByDefaultInList=Show by default on list view
YouUseLastStableVersion=You use the latest stable version
@@ -2064,7 +2064,7 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
TemplateAdded=Template added
TemplateUpdated=Template updated
TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
DictionaryProductNature= Nature of product
CountryIfSpecificToOneCountry=Country (if specific to a given country)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 789d3836e37..c28280c8330 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -490,6 +490,7 @@ By=By
From=From
FromDate=From
FromLocation=From
+at=at
to=to
To=to
and=and