From 47c15eca83f9abf845d8480cbcd71a3f82e20a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Thu, 9 Jun 2016 18:58:57 +0300 Subject: [PATCH 1/7] Change sidebar and sidepanel text font size to 13px --- assets/css/src/newsletter_editor/components/forms.styl | 1 - assets/css/src/newsletter_editor/components/sidebar.styl | 1 + assets/css/src/newsletter_editor/components/sidepanel.styl | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/src/newsletter_editor/components/forms.styl b/assets/css/src/newsletter_editor/components/forms.styl index a8f1152464..93600a29eb 100644 --- a/assets/css/src/newsletter_editor/components/forms.styl +++ b/assets/css/src/newsletter_editor/components/forms.styl @@ -4,7 +4,6 @@ .mailpoet_form_field_title clear: both - font-size: 1.1em margin-bottom: 5px .mailpoet_form_field_title_small diff --git a/assets/css/src/newsletter_editor/components/sidebar.styl b/assets/css/src/newsletter_editor/components/sidebar.styl index 2c84630986..8039e55dbb 100644 --- a/assets/css/src/newsletter_editor/components/sidebar.styl +++ b/assets/css/src/newsletter_editor/components/sidebar.styl @@ -17,6 +17,7 @@ $widget-icon-width = 30px border-left: $content-border-color border-bottom: $content-border-color color: $sidebar-text-color + font-size: 13px .mailpoet_sidebar_region margin-bottom: 0 diff --git a/assets/css/src/newsletter_editor/components/sidepanel.styl b/assets/css/src/newsletter_editor/components/sidepanel.styl index 375c05ae27..8e16b63d03 100644 --- a/assets/css/src/newsletter_editor/components/sidepanel.styl +++ b/assets/css/src/newsletter_editor/components/sidepanel.styl @@ -3,6 +3,7 @@ $sidepanel-active-heading-color = $primary-active-color /* Sidepanel */ .mailpoet_editor_settings color: $sidebar-text-color + font-size: 13px p font-size: 1em @@ -18,7 +19,6 @@ $sidepanel-active-heading-color = $primary-active-color .mailpoet_sidepanel_field_title clear: both - font-size: 1.1em margin-bottom: 5px .mailpoet_sidepanel_field_title_small From 8698d2c6ba77817323eb12b5aa4c37474145ff07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Thu, 9 Jun 2016 18:59:15 +0300 Subject: [PATCH 2/7] Change placeholder text of preheader input --- views/newsletter/templates/components/heading.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/newsletter/templates/components/heading.hbs b/views/newsletter/templates/components/heading.hbs index a1eaf668b5..9d958f1e5c 100644 --- a/views/newsletter/templates/components/heading.hbs +++ b/views/newsletter/templates/components/heading.hbs @@ -10,6 +10,6 @@ From 781973777e5539a97109da0f1a47c59fac055092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Mon, 13 Jun 2016 14:13:47 +0300 Subject: [PATCH 3/7] Vertically and horizontally center block deletion confirmation dialog --- assets/css/src/newsletter_editor/components/blockTools.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/src/newsletter_editor/components/blockTools.styl b/assets/css/src/newsletter_editor/components/blockTools.styl index c4974a8eda..ea5ed75345 100644 --- a/assets/css/src/newsletter_editor/components/blockTools.styl +++ b/assets/css/src/newsletter_editor/components/blockTools.styl @@ -46,6 +46,7 @@ $master-column-tool-width = 24px opacity: 0 overflow: hidden display: block + margin: 0 .mailpoet_delete_block_activated width: auto @@ -125,7 +126,6 @@ $master-column-tool-width = 24px border-radius(3px) background-color: $warning-background-color padding: 3px 5px - line-height: 1.2em .mailpoet_delete_block_activate overflow: hidden From 3b4ac4d2d2ade11ce905a3e6b7ea520eb88528d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Mon, 13 Jun 2016 15:02:20 +0300 Subject: [PATCH 4/7] Change newsletter preview to use current user as subscriber --- lib/Router/Newsletters.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php index 63bcda8f94..1558288330 100644 --- a/lib/Router/Newsletters.php +++ b/lib/Router/Newsletters.php @@ -185,8 +185,15 @@ class Newsletters { $data_for_shortcodes = array_merge(array($newsletter['subject']), $rendered_newsletter); $body = implode($divider, $data_for_shortcodes); + + $wp_user = wp_get_current_user(); + $subscriber = Subscriber::where('email', $wp_user->data->user_email) + ->findOne(); + $subscriber = ($subscriber) ? $subscriber->asArray() : $subscriber; + $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes( - $newsletter + $newsletter, + $subscriber ); list($newsletter['subject'], $newsletter['body']['html'], From c0a250fc0fb4a33ad599ff114a2fb637100badd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Tue, 14 Jun 2016 15:26:00 +0300 Subject: [PATCH 5/7] Turn sidebar/sidepanel text size into a variable --- assets/css/src/newsletter_editor/components/sidebar.styl | 2 +- assets/css/src/newsletter_editor/components/sidepanel.styl | 2 +- assets/css/src/newsletter_editor/variables.styl | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/css/src/newsletter_editor/components/sidebar.styl b/assets/css/src/newsletter_editor/components/sidebar.styl index 8039e55dbb..6ec39797e9 100644 --- a/assets/css/src/newsletter_editor/components/sidebar.styl +++ b/assets/css/src/newsletter_editor/components/sidebar.styl @@ -17,7 +17,7 @@ $widget-icon-width = 30px border-left: $content-border-color border-bottom: $content-border-color color: $sidebar-text-color - font-size: 13px + font-size: $sidebar-text-size .mailpoet_sidebar_region margin-bottom: 0 diff --git a/assets/css/src/newsletter_editor/components/sidepanel.styl b/assets/css/src/newsletter_editor/components/sidepanel.styl index 8e16b63d03..eb0b157e32 100644 --- a/assets/css/src/newsletter_editor/components/sidepanel.styl +++ b/assets/css/src/newsletter_editor/components/sidepanel.styl @@ -3,7 +3,7 @@ $sidepanel-active-heading-color = $primary-active-color /* Sidepanel */ .mailpoet_editor_settings color: $sidebar-text-color - font-size: 13px + font-size: $sidebar-text-size p font-size: 1em diff --git a/assets/css/src/newsletter_editor/variables.styl b/assets/css/src/newsletter_editor/variables.styl index 7ff7624b67..d74b24c590 100644 --- a/assets/css/src/newsletter_editor/variables.styl +++ b/assets/css/src/newsletter_editor/variables.styl @@ -26,3 +26,4 @@ $error-text-color = #d54e21 $newsletter-width = 660px $text-line-height = 1.6em +$sidebar-text-size = 13px From 5ea25ec6974ed594ac96b98b2bea04161c9c035d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Tue, 14 Jun 2016 15:43:13 +0300 Subject: [PATCH 6/7] Fix the way we query for WP subscriber in email preview --- lib/Router/Newsletters.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php index 1558288330..7d5635bd0d 100644 --- a/lib/Router/Newsletters.php +++ b/lib/Router/Newsletters.php @@ -187,9 +187,8 @@ class Newsletters { $body = implode($divider, $data_for_shortcodes); $wp_user = wp_get_current_user(); - $subscriber = Subscriber::where('email', $wp_user->data->user_email) - ->findOne(); - $subscriber = ($subscriber) ? $subscriber->asArray() : $subscriber; + $subscriber = Subscriber::findOne($wp_user->data->user_email); + $subscriber = ($subscriber) ? $subscriber->asArray() : false; $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes( $newsletter, From 2a3a561464c695454230afd365a12af3f123fea7 Mon Sep 17 00:00:00 2001 From: Jonathan Labreuille Date: Tue, 14 Jun 2016 15:25:23 +0200 Subject: [PATCH 7/7] updated shortcode (user -> subscriber) in FrankRoast template --- lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php index 7318af83ba..ff3801fcc8 100644 --- a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php +++ b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php @@ -88,7 +88,7 @@ class FranksRoastHouseTemplate { ), array( "type" => "text", - "text" => __("

Hi there [user:firstname | default:coffee drinker]

\n

\n

Sit back and enjoy your favorite roast as you read this week's newsletter. 

") + "text" => __("

Hi there [subscriber:firstname | default:coffee drinker]

\n

\n

Sit back and enjoy your favorite roast as you read this week's newsletter. 

") ), array( "type" => "image",