lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW The substitution keys available for emailing edition is now into a

Browse Source 
popup
This commit is contained in:
Laurent Destailleur 2017-03-11 02:36:22 +01:00
parent 2054ce0aab
commit 47dd53abbe
4 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/comm/mailing/card.php
View File

@ -846,11 +846,6 @@ else
print '<table class="border" width="100%">';
/* print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">';
print $form->showrefnav($object,'id', $linkback);
print '</td></tr>';
*/
// Description
print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
print $form->editfieldval("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
@ -865,13 +860,6 @@ else
print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
print '</td></tr>';
// Status
/*
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4);
if ($object->statut == 2) print ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.')';
print'</td></tr>';
*/
// Nb of distinct emails
print '<tr><td>';
@ -1062,7 +1050,7 @@ else
$htmltext.='</i>';
// Print mail content
print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext), '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('');
@ -1085,7 +1073,7 @@ else
}
else
{
print $langs->trans("NoAttachedFiles").'<br>';
print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
}
print '</td></tr>';
@ -1191,7 +1179,7 @@ else
$htmltext.='</i>';
// Print mail content
print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext), '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();

4
htdocs/core/class/html.form.class.php
View File

@ -447,7 +447,7 @@ class Form
else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
if ($tooltipon == 1 || $tooltipon == 3)
{
$paramfortooltiptd=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
$paramfortooltiptd=' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
else $paramfortooltiptd.=' dolid="'.$tooltiptrigger.'"';
}
@ -524,7 +524,7 @@ class Form
elseif ($type == 'warning') $img = img_warning($alt);
else $img = img_picto($alt, $type);
return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
return $this->textwithtooltip($text, $htmltext, ($tooltiptrigger?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
}
/**

9
htdocs/theme/eldy/style.css.php
View File

@ -304,7 +304,7 @@ input, select {
margin-top:1px;
}
select {
padding: 4px 4px 4px 1px;
/* padding: 4px 4px 2px 1px; */
}
textarea {
border-radius: 0;
@ -387,7 +387,7 @@ fieldset { border: 1px solid #AAAAAA !important; }
border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
display: inline-block;
padding: 4px 14px;
padding: 3px 14px;
margin-bottom: 0;
margin-top: 0;
text-align: center;
@ -3942,6 +3942,7 @@ div.dataTables_length select {
}
.select2-drop.select2-drop-above.select2-drop-active {
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
.select2-container-active .select2-choice, .select2-container-active .select2-choices
{
@ -3977,8 +3978,6 @@ div.dataTables_length select {
}
.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
background-image: none;
border-left: 1px solid #ccc !important;
border-right: 1px solid #ccc !important;
border-radius: 0 !important;
}
div.select2-drop-above
@ -4025,7 +4024,7 @@ a span.select2-chosen
.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
.select2-container-multi.select2-container-active .select2-choices
{
border-bottom: 1px solid #ccc;
border-bottom: none;
border-right: none;
border-top: none;
border-left: 1px solid #ddd;

3
htdocs/theme/md/style.css.php
View File

@ -3898,6 +3898,7 @@ div.dataTables_length select {
}
.select2-drop.select2-drop-above.select2-drop-active {
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
.select2-container-active .select2-choice, .select2-container-active .select2-choices
{
@ -3933,8 +3934,6 @@ div.dataTables_length select {
}
.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
background-image: none;
border-left: 1px solid #ccc !important;
border-right: 1px solid #ccc !important;
border-radius: 0 !important;
}
div.select2-drop-above