Fix colors in rendering [MAILPOET-2569]

This commit is contained in:
wxa
2019-12-18 13:06:56 +03:00
committed by wxa
parent e864311faf
commit d84c45e5f1
5 changed files with 58 additions and 28 deletions

View File

@@ -26,8 +26,8 @@ class Renderer {
$this->html_after_content = '';
}
public function render(Newsletter $newsletter) {
$renderer = new NewsletterRenderer($newsletter, true);
public function render(Newsletter $newsletter, NewsletterRenderer $renderer = null) {
$renderer = $renderer ?: new NewsletterRenderer($newsletter, true);
$html = explode(Preprocessor::WC_CONTENT_PLACEHOLDER, $renderer->render('html'));
$this->html_before_content = $html[0];
$this->html_after_content = $html[1];
@@ -38,14 +38,14 @@ class Renderer {
throw new \Exception("You should call 'render' before 'getHTMLBeforeContent'");
}
$html = str_replace(Preprocessor::WC_HEADING_PLACEHOLDER, $heading_text, $this->html_before_content);
return $html . '<div id="' . self::CONTENT_CONTAINER_ID . '">';
return $html . '<div id="' . self::CONTENT_CONTAINER_ID . '"><div id="body_content_inner">';
}
public function getHTMLAfterContent() {
if (empty($this->html_after_content)) {
throw new \Exception("You should call 'render' before 'getHTMLAfterContent'");
}
return '</div>' . $this->html_after_content;
return '</div></div>' . $this->html_after_content;
}
public function prefixCss($css) {