[MERGE] Branch 'master' of git.datentonne.net:typo3/template_aide
This commit is contained in:
commit
2ee1d6b18e
@ -227,6 +227,7 @@ class MailUtility
|
||||
switch($row['type']) {
|
||||
case 'text':
|
||||
case 'table':
|
||||
case 'tablelr':
|
||||
case 'tableLayout':
|
||||
case 'list':
|
||||
case 'textbold':
|
||||
@ -238,6 +239,7 @@ class MailUtility
|
||||
case 'buttoncenter':
|
||||
case 'buttonright':
|
||||
case 'divider':
|
||||
case 'hr':
|
||||
$row['data'] = str_replace(
|
||||
"\\\n",
|
||||
'',
|
||||
@ -392,4 +394,23 @@ class MailUtility
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Debug print
|
||||
*/
|
||||
public static function printMaildata($maildata)
|
||||
{
|
||||
foreach ($maildata as $row) {
|
||||
if (!is_array($row['data'])) {
|
||||
print($row['data']);
|
||||
} else {
|
||||
print($row['data'][0]);
|
||||
print(PHP_EOL);
|
||||
print($row['data'][1]);
|
||||
}
|
||||
print(PHP_EOL);
|
||||
}
|
||||
print(PHP_EOL);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -34,6 +34,7 @@
|
||||
|| {row.type} == 'buttoncenter'
|
||||
|| {row.type} == 'buttonright'
|
||||
|| {row.type} == 'divider'
|
||||
|| {row.type} == 'hr'
|
||||
">
|
||||
<!--[if mso | IE]>
|
||||
<table align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:{width}px;" width="{width}" >
|
||||
@ -113,6 +114,29 @@
|
||||
{row.data -> f:format.nl2br() -> f:format.raw()}
|
||||
</span>
|
||||
</f:case>
|
||||
<f:case value="hr">
|
||||
<p style="border-top:solid 1px #bababa;font-size:1px;margin:13px auto;width:100%;">
|
||||
</p>
|
||||
<!--[if mso | IE]>
|
||||
|
||||
<table
|
||||
align="center"
|
||||
border="0"
|
||||
cellpadding="0"
|
||||
cellspacing="0"
|
||||
style="border-top:solid 1px #bababa;font-size:1px;margin:13px auto;width:100%;"
|
||||
role="presentation"
|
||||
width="550px"
|
||||
>
|
||||
<tr>
|
||||
<td style="height:0;line-height:0;">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<![endif]-->
|
||||
</f:case>
|
||||
<f:case value="divider">
|
||||
<p style="border-top:solid 2px #025093;font-size:1px;margin:0px auto;width:100%;">
|
||||
</p>
|
||||
@ -158,6 +182,9 @@
|
||||
<f:case value="table">
|
||||
<f:variable name="type" value="table" />
|
||||
</f:case>
|
||||
<f:case value="tablelr">
|
||||
<f:variable name="type" value="table" />
|
||||
</f:case>
|
||||
<f:case value="tableLayout">
|
||||
<f:variable name="type" value="table" />
|
||||
</f:case>
|
||||
@ -199,11 +226,19 @@
|
||||
</td>
|
||||
<td class="" style="vertical-align:top;width:{widthTableColumn}px;">
|
||||
<![endif]-->
|
||||
<div class="mj-column-per-50 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
|
||||
<f:switch expression="{row.type}">
|
||||
<f:case value="tablelr">
|
||||
<f:variable name="align" value="right" />
|
||||
</f:case>
|
||||
<f:defaultCase>
|
||||
<f:variable name="align" value="left" />
|
||||
</f:defaultCase>
|
||||
</f:switch>
|
||||
<div class="mj-column-per-50 outlook-group-fix" style="font-size:13px;text-align:{align};direction:ltr;display:inline-block;vertical-align:top;width:100%;">
|
||||
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
|
||||
<tr>
|
||||
<td align="left" style="font-size:0px;padding:0px 4px;word-break:break-word;">
|
||||
<div style="font-family:Arial, sans-serif;font-size:16px;line-height:1.4;text-align:left;color:#000000;">
|
||||
<td align="{align}" style="font-size:0px;padding:0px 4px;word-break:break-word;">
|
||||
<div style="font-family:Arial, sans-serif;font-size:16px;line-height:1.4;text-align:{align};color:#000000;">
|
||||
<div>{row.data.1 -> f:format.nl2br() -> f:format.raw()}</div>
|
||||
</div>
|
||||
</td>
|
||||
|
Loading…
x
Reference in New Issue
Block a user