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

Indented HTML code as per Marco's comment

Browse Source
This commit is contained in:
MrCasual
2015-09-10 20:32:12 -04:00
parent 42c5885cbd
commit 7e4bd0d044
9 changed files with 123 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Newsletter/Blocks/Button.php
View File

@ -5,7 +5,8 @@ use MailPoet\Newsletter\Blocks\Renderer as BlocksRenderer;
class Button {
static function render($element) {
$template = '<tr>
$template = '
<tr>
<td class="mailpoet_col mailpoet_button mailpoet_padded" valign = "top" >
<div>
<table width="100%" cellpadding="0" cellspacing="0" border="0">
@ -15,18 +16,23 @@ class Button {
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:w="urn:schemas-microsoft-com:office:word"
href="' . $element['url'] . '"
style="height:' . $element['styles']['block']['lineHeight'] . ';width:' . $element['styles']['block']['width'] . ';v-text-anchor:middle;"
arcsize="' . round($element['styles']['block']['borderRadius'] / $element['styles']['block']['lineHeight'] * 100) . '%" strokecolor="' . $element['styles']['block']['borderColor'] . '"
style="height:' . $element['styles']['block']['lineHeight'] . ';
width:' . $element['styles']['block']['width'] . ';
v-text-anchor:middle;"
arcsize="' . round($element['styles']['block']['borderRadius'] / $element['styles']['block']['lineHeight'] * 100) . '%"
strokecolor="' . $element['styles']['block']['borderColor'] . '"
fillcolor="' . $element['styles']['block']['backgroundColor'] . '">
<w:anchorlock/>
<center style="color:' . $element['styles']['block']['fontColor'] . ';font-family:' . $element['styles']['block']['fontFamily'] . ';font-size:' . $element['styles']['block']['fontSize'] . ';font-weight:bold;">
' . $element['text'] . '
<center style="color:' . $element['styles']['block']['fontColor'] . ';
font-family:' . $element['styles']['block']['fontFamily'] . ';
font-size:' . $element['styles']['block']['fontSize'] . ';
font-weight:bold;">' . $element['text'] . '
</center>
</v:roundrect>
<![endif]-->
<a class="mailpoet_button" href="' . $element['url'] . '"
style="display:inline-block;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;mso-hide:all;' . BlocksRenderer::getBlockStyles($element, array('textAlign')) . '">
' . $element['text'] . '
<a class="mailpoet_button"
href="' . $element['url'] . '"
style="display:inline-block;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;mso-hide:all;' . BlocksRenderer::getBlockStyles($element, array('textAlign')) . '"> ' . $element['text'] . '
</a>
</td>
</tr>

3
lib/Newsletter/Blocks/Divider.php
View File

@ -3,7 +3,8 @@
class Divider {
static function render($element) {
$template = '<tr>
$template = '
<tr>
<td class="mailpoet_col mailpoet_divider mailpoet_padded" style="background-color: ' . $element['styles']['block']['backgroundColor'] . '; padding: ' . $element['styles']['block']['padding'] . ' 0;" valign="top">
<table width="100%">
<tr>

3
lib/Newsletter/Blocks/Footer.php
View File

@ -15,7 +15,8 @@ class Footer {
$element['text'] = str_replace('<p', '<p style="' . BlocksRenderer::getStyles($element['styles'], 'text') . '"', $element['text']);
}
$template = '<tr>
$template = '
<tr>
<td class="mailpoet_col mailpoet_footer" style="' . BlocksRenderer::getStyles($element['styles'], 'block') . '" valign="top">
<div>' . $element['text'] . '</div>
</td>

3
lib/Newsletter/Blocks/Header.php
View File

@ -15,7 +15,8 @@ class Header {
$element['text'] = str_replace('<p', '<p style="' . BlocksRenderer::getStyles($element['styles'], 'text') . '"', $element['text']);
}
$template = '<tr>
$template = '
<tr>
<td class="mailpoet_col mailpoet_header" style="' . BlocksRenderer::getBlockStyles($element) . '" valign="top">
<div>' . $element['text'] . '</div>
</td>

7
lib/Newsletter/Blocks/Image.php
View File

@ -7,9 +7,12 @@ class Image {
static function render($element) {
$element['width'] = (int) $element['width'];
$template = '<tr>
$template = '
<tr>
<td class="mailpoet_col mailpoet_image ' . (($element['padded'] === true) ? "mailpoet_padded" : "") . '" style="' . BlocksRenderer::getBlockStyles($element) . '" valign="top">
<img style="top:0; left:0; height: auto; width:100%;" src="' . $element['src'] . '" width="' . (($element['padded'] === true) ? $element['width'] - (20 * 2) : $element['width']) . '">
<img style="top:0; left:0; height: auto; width:100%;"
src="' . $element['src'] . '"
width="' . (($element['padded'] === true) ? $element['width'] - (20 * 2) : $element['width']) . '">
</td>
</tr>';

7
lib/Newsletter/Blocks/Social.php
View File

@ -9,11 +9,10 @@ class Social {
$iconsBlock .= '<a href="' . $icon['link'] . '"><img src="' . $icon['image'] . '" width = "32" height = "32" style="width: 32px; height: 32px;" alt="' . $icon['iconType'] . '"></a><img src="http://mp3.mailpoet.net/spacer.gif" width = "10" height = "1" style=" width: 10px; height: 1px;">';
}
}
$template = '<tr>
$template = '
<tr>
<td class="mailpoet_col mailpoet_social" valign="top">
<div class="mailpoet_social-icon mailpoet_padded">
' . $iconsBlock . '
</div>
<div class="mailpoet_social-icon mailpoet_padded">' . $iconsBlock . ' </div>
</td>
</tr>';

6
lib/Newsletter/Blocks/Spacer.php
View File

@ -11,9 +11,9 @@ class Spacer {
unset($element['styles']['block']['backgroundColor']);
}
$template = '<tr>
<td class="mailpoet_col mailpoet_spacer" style="' . BlocksRenderer::getBlockStyles($element) . '" valign="top">
</td>
$template = '
<tr>
<td class="mailpoet_col mailpoet_spacer" style="' . BlocksRenderer::getBlockStyles($element) . '" valign="top"> </td>
</tr>';
return $template;

7
lib/Newsletter/Blocks/Text.php
View File

@ -31,10 +31,9 @@ class Text {
// remove the last break line
$element['text'] = preg_replace('/<br>([^<br>]*)$/s', '', $element['text']);
$template = '<tr>
<td class="mailpoet_col mailpoet_text mailpoet_padded" valign="top">
' . $element['text'] . '
</td>
$template = '
<tr>
<td class="mailpoet_col mailpoet_text mailpoet_padded" valign="top">' . $element['text'] . ' </td>
</tr>';
return $template;

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

@ -17,7 +17,8 @@ class Renderer {
$columnClass = $columnClasses[$columnsCount];
// open column container
$columnContainerTemplate = '<tr>
$columnContainerTemplate = '
<tr>
<td class="mailpoet_content" align="left" style="border-collapse: collapse;">
<table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0">
<tbody>
@ -29,8 +30,15 @@ class Renderer {
<tr>
<td width="' . $columnWidth . '" style="width: ' . $columnWidth . 'px;" valign="top">
<![endif]-->';
$columnOpenTemplate = '<table width="' . $columnWidth . '" border="0" cellpadding="0" cellspacing="0" align="left" class="mailpoet_force-row ' . $columnClass . ' mailpoet_col" style="width: ' . $columnWidth . 'px; border-spacing: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; margin-left: auto; margin-right: auto;" bgcolor="#999999"><tbody>';
$columnCloseTemplate = '</tbody></table>
$columnOpenTemplate = '
<table width="' . $columnWidth . '"
border="0" cellpadding="0" cellspacing="0" align="left" class="mailpoet_force-row ' . $columnClass . ' mailpoet_col"
style="width: ' . $columnWidth . 'px; border-spacing: 0; mso-table-lspace: 0pt; mso-table-rspace: 0pt;
table-layout: fixed; margin-left: auto; margin-right: auto;" bgcolor="#999999">
<tbody>';
$columnCloseTemplate = '
</tbody>
</table>
<!--[if mso]>
</td>
<td width="' . $columnWidth . '" style="width: ' . $columnWidth . 'px;" valign="top">
@ -42,11 +50,11 @@ class Renderer {
if($columnsCount > 1 && $index != $columnsCount) {
$columnContainerTemplate .= $columnCloseTemplate;
}
}
// close column container
$columnContainerTemplate .= ' </tbody>
$columnContainerTemplate .= '
</tbody>
</table>
<!--[if mso]>
</td>