Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Refactor column renderer

Browse Source 
[MAILPOET-1891]
This commit is contained in:
Rostislav Wolny
2019-04-04 16:27:55 +02:00
committed by M. Shull
parent fbb015dc8c
commit 7fc2c25fa1
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Newsletter/Renderer/Columns/Renderer.php
View File

@@ -1,6 +1,8 @@
<?php <?php
namespace MailPoet\Newsletter\Renderer\Columns; namespace MailPoet\Newsletter\Renderer\Columns;
use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper;
class Renderer { class Renderer {
function render($content_block, $columns_data) { function render($content_block, $columns_data) {
@@ -22,10 +24,10 @@ class Renderer {
} }
function getOneColumnTemplate($styles, $image) { function getOneColumnTemplate($styles, $image) {
$background_css = $this->getBackgroundCss($styles, $image); $background_css = EHelper::escapeHtmlStyleAttr($this->getBackgroundCss($styles, $image));
$template['content_start'] = ' $template['content_start'] = '
<tr> <tr>
<td class="mailpoet_content" align="center" style="border-collapse:collapse;' . $background_css . '"> <td class="mailpoet_content" align="center" style="border-collapse:collapse;' . $background_css . '" ' . $this->getBgColorAttribute($styles, $image) .'>
<table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0"> <table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0">
<tbody> <tbody>
<tr> <tr>
@@ -65,7 +67,7 @@ class Renderer {
private function getMultipleColumnsContainerStart($class, $styles, $image) { private function getMultipleColumnsContainerStart($class, $styles, $image) {
return ' return '
<tr> <tr>
<td class="mailpoet_content-' . $class . '" align="left" style="border-collapse:collapse;' . $this->getBackgroundCss($styles, $image) . '"> <td class="mailpoet_content-' . $class . '" align="left" style="border-collapse:collapse;' . EHelper::escapeHtmlStyleAttr($this->getBackgroundCss($styles, $image)) . '" ' . $this->getBgColorAttribute($styles, $image) .'>
<table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0"> <table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0">
<tbody> <tbody>
<tr> <tr>
@@ -117,8 +119,18 @@ class Renderer {
if (!isset($styles['backgroundColor'])) return false; if (!isset($styles['backgroundColor'])) return false;
$background_color = $styles['backgroundColor']; $background_color = $styles['backgroundColor'];
return ($background_color !== 'transparent') ? return ($background_color !== 'transparent') ?
sprintf('background-color:%s!important;" bgcolor="%s', $background_color, $background_color) : sprintf('background-color:%s!important;', $background_color) :
false; false;
} }
} }
private function getBgColorAttribute($styles, $image) {
if (($image === null || $image['src'] === null)
&& isset($styles['backgroundColor'])
&& $styles['backgroundColor'] !== 'transparent'
) {
return 'bgcolor="' . EHelper::escapeHtmlStyleAttr($styles['backgroundColor']) . '"';
}
return null;
}
} }

3
tests/integration/Newsletter/RendererTest.php
View File

@@ -74,6 +74,7 @@ class RendererTest extends \MailPoetTest {
$rendered_column_content[] = trim($column->text()); $rendered_column_content[] = trim($column->text());
}; };
expect($rendered_column_content)->equals($column_content); expect($rendered_column_content)->equals($column_content);
expect((string)$DOM)->contains(' bgcolor="#999999"');
} }
function testItRendersTwoColumns() { function testItRendersTwoColumns() {
@@ -99,6 +100,7 @@ class RendererTest extends \MailPoetTest {
$rendered_column_content[] = trim($column->text()); $rendered_column_content[] = trim($column->text());
}; };
expect($rendered_column_content)->equals($column_content); expect($rendered_column_content)->equals($column_content);
expect((string)$DOM)->contains(' bgcolor="#999999"');
} }
function testItRendersThreeColumns() { function testItRendersThreeColumns() {
@@ -125,6 +127,7 @@ class RendererTest extends \MailPoetTest {
$rendered_column_content[] = trim($column->text()); $rendered_column_content[] = trim($column->text());
}; };
expect($rendered_column_content)->equals($column_content); expect($rendered_column_content)->equals($column_content);
expect((string)$DOM)->contains(' bgcolor="#999999"');
} }
function testItRendersScaledColumnBackgroundImage() { function testItRendersScaledColumnBackgroundImage() {