Compare commits

..

No commits in common. "2dc7630390aa17b9be90a7e9f9a2fbe075b6cbaf" and "ff36e401a73ceb793af86fe6b81f0c60d2c6efc9" have entirely different histories.

2 changed files with 9 additions and 20 deletions

View File

@ -251,10 +251,14 @@ class MailUtility
case 'buttonleft': case 'buttonleft':
case 'buttoncenter': case 'buttoncenter':
case 'buttonright': case 'buttonright':
return json_encode([ return '<a style="display: inline-block;" href="'
$matchesInner[1], . $matchesInner[1]
$matchesInner[2] . '">'
]); . '<span style="display: inline-block; padding: 10px 15px; border-radius: 3px; background-color: red;">'
. 'Button!!!! '
. $matchesInner[2]
. '</span>'
. '</a>';
break; break;
default: default:
return '<a href="' return '<a href="'

View File

@ -8,16 +8,6 @@
<f:variable name="padding" value="20" /> <f:variable name="padding" value="20" />
</f:else> </f:else>
</f:if> </f:if>
<f:if condition="{buttonColor}">
<f:else>
<f:variable name="buttonColor" value="#ffffff" />
</f:else>
</f:if>
<f:if condition="{buttonBackgroundcolor}">
<f:else>
<f:variable name="buttonBackgroundcolor" value="#8ABF6F" />
</f:else>
</f:if>
<f:variable name="widthPadded" value="{width - padding - padding}" /> <f:variable name="widthPadded" value="{width - padding - padding}" />
<f:variable name="widthTableColumn" value="{widthPadded / 2}" /> <f:variable name="widthTableColumn" value="{widthPadded / 2}" />
@ -88,12 +78,7 @@
</f:case> </f:case>
<f:case value="buttoncenter"> <f:case value="buttoncenter">
<span style="display: inline-block;" class="buttonwrapper"> <span style="display: inline-block;" class="buttonwrapper">
<f:variable name="rowData">{row.data -> v:format.json.decode()}</f:variable> {row.data -> f:format.nl2br() -> f:format.raw()}
<a style="display: inline-block; color: {buttonColor}" href="{rowData.0}">
<span style="display: inline-block; padding: 10px 15px; border-radius: 3px; background-color: {buttonBackgroundcolor};">
{rowData.1}
</span>
</a>
</span> </span>
</f:case> </f:case>
<f:case value="buttonright"> <f:case value="buttonright">